X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/39edf54ab4431e5f62031fd16dd2cb9b359934e3..1c76f1b43ddfe723855e1e55b6e1fc739e5710a8:/configure.in

diff --git a/configure.in b/configure.in
index 852c66f..4a20642 100644
--- a/configure.in
+++ b/configure.in
@@ -386,11 +386,11 @@ else
     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.])],)
-AC_CHECK_LIB(tre, regexec, , [AC_MSG_ERROR([TRE regex library not found. Install tre, or use --with-tre=PATH to tell me how to find it, where PATH/lib/libtre.so exists. For conveniance, just type 'tools/tre_install.sh' now, to install tre in your home directory.])])
+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 convenience, just type 'tools/tre_install.sh' now, to install tre in your home directory.])],)
+AC_CHECK_LIB(tre, regexec, , [AC_MSG_ERROR([TRE regex library not found. Install tre, or use --with-tre=PATH to tell me how to find it, where PATH/lib/libtre.so exists. For convenience, just type 'tools/tre_install.sh' now, to install tre in your home directory.])])
 
 dnl core dumper checking
-core_version="0.2"
+core_version="1.1"
 withval=''
 AC_ARG_WITH(coredumper,
 [  --with-coredumper=PATH  Base path to where core dumper is installed, such
@@ -403,10 +403,45 @@ if test "x$withval" != "x"; then
 else
     AC_MSG_RESULT([Looking for coredumper in system and home dirs (${HOME})...])
     CPPFLAGS="$CPPFLAGS -I${HOME}/include -L${HOME}/lib"
-    LIBS="$LIBS -L${HOME}/lib"
+    LIBS="$LIBS -Wl,--rpath -Wl,${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.])])
+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 convenience, 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 convenience, 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=''