X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/db9a9a8aa3674360299adb7469f2b1e77ea0b0d4..8dc0685213ead3f8896c83cadc130143ccc4d181:/configure.in

diff --git a/configure.in b/configure.in
index 3bdf3d8..e4bd929 100644
--- a/configure.in
+++ b/configure.in
@@ -379,11 +379,11 @@ AC_ARG_WITH(tre,
                           PATH/lib/libtre.so and PATH/include/tre/regex.h exist.], )
 if test "x$withval" != "x"; then
     AC_MSG_RESULT(Using include dir $withval to find libtre)
-    CPPFLAGS="-I$withval/include -L$withval/lib"
+    CPPFLAGS="$CPPFLAGS -I$withval/include -L$withval/lib"
     LIBS="$LIBS -L$withval/lib"
 else
     AC_MSG_RESULT([Looking for tre in system and home dirs (${HOME})...])
-    CPPFLAGS="-I${HOME}/include -L${HOME}/lib"
+    CPPFLAGS="$CPPFLAGS -I${HOME}/include -L${HOME}/lib"
     LIBS="$LIBS -L${HOME}/lib"
 fi
 AC_CHECK_HEADER(tre/regex.h, , [AC_MSG_ERROR([tre/regex.h, the TRE regex headers, were not found. Install tre or use --with-tre=PATH to tell me how to find it, where PATH/include/tre/regex.h exists.  For conveniance, just type 'tools/tre_install.sh' now, to install tre in your home directory.])],)
@@ -398,16 +398,51 @@ AC_ARG_WITH(coredumper,
                           PATH/include/google/coredumper.h exist.], )
 if test "x$withval" != "x"; then
     AC_MSG_RESULT(Using include dir $withval to find coredumper)
-    CPPFLAGS="-I$withval/include -L$withval/lib"
+    CPPFLAGS="$CPPFLAGS -I$withval/include -L$withval/lib"
     LIBS="$LIBS -L$withval/lib"
 else
     AC_MSG_RESULT([Looking for coredumper in system and home dirs (${HOME})...])
-    CPPFLAGS="-I${HOME}/include -L${HOME}/lib"
+    CPPFLAGS="$CPPFLAGS -I${HOME}/include -L${HOME}/lib"
     LIBS="$LIBS -L${HOME}/lib"
 fi
 AC_CHECK_HEADER(google/coredumper.h, , [AC_MSG_RESULT([google/coredumper.h, the coredumper headers, were not found. Install coredumper or use --with-coredumper=PATH to tell me how to find it, where PATH/include/google/coredumper.h exists.  For conveniance, just type 'tools/core_install.sh' now, to install coredumper in your home directory.])],)
 AC_CHECK_LIB(coredumper, WriteCoreDump, , [AC_MSG_RESULT([Coredumper library not found. Install coredumper, or use --with-coredumper=PATH to tell me how to find it, where PATH/lib/libcoredumper.so exists. For conveniance, just type 'tools/core_install.sh' now, to install coredumper in your home directory.])])
 
+dnl openssl checking
+withval=''
+AC_ARG_WITH(ssl,
+[  --with-ssl=PATH      Base path to where openssl is installed],)
+if test "x$withval" != "x"; then
+   AC_MSG_RESULT(Using include dir $withval to find openssl)
+   CPPFLAGS="$CPPFLAGS -I$withval/include -L$withval/lib"
+   LIBS="$LIBS -L$withval/lib"
+else
+   AC_MSG_RESULT([Looking for openssl in system ])
+fi
+
+AC_CHECK_LIB(ssl, BIO_new,
+[
+LIBS="-lssl $LIBS"
+AC_CHECK_HEADERS(openssl/bio.h,
+[
+AC_DEFINE(WITH_SSL, 1, [Define if SSL libs are linked])
+ssl_message="LDAP library:        enabled"
+],
+[
+if test "x$withval" != "x"; then
+   AC_MSG_ERROR([ssl headers not found])
+fi
+])
+],
+[
+if test "x$withval" != "x"; then
+   AC_MSG_ERROR([libldap not found or not valid])
+fi
+]
+)
+AC_MSG_RESULT($LIBS)
+
+
 dnl ldap checking
 withval=''
 AC_ARG_WITH(ldap,
@@ -421,8 +456,9 @@ else
    AC_MSG_RESULT([Looking for ldap in system ])
 fi
 
-AC_CHECK_LIB(ldap, ldap_init, 
+AC_CHECK_LIB(ldap, ldap_simple_bind_s, 
 [
+LIBS="-lldap $LIBS"
 AC_CHECK_HEADERS(ldap.h, 
 [
 AC_DEFINE(WITH_LDAP, 1, [Define if LDAP libs are linked])
@@ -440,6 +476,7 @@ if test "x$withval" != "x"; then
 fi
 ]
 )
+AC_MSG_RESULT($LIBS)
 
 AC_DEFINE_UNQUOTED(CODENAME, "${CODENAME}", [Code name for this release])
 AC_SUBST(MODULE_OBJS)