diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-02-25 20:27:43 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-02-25 20:27:43 +1100 |
| commit | 24a63add2d92afa0084fec956df7508ea28aab89 (patch) | |
| tree | 9ba254caca85d5a9398c8cc0f8b8038b3fd0028b /source4 | |
| parent | 4823e988b6360646931f9b6369bf7b8f512069a8 (diff) | |
| parent | eb5efd1978acd38cf6cc97e067b5105743ca5469 (diff) | |
| download | samba-24a63add2d92afa0084fec956df7508ea28aab89.tar.gz samba-24a63add2d92afa0084fec956df7508ea28aab89.tar.bz2 samba-24a63add2d92afa0084fec956df7508ea28aab89.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/m4/public.m4 | 7 | ||||
| -rw-r--r-- | source4/heimdal_build/internal.m4 | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 1927e9977f..ffdf92f784 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -157,6 +157,13 @@ mkinclude $1 " ]) +dnl +dnl SMB_EXT_LIB() just specifies the details of the library. +dnl Note: the library isn't enabled by default. +dnl You need to enable it with SMB_ENABLE(name) if configure +dnl find it should be used. E.g. it should not be enabled +dnl if the library is present, but the header file is missing. +dnl dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags) AC_DEFUN([SMB_EXT_LIB], [ diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4 index 50a3c8adda..a48777fab1 100644 --- a/source4/heimdal_build/internal.m4 +++ b/source4/heimdal_build/internal.m4 @@ -170,6 +170,12 @@ SMB_ENABLE(OPENPTY,YES) SMB_EXT_LIB(OPENPTY,[${OPENPTY_LIBS}],[${OPENPTY_CFLAGS}],[${OPENPTY_CPPFLAGS}],[${OPENPTY_LDFLAGS}]) +AC_CHECK_LIB_EXT(intl, INTL_LIBS, gettext) + +SMB_ENABLE(INTL,YES) + +SMB_EXT_LIB(INTL, $INTL_LIBS) + smb_save_LIBS=$LIBS RESOLV_LIBS="" LIBS="" |