]> git.sur5r.net Git - openldap/commitdiff
- changed configure option --disable-debug to --enable-debug
authorRalf Haferkamp <ralf@openldap.org>
Thu, 5 Oct 2000 14:16:16 +0000 (14:16 +0000)
committerRalf Haferkamp <ralf@openldap.org>
Thu, 5 Oct 2000 14:16:16 +0000 (14:16 +0000)
- rebuilt the configure script

15 files changed:
contrib/ldapc++/Makefile.in
contrib/ldapc++/README
contrib/ldapc++/acconfig.h [new file with mode: 0644]
contrib/ldapc++/configure
contrib/ldapc++/configure.in
contrib/ldapc++/src/LDAPAttribute.cpp
contrib/ldapc++/src/LDAPBindRequest.cpp
contrib/ldapc++/src/LDAPMessageQueue.cpp
contrib/ldapc++/src/LDAPSearchRequest.cpp
contrib/ldapc++/src/Makefile.am
contrib/ldapc++/src/Makefile.in
contrib/ldapc++/src/StringList.cpp
contrib/ldapc++/src/ac/string.h [deleted file]
contrib/ldapc++/src/config.h.in
contrib/ldapc++/src/debug.h

index 92a5e7412e03f9f7aa19d5dbf6185a2296015b93..e2c7795a3045213af60f85fa526bb3b1df049dc5 100644 (file)
@@ -80,9 +80,10 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ./src/config.h
 CONFIG_CLEAN_FILES = 
-DIST_COMMON =  README AUTHORS Makefile.am Makefile.in TODO aclocal.m4 \
-config.guess config.sub configure configure.in install-sh ltconfig \
-ltmain.sh missing mkinstalldirs
+DIST_COMMON =  README AUTHORS INSTALL Makefile.am Makefile.in TODO \
+acconfig.h aclocal.m4 config.guess config.sub configure configure.in \
+install-sh ltconfig ltmain.sh missing mkinstalldirs src/config.h.in \
+src/stamp-h.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -106,6 +107,34 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
+src/config.h: src/stamp-h
+       @if test ! -f $@; then \
+               rm -f src/stamp-h; \
+               $(MAKE) src/stamp-h; \
+       else :; fi
+src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status
+       cd $(top_builddir) \
+         && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
+            $(SHELL) ./config.status
+       @echo timestamp > src/stamp-h 2> /dev/null
+$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in
+       @if test ! -f $@; then \
+               rm -f $(srcdir)/src/stamp-h.in; \
+               $(MAKE) $(srcdir)/src/stamp-h.in; \
+       else :; fi
+$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+       cd $(top_srcdir) && $(AUTOHEADER)
+       @echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+       -rm -f src/config.h
+
+maintainer-clean-hdr:
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -294,33 +323,33 @@ distclean-generic:
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
+mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-tags clean-generic mostlyclean-am
+clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
 
 clean: clean-recursive
 
-distclean-am:  distclean-tags distclean-generic clean-am
+distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
        -rm -f libtool
 
 distclean: distclean-recursive
        -rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-               distclean-am
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+               maintainer-clean-generic distclean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
 maintainer-clean: maintainer-clean-recursive
        -rm -f config.status
 
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
index b761678d881ea59bde1d92c03dc8367be831fbbd..5c49b1fff282a376e4b9bfd3d60eddfa7d0c0397 100644 (file)
@@ -14,6 +14,8 @@ libraries in the default place:
         C-libraries are located.
 --with-ldap-includes=<path to ldap include files> : To tell configure
         where the OpenLDAP include files are located.
+--enable-debug to enable compliation with debugging symbols and stderr
+        output
 (run "configure --help" to see all possible command line options)
 
 If configure finishes without problems. You can simply call "make" to 
diff --git a/contrib/ldapc++/acconfig.h b/contrib/ldapc++/acconfig.h
new file mode 100644 (file)
index 0000000..01f4957
--- /dev/null
@@ -0,0 +1,2 @@
+#undef WITH_DEBUG
+
index e5ebeec7811c3f79ff826340a84e861cd0de89d2..7a697fcb87c0d940653d7133ae66e4d005f2ba7c 100755 (executable)
@@ -22,7 +22,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
 ac_help="$ac_help
---disable-debug"
+--enable-debug"
 ac_help="$ac_help
   --with-libldap=DIR          Path to the libldap library [/usr/local/lib]"
 ac_help="$ac_help
@@ -1621,10 +1621,11 @@ exec 5>>./config.log
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
   
-       
-else
-  
        CXXFLAGS="-g -O0 -Wall"
+    cat >> confdefs.h <<\EOF
+#define WITH_DEBUG 1
+EOF
+
        
 
 fi
@@ -1658,7 +1659,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6
-echo "configure:1662: checking for main in -lresolv" >&5
+echo "configure:1663: checking for main in -lresolv" >&5
 ac_lib_var=`echo resolv'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1666,14 +1667,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1670 "configure"
+#line 1671 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1701,7 +1702,7 @@ else
 fi
 
 echo $ac_n "checking for ber_strdup in -llber""... $ac_c" 1>&6
-echo "configure:1705: checking for ber_strdup in -llber" >&5
+echo "configure:1706: checking for ber_strdup in -llber" >&5
 ac_lib_var=`echo lber'_'ber_strdup | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1709,7 +1710,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-llber  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1713 "configure"
+#line 1714 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1720,7 +1721,7 @@ int main() {
 ber_strdup()
 ; return 0; }
 EOF
-if { (eval echo configure:1724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1748,7 +1749,7 @@ else
 fi
 
 echo $ac_n "checking for ldap_add_ext in -lldap""... $ac_c" 1>&6
-echo "configure:1752: checking for ldap_add_ext in -lldap" >&5
+echo "configure:1753: checking for ldap_add_ext in -lldap" >&5
 ac_lib_var=`echo ldap'_'ldap_add_ext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1758,7 +1759,7 @@ LIBS="-lldap
     -llber
      $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1762 "configure"
+#line 1763 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1769,7 +1770,7 @@ int main() {
 ldap_add_ext()
 ; return 0; }
 EOF
-if { (eval echo configure:1773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1797,12 +1798,12 @@ else
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1801: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1802: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1806 "configure"
+#line 1807 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1811,7 +1812,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1832,7 +1833,7 @@ EOF
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1836: checking how to run the C preprocessor" >&5
+echo "configure:1837: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1847,13 +1848,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1851 "configure"
+#line 1852 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1864,13 +1865,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1868 "configure"
+#line 1869 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1881,13 +1882,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1885 "configure"
+#line 1886 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1913,17 +1914,17 @@ echo "$ac_t""$CPP" 1>&6
 
 ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:1917: checking for ldap.h" >&5
+echo "configure:1918: checking for ldap.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1922 "configure"
+#line 1923 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1945,7 +1946,7 @@ else
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 1949 "configure"
+#line 1950 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
@@ -1967,17 +1968,17 @@ rm -f conftest*
 
 ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:1971: checking for lber.h" >&5
+echo "configure:1972: checking for lber.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1976 "configure"
+#line 1977 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1999,7 +2000,7 @@ else
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 2003 "configure"
+#line 2004 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
index f93c7cdcd18928d55c5ea5bdd7cafdc96b9b38dc..f7d8e3f5e9bd0750b4f66a7c7a4bf16a88485985 100644 (file)
@@ -21,9 +21,9 @@ AC_PROG_RANLIB
 dnl AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 dnl AC_PROG_MAKE_SET
-AC_ARG_ENABLE(debug,--disable-debug,[
-       ],[
+AC_ARG_ENABLE(debug,--enable-debug,[
        CXXFLAGS="-g -O0 -Wall"
+    AC_DEFINE(WITH_DEBUG)
        ]
 )
 
index d27d52c715c4891a8e6a481f1739aa3b8c5da765..a3200dd4b5620e300f45669838cc7f71e03ea945 100644 (file)
@@ -165,7 +165,6 @@ LDAPMod* LDAPAttribute::toLDAPMod() const {
        ret->mod_op=LDAP_MOD_BVALUES;   //always assume binary-Values
        ret->mod_type= new char[m_name.size()+1];
     m_name.copy(ret->mod_type,string::npos);
-    cerr << "                         " << m_name<< endl;
     ret->mod_type[m_name.size()]=0;
        ret->mod_bvalues=this->getBerValues();
        return ret;
index 06819ff63e5b3d84f66ffd941ae56c193040107d..af1e01d50cd4d2277ca4bc24937023cd01631d90 100644 (file)
@@ -71,7 +71,8 @@ LDAPMessageQueue* LDAPBindRequest::sendRequest(){
 
 LDAPRequest* LDAPBindRequest::followReferral(LDAPMsg* urls){
     DEBUG(LDAP_DEBUG_TRACE,"LDAPBindRequest::followReferral()" << endl);
-    cerr << "ReferralChasing for bind-operation not implemented yet" << endl;
+    DEBUG(LDAP_DEBUG_TRACE,
+            "ReferralChasing for bind-operation not implemented yet" << endl);
     return 0;
 }
 
index dd3b12eeb9832b820de426fecef198567530e632..6d0e614d6f9d39ef2dcb536164bab8eae87e6eee 100644 (file)
@@ -156,8 +156,6 @@ LDAPRequest* LDAPMessageQueue::chaseReferral(LDAPMsg* ref){
     LDAPRequest *refReq=req->followReferral(ref);
     if(refReq !=0){
         if(refReq->getConstraints()->getHopLimit() < refReq->getHopCount()){
-            cout << "LIMIT:" << refReq->getConstraints()->getHopLimit() 
-                << "  COUNT:" << refReq->getHopCount() << endl;
             delete(refReq);
             throw LDAPException(LDAP_REFERRAL_LIMIT_EXCEEDED);
         }
index 6115c71024c40753b1f1eaebd40eace481f51c54..7b5b25e5399b7c6f2101a90003cee60518bab3dd 100644 (file)
@@ -95,7 +95,6 @@ LDAPRequest* LDAPSearchRequest::followReferral(LDAPMsg* ref){
     }
     con = getConnection()->referralConnect(urls,usedUrl,m_cons);
     if(con != 0){
-        cerr << usedUrl->getFilter();
         if((usedUrl->getFilter() != "") && 
             (usedUrl->getFilter() != m_filter)){
                 filter=usedUrl->getFilter();
index b1a6bfaeffe5bf41a4268dcb062f889404b7453a..8a1cf211dcd1a7fd6baf62e5d2c3d31080a9f2cc 100644 (file)
@@ -6,40 +6,40 @@
 lib_LTLIBRARIES = libldapcpp.la
 
 libldapcpp_la_SOURCES = LDAPAddRequest.cpp \
-            LDAPAsynConnection.cpp \
-            LDAPAttribute.cpp \
-            LDAPAttributeList.cpp \
-            LDAPBindRequest.cpp \
-            LDAPCompareRequest.cpp \
+                       LDAPAsynConnection.cpp \
+                       LDAPAttribute.cpp \
+                       LDAPAttributeList.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 \
-            LDAPRebind.cpp \
-            LDAPRebindAuth.cpp \
-            LDAPReferralException.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 \
+                       LDAPRebind.cpp \
+                       LDAPRebindAuth.cpp \
+                       LDAPReferralException.cpp \
             LDAPReferenceList.cpp \
             LDAPRequest.cpp \
-            LDAPResult.cpp \
-            LDAPSearchReference.cpp \
-            LDAPSearchRequest.cpp \
-            LDAPSearchResult.cpp \
-            LDAPSearchResults.cpp \
-            LDAPUrl.cpp \
-            LDAPUrlList.cpp \
-            StringList.cpp 
+                       LDAPResult.cpp \
+                       LDAPSearchReference.cpp \
+                       LDAPSearchRequest.cpp \
+                       LDAPSearchResult.cpp \
+                       LDAPSearchResults.cpp \
+                       LDAPUrl.cpp \
+                       LDAPUrlList.cpp \
+                       StringList.cpp 
 
 include_HEADERS = LDAPAsynConnection.h \
                         LDAPAttribute.h \
@@ -78,7 +78,7 @@ noinst_HEADERS = LDAPAddRequest.h \
 
 libldapcpp_la_LIBADD = -lldap -llber
 libldapcpp_la_LDFLAGS = -version-info 0:1:0
-            
+                       
 noinst_PROGRAMS = main
 
 main_SOURCES = main.cpp
index aeca82c2686bd429226a44e70522f33e33e0687b..c7dbada49d8ce2c036b8d8d763ba15319351b9ad 100644 (file)
@@ -76,7 +76,7 @@ VERSION = @VERSION@
 
 lib_LTLIBRARIES = libldapcpp.la
 
-libldapcpp_la_SOURCES = LDAPAddRequest.cpp             LDAPAsynConnection.cpp             LDAPAttribute.cpp             LDAPAttributeList.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             LDAPRebind.cpp             LDAPRebindAuth.cpp             LDAPReferralException.cpp             LDAPReferenceList.cpp             LDAPRequest.cpp             LDAPResult.cpp             LDAPSearchReference.cpp             LDAPSearchRequest.cpp             LDAPSearchResult.cpp             LDAPSearchResults.cpp             LDAPUrl.cpp             LDAPUrlList.cpp             StringList.cpp 
+libldapcpp_la_SOURCES = LDAPAddRequest.cpp                     LDAPAsynConnection.cpp                  LDAPAttribute.cpp                       LDAPAttributeList.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                         LDAPRebind.cpp                  LDAPRebindAuth.cpp                      LDAPReferralException.cpp             LDAPReferenceList.cpp             LDAPRequest.cpp                         LDAPResult.cpp                  LDAPSearchReference.cpp                         LDAPSearchRequest.cpp                   LDAPSearchResult.cpp                    LDAPSearchResults.cpp                   LDAPUrl.cpp                     LDAPUrlList.cpp                         StringList.cpp 
 
 
 include_HEADERS = LDAPAsynConnection.h                         LDAPAttribute.h                         LDAPAttributeList.h                         LDAPConnection.h                         LDAPConstraints.h                         LDAPControl.h                         LDAPEntry.h                         LDAPEntryList.h                         LDAPException.h                         LDAPExtResult.h                         LDAPMessage.h                         LDAPMessageQueue.h                         LDAPModification.h                         LDAPModList.h                         LDAPRebind.h                         LDAPRebindAuth.h                         LDAPReferralException.h                         LDAPReferenceList.h                         LDAPResult.h                         LDAPSearchReference.h                         LDAPSearchResult.h                         LDAPUrl.h                         LDAPUrlList.h                         StringList.h 
index f77563fbb49eaba829b1058af53ea6f0a459cf4d..4189c392007b209db87e2239a1321477f9b4aaa9 100644 (file)
@@ -19,7 +19,6 @@ StringList::StringList(char** values){
     }else{
         char** i;
         for(i=values; *i != 0; i++){
-            cerr << *i << endl;
             m_data.push_back(string(*i));
         }
     }
diff --git a/contrib/ldapc++/src/ac/string.h b/contrib/ldapc++/src/ac/string.h
deleted file mode 100644 (file)
index c5471e1..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Generic string.h */
-/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
- */
-
-#ifndef _AC_STRING_H
-#define _AC_STRING_H
-
-#ifdef STDC_HEADERS
-#      include <string.h>
-
-#else
-#      ifdef HAVE_STRING_H
-#              include <string.h>
-#      elif HAVE_STRINGS_H
-#              include <strings.h>
-#      endif
-
-#      ifdef HAVE_MEMORY_H
-#              include <memory.h>
-#      endif
-
-#      ifndef HAVE_STRRCHR
-#              undef strchr
-#              define strchr index
-#              undef strrchr
-#              define strrchr rindex
-#      endif
-
-#      ifndef HAVE_MEMCPY
-#              undef memcpy
-#              define memcpy(d, s, n)          ((void) bcopy ((s), (d), (n)))
-#              undef memmove
-#              define memmove(d, s, n)         ((void) bcopy ((s), (d), (n)))
-#      endif
-#endif
-
-/* use ldap_pvt_strtok instead of strtok or strtok_r! */
-LDAP_F(char *) ldap_pvt_strtok LDAP_P(( char *str, const char *delim,
-                                          char **pos ));
-
-#ifndef HAVE_STRDUP
-       /* strdup() is missing, declare our own version */
-#      undef strdup
-#      define strdup(s) ber_strdup(s)
-#else
-       /* some systems fail to declare strdup */
-       LDAP_LIBC_F(char *) (strdup)();
-#endif
-
-/*
- * some systems fail to declare strcasecmp() and strncasecmp()
- * we need them declared so we can obtain pointers to them
- */
-
-/* In Mingw32, strcasecmp is not in the C library, so we don't LIBC_F it */
-int (strcasecmp)();
-int (strncasecmp)();
-
-#ifndef SAFEMEMCPY
-#      if defined( HAVE_MEMMOVE )
-#              define SAFEMEMCPY( d, s, n )    memmove((d), (s), (n))
-#      elif defined( HAVE_BCOPY )
-#              define SAFEMEMCPY( d, s, n )    bcopy((s), (d), (n))
-#      else
-               /* nothing left but memcpy() */
-#              define SAFEMEMCPY( d, s, n )    memcpy((d), (s), (n))
-#      endif
-#endif
-
-#define AC_MEMCPY( d, s, n ) (SAFEMEMCPY((d),(s),(n)))
-#define AC_FMEMCPY( d, s, n ) do { \
-               if((n) == 1) *((char*)(d)) = *((char*)(s)); \
-               else AC_MEMCPY( (d), (s), (n) ); \
-       } while(0)
-
-#endif /* _AC_STRING_H */
index 3fe0c7d7064e98b640568b687593dc53495c22fe..48d69d91fd9f6c02dc539a5cc4b1b41e9af0d2f9 100644 (file)
@@ -3,6 +3,8 @@
 /* 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 resolv library (-lresolv).  */
 #undef HAVE_LIBRESOLV
 
index 13cf128b3b59ec71ae3adefab5413cc9d2b5c93c..8a5b14e317adc644471b20b5b7ddd5f64d61be6c 100644 (file)
 #define PRINT_FILE     \
        cerr << "file: " __FILE__  << " line: " << __LINE__ 
 
+#ifdef WITH_DEBUG
 #define DEBUG(level, arg)       \
     if((level) & DEBUGLEVEL){     \
         cerr  << arg ;          \
     } 
-
-/*
-*      #undef DEBUG
-*      #define DEBUG(level,arg)
-*/
+#else
+#undef DEBUG
+#define DEBUG(level,arg)
+#endif //WITH_DEBUG
 
 #endif // DEBUG_H