diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-08-01 18:15:11 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-08-01 21:10:40 +0200 |
| commit | d9ad17f945d21d50ea629e22db3ee8758be421a6 (patch) | |
| tree | 02d2799a851196097b5582294b5d97378cb89240 | |
| parent | 5fd1c5445b16cbe4927aaae60a099dde597ef7b4 (diff) | |
| download | samba-d9ad17f945d21d50ea629e22db3ee8758be421a6.tar.gz samba-d9ad17f945d21d50ea629e22db3ee8758be421a6.tar.bz2 samba-d9ad17f945d21d50ea629e22db3ee8758be421a6.zip | |
heimdal: add experimental --enable-external-heimdal
This should only be used for testing and when you're
absolutly sure the installed heimdal libraries
support the features we need.
(E.g. heimdal-1.2 or lower should NOT work)
metze
(This used to be commit 66b76b018d6048cec63a75b24ec4c099f6a2eb8c)
| -rw-r--r-- | source4/configure.ac | 2 | ||||
| -rw-r--r-- | source4/heimdal_build/config.m4 | 23 | ||||
| -rw-r--r-- | source4/heimdal_build/external.m4 | 54 |
3 files changed, 78 insertions, 1 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index 7f4b4d01f8..29db34eddf 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -13,7 +13,7 @@ AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h]) m4_include(build/m4/env.m4) m4_include(lib/replace/samba.m4) m4_include(lib/smbreadline/readline.m4) -m4_include(heimdal_build/internal.m4) +m4_include(heimdal_build/config.m4) m4_include(lib/util/fault.m4) m4_include(lib/util/signal.m4) m4_include(lib/util/util.m4) diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4 new file mode 100644 index 0000000000..99aed8c093 --- /dev/null +++ b/source4/heimdal_build/config.m4 @@ -0,0 +1,23 @@ + +external_heimdal=no +AC_MSG_CHECKING([Whether to use external heimdal libraries]) +AC_ARG_ENABLE(external-heimdal, +[ --enable-external-heimdal Enable external heimdal libraries (experimental,default=no)], +[ external_heimdal=$enableval ], +[ external_heimdal=no ]) +AC_MSG_RESULT($external_heimdal) + +if test x"$external_heimdal" = x"yes"; then + +# external_heimdal_start +m4_include(heimdal_build/external.m4) +# external_heimdal_end + +else + +# internal_heimdal_start +m4_include(heimdal_build/internal.m4) +# internal_heimdal_end + +fi + diff --git a/source4/heimdal_build/external.m4 b/source4/heimdal_build/external.m4 new file mode 100644 index 0000000000..3cd8900a12 --- /dev/null +++ b/source4/heimdal_build/external.m4 @@ -0,0 +1,54 @@ +# This is every experimental +# We should really add configure checks +# to verify the installed heimdal libraries +# are good enough for our usage!!! + +HEIMDAL_KRB5_LIBS="-lkrb5 -lcom_err" +HEIMDAL_KRB5_CFLAGS="" +HEIMDAL_KRB5_CPPFLAGS="" +HEIMDAL_KRB5_LDFLAGS="" +SMB_EXT_LIB(HEIMDAL_KRB5, + [${HEIMDAL_KRB5_LIBS}], + [${HEIMDAL_KRB5_CFLAGS}], + [${HEIMDAL_KRB5_CPPFLAGS}], + [${HEIMDAL_KRB5_LDFLAGS}]) +SMB_ENABLE(HEIMDAL_KRB5) +AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available]) +HAVE_KRB5=YES +AC_DEFINE(HAVE_COM_ERR,1,[Whether com_err is available]) +HAVE_COM_ERR=YES + +HEIMDAL_GSSAPI_LIBS="-lgssapi" +HEIMDAL_GSSAPI_CFLAGS="" +HEIMDAL_GSSAPI_CPPFLAGS="" +HEIMDAL_GSSAPI_LDFLAGS="" +SMB_EXT_LIB(HEIMDAL_GSSAPI, + [${HEIMDAL_GSSAPI_LIBS}], + [${HEIMDAL_GSSAPI_CFLAGS}], + [${HEIMDAL_GSSAPI_CPPFLAGS}], + [${HEIMDAL_GSSAPI_LDFLAGS}]) +SMB_ENABLE(HEIMDAL_GSSAPI) +AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available]) +HAVE_GSSAPI=YES + +HEIMDAL_HDB_LIBS="-lhdb" +HEIMDAL_HDB_CFLAGS="" +HEIMDAL_HDB_CPPFLAGS="" +HEIMDAL_HDB_LDFLAGS="" +SMB_EXT_LIB(HEIMDAL_HDB, + [${HEIMDAL_HDB_LIBS}], + [${HEIMDAL_HDB_CFLAGS}], + [${HEIMDAL_HDB_CPPFLAGS}], + [${HEIMDAL_HDB_LDFLAGS}]) +SMB_ENABLE(HEIMDAL_HDB) + +HEIMDAL_KDC_LIBS="-lkdc" +HEIMDAL_KDC_CFLAGS="" +HEIMDAL_KDC_CPPFLAGS="" +HEIMDAL_KDC_LDFLAGS="" +SMB_EXT_LIB(HEIMDAL_KDC, + [${HEIMDAL_KDC_LIBS}], + [${HEIMDAL_KDC_CFLAGS}], + [${HEIMDAL_KDC_CPPFLAGS}], + [${HEIMDAL_KDC_LDFLAGS}]) +SMB_ENABLE(HEIMDAL_KDC) |