[Eas-dev-commit]eas-dev/build/unix INSTALL,1.4,1.5 acconfig.h,1.1,1.2 configure.in,1.16,1.17

[Yurii R. <yr...@us...>]

Update of /cvsroot/eas-dev/eas-dev/build/unix
In directory sc8-pr-cvs1:/tmp/cvs-serv3491/build/unix

Modified Files:
	INSTALL acconfig.h configure.in 
Log Message:
liburl is now needed, ldap library needed; slightly improved build process;
econf source code initial submission (still very incomplete); minor changes to logger
initial submissions for bostorage; directory for programs


Index: INSTALL
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/build/unix/INSTALL,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- INSTALL	8 Feb 2003 03:24:48 -0000	1.4
+++ INSTALL	9 Feb 2003 08:18:16 -0000	1.5
@@ -15,6 +15,8 @@
 glib 2.2.0 (http://www.gtk.org/)
 CxxTest 2.8.0 (http://cxxtest.sourceforge.net/)
 pkg-config 0.15.0 (http://www.freedesktop.org/software/pkgconfig)
+liburl (http://www.damtp.cam.ac.uk/user/kp229/liburl/)
+OpenLDAP 2.1.12 or above
 OpenOffice.Org SDK 1.0.1_alpha (http://udk.openoffice.org/)
 
 

Index: acconfig.h
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/build/unix/acconfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- acconfig.h	8 Feb 2003 03:24:48 -0000	1.1
+++ acconfig.h	9 Feb 2003 08:18:16 -0000	1.2
@@ -1,3 +1,4 @@
 #undef SAL_UNX
 #undef HAVE_SYSLOG
+#undef HAVE_URL_STRING
 @TOP@

Index: configure.in
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/build/unix/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- configure.in	8 Feb 2003 08:23:46 -0000	1.16
+++ configure.in	9 Feb 2003 08:18:16 -0000	1.17
@@ -44,6 +44,8 @@
 AC_PROG_LN_S
 AC_SUBST(LN_S)
 
+
+
 dnl check for ODK
 
 AC_CHECK_PROG(IDLC,idlc,idlc,no)
@@ -103,6 +105,79 @@
           done
 fi
 
+dnl ldap
+
+AC_ARG_WITH(libldap,[  --with-libldap=DIR          Path to the libldap library [/usr/local/lib]],[
+        LIBS="-L$with_libldap $LIBS "   
+        ],[
+        LIBS="-L/usr/local/lib $LIBS "  
+        ]
+)
+
+AC_ARG_WITH(ldap-includes,[  --with-ldap-includes=DIR    Path to the libldap include files [/usr/local/include]
+],[
+        CPPFLAGS="-I$with_ldap_includes $CPPFLAGS "     
+        ],[
+        CPPFLAGS="-I/usr/local/include $CPPFLAGS "
+        ]
+)
+dnl Checks for libraries.
+AC_CHECK_LIB(resolv,main)
+AC_CHECK_LIB(lber,ber_strdup,[
+dnl NOOP
+        :
+    ],[
+        echo "        didn't find ber_strdup in liblber !";
+        echo "        Check for the right version (>= 2.0) of the OpenLDAP libraries";
+        echo "        or try the --with-libldap option.";
+        exit
+    ])
+AC_CHECK_LIB(ldap,ldap_add_ext,[
+dnl NOOP
+        :
+    ],[
+        echo "        didn't find ldap_add_ext in libldap !";
+        echo "        Check for the right version (>= 2.0) of the OpenLDAP libraries";
+        echo "        or try the --with-libldap option.";
+        exit
+    ],[
+    -llber
+    ])
+
+dnl Checks for header files.
+AC_HEADER_TIME
+AC_CHECK_HEADER(ldap.h)
+AC_EGREP_HEADER(ldap_add_ext,ldap.h,[
+dnl NOOP
+        :
+    ],[
+        echo "        didn't find ldap_add_ext in ldap.h!";
+        echo "        Check for the right version (>= 2.0) of the OpenLDAP includes";
+        echo "        or try --with-ldap-includes option.";
+        exit
+    ])
+AC_CHECK_HEADER(lber.h)
+AC_EGREP_HEADER(ber_strdup,lber.h,[
+dnl NOOP
+        :
+    ],[
+        echo "        didn't find ber_strdup in lber.h!";
+        echo "        Check for the right version (>= 2.0) of the OpenLDAP includes";
+        echo "        or try --with-ldap-includes option.";
+        exit
+    ])
+
+
+dnl libURL
+AC_MSG_CHECKING(url/url_string.hh) 
+AC_TRY_CPP(url/url_string.hh,[echo yes],[ echo no;
+        echo "        didn't find url/url_string.hh!";
+        echo "        Please install liburl";
+	exit 
+ ])
+
+AC_DEFINE(HAVE_URL_STRING)
+
 dnl
 dnl Tools
 dnl
@@ -140,6 +215,9 @@
            ../../components/logger/Makefile	   
            ../../components/logger/src/Makefile	   	   
            ../../components/logger/tests/Makefile	   	   	   
+	   ../../components/econf/Makefile
+	   ../../components/econf/src/Makefile	   
+	   ../../components/econf/tests/Makefile	   	   
 	   ../../services/Makefile
 	   ../../services/domain-controller/Makefile
 	   ../../libs/Makefile
@@ -150,4 +228,4 @@
 	   ../../libs/libsmstorage/src/Makefile	   
 	   ../../tools/Makefile
 	   ../../tools/uno/Makefile
-	   ])
\ No newline at end of file
+	   ])