X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=9853bc40393ad09ffe4b5f4d8293ae78c39cd742;hb=b8a60b33ee6d45ff51dfbac33e79bd92d6c61195;hp=dc687f2f4a9d7a6cbbd696b6eef93e72937cf42b;hpb=70f372b8ceae7da7c703d43743f2f4325ca36481;p=openldap diff --git a/configure.in b/configure.in index dc687f2f4a..9853bc4039 100644 --- a/configure.in +++ b/configure.in @@ -33,14 +33,14 @@ dnl ================================================================ dnl Configure.in for OpenLDAP AC_INIT(build/version)dnl -# set unset (borrowed from autoconf 2.14a) -if (unset FOO) >/dev/null 2>&1; then +# set unset (borrowed from autoconf 2.49c) +if (OL_FOO=OL_FOO; unset OL_FOO) >/dev/null 2>&1; then ol_unset=unset else ol_unset=false fi # unset CDPATH -$ol_unset CDPATH || test "${CDPATH+set}" != set || CDPATH=: && export CDPATH +$ol_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } AC_CONFIG_AUX_DIR(build)dnl @@ -56,8 +56,8 @@ dnl we try not to use this for much AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE(OpenLDAP,[$OL_VERSION], [no defines])dnl -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) +AC_SUBST(PACKAGE)dnl +AC_SUBST(VERSION)dnl AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package) AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,"$VERSION",Version) @@ -81,7 +81,7 @@ dnl --with-subdir ldap_subdir="/openldap" AC_ARG_WITH(subdir, -[ --with-subdir=DIR change default subdirectory used for installs], +[ --with-subdir=DIR change default subdirectory used for installs], [case "$withval" in no) ldap_subdir="" ;; @@ -143,9 +143,9 @@ OL_ARG_ENABLE(crypt,[ --enable-crypt enable crypt(3) passwords], auto)dnl OL_ARG_ENABLE(kpasswd,[ --enable-kpasswd enable kerberos password verification], no)dnl OL_ARG_ENABLE(spasswd,[ --enable-spasswd enable (Cyrus) SASL password verification], no)dnl OL_ARG_ENABLE(modules,[ --enable-modules enable dynamic module support], no)dnl -OL_ARG_ENABLE(multimaster,[ --enable-multimaster enable multimaster replication], no)dnl +dnl OL_ARG_ENABLE(multimaster,[ --enable-multimaster enable multimaster replication], no)dnl OL_ARG_ENABLE(phonetic,[ --enable-phonetic enable phonetic/soundex], no)dnl -OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups], auto)dnl +OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups], no)dnl OL_ARG_ENABLE(aci,[ --enable-aci enable per-object ACIs], no)dnl OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl OL_ARG_ENABLE(dynamic,[ --enable-dynamic enable linking built binaries with dynamic libs], no)dnl @@ -215,6 +215,9 @@ if test $ol_enable_slapd = no ; then if test $ol_enable_multimaster = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument]) fi +dnl if test $ol_enable_multimaster = yes ; then +dnl AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument]) +dnl fi if test $ol_enable_wrappers = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-wrappers argument]) fi @@ -264,7 +267,7 @@ if test $ol_enable_slapd = no ; then ol_enable_sql=no ol_enable_modules=no - ol_enable_multimaster=no +dnl ol_enable_multimaster=no ol_enable_phonetic=no ol_enable_rlookups=no ol_enable_aci=no @@ -538,28 +541,6 @@ AC_CHECK_LIB(s, afopen, [ ]) -dnl ---------------------------------------------------------------- -dnl PF_INET6 support requires getaddrinfo -dnl PF_LOCAL may use getaddrinfo in available -AC_CHECK_FUNCS( getaddrinfo ) - -if test $ac_cv_func_getaddrinfo = no ; then - if test $ol_enable_ipv6 = yes ; then - AC_MSG_ERROR([IPv6 support requires getaddrinfo()]) - fi - ol_enable_ipv6=no -fi - -if test $ol_enable_local != no ; then - AC_CHECK_HEADERS( sys/un.h ) - - if test $ol_enable_local = auto ; then - ol_enable_local=$ac_cv_header_sys_un_h - elif test $ac_cv_header_sys_un_h = no ; then - AC_MSG_ERROR([AF_LOCAL domain support requires sys/un.h]) - fi -fi - dnl ---------------------------------------------------------------- dnl Check for module support ol_link_modules=no @@ -749,6 +730,44 @@ if test "$ol_enable_dnssrv" = yes -a "$ol_link_dnssrv" = no ; then AC_MSG_ERROR([DNSSRV requires res_query()]) fi +dnl ---------------------------------------------------------------- +dnl PF_INET6 support requires getaddrinfo and INET6_ADDRSTRLEN +dnl PF_LOCAL may use getaddrinfo in available +AC_CHECK_FUNCS( getaddrinfo ) + +ol_link_ipv6=no +if test $ac_cv_func_getaddrinfo = no ; then + if test $ol_enable_ipv6 = yes ; then + AC_MSG_ERROR([IPv6 support requires getaddrinfo()]) + fi +else + AC_CHECK_FUNCS( gai_strerror ) + + AC_CACHE_CHECK([INET6_ADDRSTRLEN],[ol_cv_inet6_addrstrlen],[ + AC_EGREP_CPP(__has_inet6_addrstrlen__,[ +# include +# ifdef INET6_ADDRSTRLEN + __has_inet6_addrstrlen__; +# endif + ], [ol_cv_inet6_addrstrlen=yes], [ol_cv_inet6_addrstrlen=no])]) + + if test $ol_cv_inet6_addrstrlen = yes ; then + ol_link_ipv6=yes + elif test $ol_enable_ipv6 = yes ; then + AC_MSG_ERROR([IPv6 support requires INET6_ADDRSTRLEN]) + fi +fi + +if test $ol_enable_local != no ; then + AC_CHECK_HEADERS( sys/un.h ) + + if test $ol_enable_local = auto ; then + ol_enable_local=$ac_cv_header_sys_un_h + elif test $ac_cv_header_sys_un_h = no ; then + AC_MSG_ERROR([AF_LOCAL domain support requires sys/un.h]) + fi +fi + dnl ---------------------------------------------------------------- dnl Kerberos ol_link_kbind=no @@ -2087,7 +2106,7 @@ fi if test "$ol_enable_local" != no; then AC_DEFINE(LDAP_PF_LOCAL,1,[define to support PF_LOCAL]) fi -if test "$ol_enable_ipv6" != no; then +if test "$ol_link_ipv6" != no; then AC_DEFINE(LDAP_PF_INET6,1,[define to support PF_INET6]) fi if test "$ol_enable_cleartext" != no ; then @@ -2102,9 +2121,9 @@ fi if test "$ol_link_spasswd" != no ; then AC_DEFINE(SLAPD_SPASSWD,1,[define to support SASL passwords]) fi -if test "$ol_enable_multimaster" != no ; then - AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication]) -fi +dnl if test "$ol_enable_multimaster" != no ; then +dnl AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication]) +dnl fi if test "$ol_enable_phonetic" != no ; then AC_DEFINE(SLAPD_PHONETIC,1,[define to support phonetic]) fi