From: Ralf Haferkamp Date: Thu, 20 Dec 2007 12:35:30 +0000 (+0000) Subject: autoconf/automake adjustments, regenerated files X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~284 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3ce83307f7ef10db445860f99bf3ec99af0e3e6c;p=openldap autoconf/automake adjustments, regenerated files --- diff --git a/contrib/ldapc++/configure b/contrib/ldapc++/configure index c814e852ca..c303fe79a6 100755 --- a/contrib/ldapc++/configure +++ b/contrib/ldapc++/configure @@ -19719,18 +19719,24 @@ _ACEOF fi -if test "${ac_cv_header_ldap_h+set}" = set; then - { echo "$as_me:$LINENO: checking for ldap.h" >&5 -echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ldap_h+set}" = set; then + + +for ac_header in termios.h ldap.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5 -echo "${ECHO_T}$ac_cv_header_ldap_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking ldap.h usability" >&5 -echo $ECHO_N "checking ldap.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19738,7 +19744,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -19770,15 +19776,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking ldap.h presence" >&5 -echo $ECHO_N "checking ldap.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <$ac_header> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -19811,40 +19817,48 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: ldap.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ldap.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ldap.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ldap.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ldap.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ldap.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ldap.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ldap.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ldap.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ldap.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for ldap.h" >&5 -echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ldap_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_ldap_h=$ac_header_preproc + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5 -echo "${ECHO_T}$ac_cv_header_ldap_h" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi +done cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ diff --git a/contrib/ldapc++/configure.in b/contrib/ldapc++/configure.in index c6d32c0f00..e263b198f4 100644 --- a/contrib/ldapc++/configure.in +++ b/contrib/ldapc++/configure.in @@ -67,7 +67,7 @@ dnl NOOP ]) dnl Checks for header files. AC_HEADER_TIME -AC_CHECK_HEADER(ldap.h) +AC_CHECK_HEADERS(termios.h ldap.h) AC_EGREP_HEADER(ldap_add_ext,ldap.h,[ dnl NOOP : diff --git a/contrib/ldapc++/src/Makefile.in b/contrib/ldapc++/src/Makefile.in index 3e960e6a89..db1433d41a 100644 --- a/contrib/ldapc++/src/Makefile.in +++ b/contrib/ldapc++/src/Makefile.in @@ -67,9 +67,11 @@ am_libldapcpp_la_OBJECTS = LDAPAddRequest.lo LDAPAsynConnection.lo \ LDAPModification.lo LDAPModifyRequest.lo LDAPModList.lo \ LDAPObjClass.lo LDAPRebind.lo LDAPRebindAuth.lo \ LDAPReferralException.lo LDAPReferenceList.lo LDAPRequest.lo \ - LDAPResult.lo LDAPSchema.lo LDAPSearchReference.lo \ - LDAPSearchRequest.lo LDAPSearchResult.lo LDAPSearchResults.lo \ - LDAPUrl.lo LDAPUrlList.lo StringList.lo + LDAPResult.lo LDAPSaslBindResult.lo LDAPSchema.lo \ + LDAPSearchReference.lo LDAPSearchRequest.lo \ + LDAPSearchResult.lo LDAPSearchResults.lo LDAPUrl.lo \ + LDAPUrlList.lo SaslInteraction.lo SaslInteractionHandler.lo \ + StringList.lo libldapcpp_la_OBJECTS = $(am_libldapcpp_la_OBJECTS) libldapcpp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ @@ -201,73 +203,79 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libldapcpp.la libldapcpp_la_SOURCES = LDAPAddRequest.cpp \ - LDAPAsynConnection.cpp \ - LDAPAttribute.cpp \ - LDAPAttributeList.cpp \ - LDAPAttrType.cpp \ - LDAPBindRequest.cpp \ - LDAPCompareRequest.cpp \ - LDAPConnection.cpp \ - LDAPConstraints.cpp \ - LDAPControl.cpp \ - LDAPControlSet.cpp \ - LDAPDeleteRequest.cpp \ - LDAPEntry.cpp \ - LDAPEntryList.cpp \ - LDAPException.cpp \ - LDAPExtRequest.cpp \ - LDAPExtResult.cpp \ - LDAPMessage.cpp \ - LDAPMessageQueue.cpp \ - LDAPModDNRequest.cpp \ - LDAPModification.cpp \ - LDAPModifyRequest.cpp \ - LDAPModList.cpp \ - LDAPObjClass.cpp \ - LDAPRebind.cpp \ - LDAPRebindAuth.cpp \ - LDAPReferralException.cpp \ - LDAPReferenceList.cpp \ - LDAPRequest.cpp \ - LDAPResult.cpp \ - LDAPSchema.cpp \ - LDAPSearchReference.cpp \ - LDAPSearchRequest.cpp \ - LDAPSearchResult.cpp \ - LDAPSearchResults.cpp \ - LDAPUrl.cpp \ - LDAPUrlList.cpp \ - StringList.cpp + LDAPAsynConnection.cpp \ + LDAPAttribute.cpp \ + LDAPAttributeList.cpp \ + LDAPAttrType.cpp \ + LDAPBindRequest.cpp \ + LDAPCompareRequest.cpp \ + LDAPConnection.cpp \ + LDAPConstraints.cpp \ + LDAPControl.cpp \ + LDAPControlSet.cpp \ + LDAPDeleteRequest.cpp \ + LDAPEntry.cpp \ + LDAPEntryList.cpp \ + LDAPException.cpp \ + LDAPExtRequest.cpp \ + LDAPExtResult.cpp \ + LDAPMessage.cpp \ + LDAPMessageQueue.cpp \ + LDAPModDNRequest.cpp \ + LDAPModification.cpp \ + LDAPModifyRequest.cpp \ + LDAPModList.cpp \ + LDAPObjClass.cpp \ + LDAPRebind.cpp \ + LDAPRebindAuth.cpp \ + LDAPReferralException.cpp \ + LDAPReferenceList.cpp \ + LDAPRequest.cpp \ + LDAPResult.cpp \ + LDAPSaslBindResult.cpp \ + LDAPSchema.cpp \ + LDAPSearchReference.cpp \ + LDAPSearchRequest.cpp \ + LDAPSearchResult.cpp \ + LDAPSearchResults.cpp \ + LDAPUrl.cpp \ + LDAPUrlList.cpp \ + SaslInteraction.cpp \ + SaslInteractionHandler.cpp \ + StringList.cpp include_HEADERS = LDAPAsynConnection.h \ - LDAPAttribute.h \ - LDAPAttributeList.h \ - LDAPAttrType.h \ - LDAPConnection.h \ - LDAPConstraints.h \ - LDAPControl.h \ - LDAPControlSet.h \ - LDAPEntry.h \ - LDAPEntryList.h \ - LDAPException.h \ - LDAPExtResult.h \ - LDAPMessage.h \ - LDAPMessageQueue.h \ - LDAPModification.h \ - LDAPModList.h \ - LDAPObjClass.h \ - LDAPRebind.h \ - LDAPRebindAuth.h \ - LDAPReferralException.h \ - LDAPReferenceList.h \ - LDAPResult.h \ - LDAPSchema.h \ - LDAPSearchReference.h \ - LDAPSearchResult.h \ - LDAPSearchResults.h \ - LDAPUrl.h \ - LDAPUrlList.h \ - StringList.h + LDAPAttribute.h \ + LDAPAttributeList.h \ + LDAPAttrType.h \ + LDAPConnection.h \ + LDAPConstraints.h \ + LDAPControl.h \ + LDAPControlSet.h \ + LDAPEntry.h \ + LDAPEntryList.h \ + LDAPException.h \ + LDAPExtResult.h \ + LDAPMessage.h \ + LDAPMessageQueue.h \ + LDAPModification.h \ + LDAPModList.h \ + LDAPObjClass.h \ + LDAPRebind.h \ + LDAPRebindAuth.h \ + LDAPReferralException.h \ + LDAPReferenceList.h \ + LDAPResult.h \ + LDAPSaslBindResult.h \ + LDAPSchema.h \ + LDAPSearchReference.h \ + LDAPSearchResult.h \ + LDAPSearchResults.h \ + LDAPUrl.h \ + LDAPUrlList.h \ + SaslInteraction.h \ + SaslInteractionHandler.h \ + StringList.h noinst_HEADERS = LDAPAddRequest.h \ LDAPBindRequest.h \ @@ -398,6 +406,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LDAPReferralException.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LDAPRequest.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LDAPResult.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LDAPSaslBindResult.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LDAPSchema.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LDAPSearchReference.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LDAPSearchRequest.Plo@am__quote@ @@ -405,6 +414,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LDAPSearchResults.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LDAPUrl.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LDAPUrlList.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SaslInteraction.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SaslInteractionHandler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StringList.Plo@am__quote@ .cpp.o: