regenerated autoconf/automake related files

diff --git a/contrib/ldapc++/src/Makefile.in b/contrib/ldapc++/src/Makefile.in
index b105a43dabb6e7e3490d2f94a5994ddd7619df4e..98b5e1aaa1a4993e44cd4dd550a465a65db06d03 100644 (file)
--- a/contrib/ldapc++/src/Makefile.in
+++ b/contrib/ldapc++/src/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -66,12 +66,16 @@ AS = @AS@
 CC = @CC@
 CXX = @CXX@
 DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+STRIP = @STRIP@
 VERSION = @VERSION@
 
 lib_LTLIBRARIES = libldapcpp.la
@@ -114,9 +118,10 @@ LDAPRebindAuth.lo LDAPReferralException.lo LDAPReferenceList.lo \
 LDAPRequest.lo LDAPResult.lo LDAPSearchReference.lo \
 LDAPSearchRequest.lo LDAPSearchResult.lo LDAPSearchResults.lo \
 LDAPUrl.lo LDAPUrlList.lo StringList.lo
+noinst_PROGRAMS =  main$(EXEEXT)
 PROGRAMS =  $(noinst_PROGRAMS)
 
-main_OBJECTS =  main.o
+main_OBJECTS =  main.$(OBJEXT)
 main_DEPENDENCIES =  ./libldapcpp.la
 main_LDFLAGS = 
 CXXFLAGS = @CXXFLAGS@
@@ -151,7 +156,7 @@ OBJECTS = $(libldapcpp_la_OBJECTS) $(main_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .cpp .lo .o .s
+.SUFFIXES: .S .c .cpp .lo .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile
 
@@ -213,6 +218,11 @@ uninstall-libLTLIBRARIES:
          $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
        done
 
+# FIXME: We should only use cygpath when building on Windows,
+# and only if it is available.
+.c.obj:
+       $(COMPILE) -c `cygpath -w $<`
+
 .s.o:
        $(COMPILE) -c $<
 
@@ -221,6 +231,7 @@ uninstall-libLTLIBRARIES:
 
 mostlyclean-compile:
        -rm -f *.o core *.core
+       -rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -257,11 +268,13 @@ distclean-noinstPROGRAMS:
 
 maintainer-clean-noinstPROGRAMS:
 
-main: $(main_OBJECTS) $(main_DEPENDENCIES)
-       @rm -f main
+main$(EXEEXT): $(main_OBJECTS) $(main_DEPENDENCIES)
+       @rm -f main$(EXEEXT)
        $(CXXLINK) $(main_LDFLAGS) $(main_OBJECTS) $(main_LDADD) $(LIBS)
 .cpp.o:
        $(CXXCOMPILE) -c $<
+.cpp.obj:
+       $(CXXCOMPILE) -c `cygpath -w $<`
 .cpp.lo:
        $(LTCXXCOMPILE) -c $<
 

diff --git a/contrib/ldapc++/src/config.h.in b/contrib/ldapc++/src/config.h.in
index 48d69d91fd9f6c02dc539a5cc4b1b41e9af0d2f9..d2c1714044d6b452ac49d9d5fcb8dada053b18a7 100644 (file)
--- a/contrib/ldapc++/src/config.h.in
+++ b/contrib/ldapc++/src/config.h.in
@@ -1,16 +1,18 @@
 /* src/config.h.in.  Generated automatically from configure.in by autoheader.  */
+#undef WITH_DEBUG
 
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#undef TIME_WITH_SYS_TIME
 
-#undef WITH_DEBUG
+/* Define if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
 
-/* Define if you have the resolv library (-lresolv).  */
+/* Define if you have the `resolv' library (-lresolv). */
 #undef HAVE_LIBRESOLV
 
 /* Name of package */
 #undef PACKAGE
 
+/* Define if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
 /* Version number of package */
 #undef VERSION
-