X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/d82cf2f04a924c6531bde34c6557038880da9c73..e91c6c1e1326b6ef3242e3ebc9d94c4d8f3526e9:/configure.in

diff --git a/configure.in b/configure.in
index 9906672..d844404 100644
--- a/configure.in
+++ b/configure.in
@@ -70,7 +70,7 @@ AC_HEADER_TIME
 AC_STRUCT_TM
 
 dnl Would rather not bail on headers, BSD has alot of the functions elsewhere. -Jedi
-AC_CHECK_HEADERS(GeoIP.h GeoIPCity.h fcntl.h tgmath.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h arpa/inet.h sys/mman.h sys/stat.h dirent.h,,)
+AC_CHECK_HEADERS(GeoIP.h GeoIPCity.h fcntl.h tgmath.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h arpa/inet.h sys/mman.h sys/stat.h dirent.h ,,)
 
 dnl portability stuff, hurray! -Jedi
 AC_CHECK_MEMBER([struct sockaddr.sa_len],
@@ -304,6 +304,11 @@ AC_ARG_ENABLE(modules,
     echo "WITH_MODULE($module)" >> $MODULE_DEFINES
     if test "x$module" = "xtrack" ; then
       TRACK="-D HAVE_TRACK"
+      AC_DEFINE(HAVE_TRACK, 1, [Define this if you are using mod-track])
+    fi
+    if test "x$module" = "xhelpserv" ; then
+      TRACK="-D HAVE_HELPSERV"
+      AC_DEFINE(HAVE_HELPSERV, 1, [Define this if you are using mod-helpserv])
     fi
   done
   IFS="$OIFS"
@@ -374,18 +379,18 @@ 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.])],)
 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.])])
 
 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
@@ -393,16 +398,86 @@ 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"
-    LIBS="$LIBS -L${HOME}/lib"
+    CPPFLAGS="$CPPFLAGS -I${HOME}/include -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.])])
 
+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,
+[  --with-ldap=PATH    Base path to where the ldap library and headers are installed, 
+                      such that PATH/include/ldap.h and PATH/lib/libldap.so exist.],)
+if test "x$withval" != "x"; then
+   AC_MSG_RESULT(Using include dir $withval to find libldap)
+   CPPFLAGS="$CPPFLAGS -I$withval/include -L$withval/lib"
+   LIBS="$LIBS -L$withval/lib"
+else
+   AC_MSG_RESULT([Looking for ldap in system ])
+fi
+
+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])
+ldap_message="LDAP library:       enabled"
+],
+[
+if test "x$withval" != "x"; then
+   AC_MSG_ERROR([ldap.h not found])
+fi
+])
+],
+[
+if test "x$withval" != "x"; then
+   AC_MSG_ERROR([libldap not found or not valid])
+fi
+]
+)
+AC_MSG_RESULT($LIBS)
+
 AC_DEFINE_UNQUOTED(CODENAME, "${CODENAME}", [Code name for this release])
 AC_SUBST(MODULE_OBJS)
 AC_SUBST(MY_SUBDIRS)
@@ -440,6 +515,7 @@ X3 is now configured as follows:
   Protocol:           $x3_ircd
   Regexp Library      TRE $tre_version
   Coredumper Library  Coredumper $core_version
+  $ldap_message 
 
   Install to:         $prefix