diff options
author | Petr Spacek <pspacek@redhat.com> | 2016-10-14 10:20:43 +0200 |
---|---|---|
committer | David Kupka <dkupka@redhat.com> | 2016-10-24 13:30:12 +0200 |
commit | 0d7d6f3904287bb4903ffaa9d8c61e7593ae76d6 (patch) | |
tree | 9b31312db79a175e48e0a89531ed3f8340eb8414 /client | |
parent | 881ab4edffa5e9c6c8bd8fb9762e04d776c4a573 (diff) | |
download | freeipa-0d7d6f3904287bb4903ffaa9d8c61e7593ae76d6.tar.gz freeipa-0d7d6f3904287bb4903ffaa9d8c61e7593ae76d6.tar.xz freeipa-0d7d6f3904287bb4903ffaa9d8c61e7593ae76d6.zip |
Build: merge client/configure.ac into top-level configure.ac
https://fedorahosted.org/freeipa/ticket/6418
Reviewed-By: Lukas Slebodnik <lslebodn@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Diffstat (limited to 'client')
-rw-r--r-- | client/Makefile.am | 6 | ||||
-rw-r--r-- | client/configure.ac | 241 |
2 files changed, 3 insertions, 244 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index e95fba268..3f6caafe3 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -30,7 +30,7 @@ AM_CPPFLAGS = \ -DLOCALEDIR=\""$(localedir)"\" \ -DIPACONFFILE=\""$(IPA_CONF_FILE)"\" \ $(KRB5_CFLAGS) \ - $(OPENLDAP_CFLAGS) \ + $(LDAP_CFLAGS) \ $(SASL_CFLAGS) \ $(POPT_CFLAGS) \ $(WARN_CFLAGS) \ @@ -58,7 +58,7 @@ ipa_getkeytab_SOURCES = \ ipa_getkeytab_LDADD = \ ../asn1/libipaasn1.la \ $(KRB5_LIBS) \ - $(OPENLDAP_LIBS) \ + $(LDAP_LIBS) \ $(SASL_LIBS) \ $(POPT_LIBS) \ $(LIBINTL_LIBS) \ @@ -84,7 +84,7 @@ ipa_join_SOURCES = \ ipa_join_LDADD = \ $(KRB5_LIBS) \ - $(OPENLDAP_LIBS) \ + $(LDAP_LIBS) \ $(SASL_LIBS) \ $(CURL_LIBS) \ $(XMLRPC_LIBS) \ diff --git a/client/configure.ac b/client/configure.ac deleted file mode 100644 index 1de1db8f2..000000000 --- a/client/configure.ac +++ /dev/null @@ -1,241 +0,0 @@ -AC_PREREQ(2.59) -m4_include(version.m4) -AC_INIT([ipa-client], - IPA_VERSION, - [https://hosted.fedoraproject.org/projects/freeipa/newticket]) -LT_INIT - -AC_CONFIG_HEADERS([config.h]) - -AM_INIT_AUTOMAKE([foreign]) - -AM_MAINTAINER_MODE - -AC_PROG_CC_C99 -AC_STDC_HEADERS -AC_DISABLE_STATIC - -AC_HEADER_STDC - -AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes]) - -AC_SUBST(VERSION) -AC_SUBST([INSTALL_DATA], ['$(INSTALL) -m 644 -p']) - -dnl --------------------------------------------------------------------------- -dnl - Check for KRB5 -dnl --------------------------------------------------------------------------- - -KRB5_LIBS= -AC_CHECK_HEADER(krb5.h, [], [AC_MSG_ERROR([krb5.h not found])]) - -krb5_impl=mit - -if test "x$ac_cv_header_krb5_h" = "xyes" ; then - dnl lazy check for Heimdal Kerberos - AC_CHECK_HEADERS(heim_err.h) - if test $ac_cv_header_heim_err_h = yes ; then - krb5_impl=heimdal - else - krb5_impl=mit - fi - - if test "x$krb5_impl" = "xmit"; then - AC_CHECK_LIB(k5crypto, main, - [krb5crypto=k5crypto], - [krb5crypto=crypto]) - - AC_CHECK_LIB(krb5, main, - [have_krb5=yes - KRB5_LIBS="-lkrb5 -l$krb5crypto -lcom_err"], - [have_krb5=no], - [-l$krb5crypto -lcom_err]) - - elif test "x$krb5_impl" = "xheimdal"; then - AC_CHECK_LIB(des, main, - [krb5crypto=des], - [krb5crypto=crypto]) - - AC_CHECK_LIB(krb5, main, - [have_krb5=yes - KRB5_LIBS="-lkrb5 -l$krb5crypto -lasn1 -lroken -lcom_err"], - [have_krb5=no], - [-l$krb5crypto -lasn1 -lroken -lcom_err]) - - AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1, - [define if you have HEIMDAL Kerberos]) - - else - have_krb5=no - AC_MSG_WARN([Unrecognized Kerberos5 Implementation]) - fi - - if test "x$have_krb5" = "xyes" ; then - ol_link_krb5=yes - - AC_DEFINE(HAVE_KRB5, 1, - [define if you have Kerberos V]) - - else - AC_MSG_ERROR([Required Kerberos 5 support not available]) - fi - -fi - -AC_SUBST(KRB5_LIBS) - -dnl --------------------------------------------------------------------------- -dnl - OpenLDAP SDK -dnl --------------------------------------------------------------------------- - -AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes) -dnl Check for other libraries we need to link with to get the main routines. -test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) } -test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) } -test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) } -dnl Recently, we need -lber even though the main routines are elsewhere, -dnl because otherwise be get link errors w.r.t. ber_pvt_opt_on. So just -dnl check for that (it's a variable not a fun but that doesn't seem to -dnl matter in these checks) and stick in -lber if so. Can't hurt (even to -dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who -dnl #### understands LDAP needs to fix this properly. -test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) } - -if test "$with_ldap" = "yes"; then - if test "$with_ldap_des" = "yes" ; then - OPENLDAP_LIBS="${OPENLDAP_LIBS} -ldes" - fi - if test "$with_ldap_krb" = "yes" ; then - OPENLDAP_LIBS="${OPENLDAP_LIBS} -lkrb" - fi - if test "$with_ldap_lber" = "yes" ; then - OPENLDAP_LIBS="${OPENLDAP_LIBS} -llber" - fi - OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap" -else - AC_MSG_ERROR([OpenLDAP not found]) -fi - -AC_SUBST(OPENLDAP_LIBS) - - -dnl --------------------------------------------------------------------------- -dnl - Check for POPT -dnl --------------------------------------------------------------------------- - -POPT_LIBS= -AC_CHECK_HEADER(popt.h, [], [AC_MSG_ERROR([popt.h not found])]) -AC_CHECK_LIB(popt, poptGetContext, [POPT_LIBS="-lpopt"]) -AC_SUBST(POPT_LIBS) - -dnl --------------------------------------------------------------------------- -dnl - Check for SASL -dnl --------------------------------------------------------------------------- - -SASL_LIBS= -AC_CHECK_HEADER(sasl/sasl.h, [], [AC_MSG_ERROR([sasl/sasl.h not found])]) -AC_CHECK_LIB(sasl2, sasl_client_init, [SASL_LIBS="-lsasl2"]) -AC_SUBST(SASL_LIBS) - -dnl --------------------------------------------------------------------------- -dnl - Check for CURL -dnl --------------------------------------------------------------------------- - -CURL_LIBS= -AC_CHECK_HEADER(curl/curl.h, [], [AC_MSG_ERROR([curl/curl.h not found])]) -AC_CHECK_LIB(curl, curl_easy_init, [CURL_LIBS="-lcurl"]) -if test "x$CURL_LIBS" = "x" ; then - AC_MSG_ERROR([curl not found]) -fi -AC_SUBST(CURL_LIBS) - -dnl --------------------------------------------------------------------------- -dnl - Check for XMLRPC-C -dnl --------------------------------------------------------------------------- - -XMLRPC_LIBS= -AC_CHECK_HEADER(xmlrpc-c/base.h, [], [AC_MSG_ERROR([xmlrpc-c/base.h not found])]) -AC_CHECK_LIB(xmlrpc_client, xmlrpc_client_init2, [XMLRPC_LIBS="-lxmlrpc -lxmlrpc_client -lxmlrpc_util"]) -if test "x$XMLRPC_LIBS" = "x" ; then - AC_MSG_ERROR([xmlrpc-c not found]) -fi -AC_SUBST(XMLRPC_LIBS) - -dnl --------------------------------------------------------------------------- -dnl - Check for libintl -dnl --------------------------------------------------------------------------- -SAVE_LIBS="$LIBS" -LIBINTL_LIBS= -AC_CHECK_HEADER(libintl.h, [], [AC_MSG_ERROR([libintl.h not found, please install xgettext])]) -AC_SEARCH_LIBS([bindtextdomain], [libintl],[], []) -if test "x$ac_cv_search_bindtextdomain" = "xno" ; then - AC_MSG_ERROR([libintl is not found and your libc does not support gettext, please install xgettext]) -elif test "x$ac_cv_search_bindtextdomain" != "xnone required" ; then - LIBINTL_LIBS="$ac_cv_search_bindtextdomain" -fi -LIBS="$SAVELIBS" -AC_SUBST(LIBINTL_LIBS) - -dnl --------------------------------------------------------------------------- -dnl - Check for libini_config -dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES([LIBINI_CONFIG], [ini_config >= 1.2.0], [have_libini_config=1], [have_libini_config=]) -if test x$have_libini_config = x; then - AC_MSG_WARN([Could not find LIBINI_CONFIG headers]) -else - INI_CONFIG_CFLAGS="`$PKG_CONFIG --cflags ini_config`" - INI_CONFIG_LIBS="`$PKG_CONFIG --libs ini_config`" - AC_CHECK_LIB(ini_config, ini_config_file_open, [], - [AC_MSG_WARN([ini_config library must support ini_config_file_open])], - [$INI_CONFIG_LIBS]) - AC_CHECK_LIB(ini_config, ini_config_augment, [], - [AC_MSG_WARN([ini_config library must support ini_config_augment])], - [$INI_CONFIG_LIBS]) -fi - -if test x$have_libini_config = x1; then - INI_CFLAGS="$INI_CONFIG_CFLAGS" - INI_LIBS="$INI_CONFIG_LIBS" -else - AC_MSG_ERROR([ini_config development packages not available]) -fi - -AC_SUBST(INI_LIBS) -AC_SUBST(INI_CFLAGS) - - -dnl --------------------------------------------------------------------------- -dnl - Set the data install directory since we don't use pkgdatadir -dnl --------------------------------------------------------------------------- - -IPA_DATA_DIR="$datadir/ipa" -AC_SUBST(IPA_DATA_DIR) - -dnl --------------------------------------------------------------------------- -dnl Finish -dnl --------------------------------------------------------------------------- - -# Files - -AC_CONFIG_FILES([ - Makefile - man/Makefile -]) - -AC_OUTPUT - -echo " - IPA client $VERSION - ======================== - - prefix: ${prefix} - exec_prefix: ${exec_prefix} - libdir: ${libdir} - bindir: ${bindir} - sbindir: ${sbindir} - sysconfdir: ${sysconfdir} - localstatedir: ${localstatedir} - datadir: ${datadir} - source code location: ${srcdir} - Maintainer mode: ${USE_MAINTAINER_MODE} -" |