deleted

[strongswan.git] / configure.in

diff --git a/configure.in b/configure.in
index e9d6f19..31d7d83 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,8 +16,8 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.0.1)
-AM_INIT_AUTOMAKE
+AC_INIT(strongSwan,4.0.5)
+AM_INIT_AUTOMAKE(tar-ustar)
 AC_C_BIGENDIAN
 AC_SUBST(ipsecdir, '${libexecdir}/ipsec')
 AC_SUBST(confdir, '${sysconfdir}')
@@ -77,7 +77,6 @@ AC_ARG_ENABLE(
     [leak-detective],
     AS_HELP_STRING([--enable-leak-detective],[enable malloc hooks to find memory leaks (default is NO).]),
     leak_detective=true
-    AC_DEFINE(LEAK_DETECTIVE)
 )
 AM_CONDITIONAL(USE_LEAK_DETECTIVE, test x$leak_detective = xtrue)
 
@@ -90,18 +89,20 @@ AC_PROG_LIBTOOL
 AC_PROG_LEX
 AC_PROG_YACC
 AC_PROG_CC(intel)
+AC_PATH_PROG([GPERF], [gperf], [], [$PATH:/bin:/usr/bin:/usr/local/bin])
+AC_PATH_PROG([PERL], [perl], [], [$PATH:/bin:/usr/bin:/usr/local/bin])
 
 dnl ==========================
 dnl  check required libraries
 dnl ==========================
 
-AC_HAVE_LIBRARY([gmp],,[AC_MSG_ERROR([GNU Multi Precision library gmp not found])])    
+AC_HAVE_LIBRARY([gmp],[LIBS="$LIBS"],[AC_MSG_ERROR([GNU Multi Precision library gmp not found])])      
 if test "$ldap" = "true"; then
-    AC_HAVE_LIBRARY([ldap],,[AC_MSG_ERROR([LDAP enabled, but library ldap not found])])
-    AC_HAVE_LIBRARY([lber],,[AC_MSG_ERROR([LDAP enabled, but library lber not found])])
+    AC_HAVE_LIBRARY([ldap],[LIBS="$LIBS"],[AC_MSG_ERROR([LDAP enabled, but library ldap not found])])
+    AC_HAVE_LIBRARY([lber],[LIBS="$LIBS"],[AC_MSG_ERROR([LDAP enabled, but library lber not found])])
 fi
 if test "$http" = "true"; then
-    AC_HAVE_LIBRARY([curl],,[AC_MSG_ERROR([HTTP enabled, but library curl not found])])
+    AC_HAVE_LIBRARY([curl],[LIBS="$LIBS"],[AC_MSG_ERROR([HTTP enabled, but library curl not found])])
 fi
 
 
@@ -140,6 +141,7 @@ AC_OUTPUT(
        src/pluto/Makefile
        src/whack/Makefile
        src/charon/Makefile
+dnl    src/charon/testing/Makefile
        src/stroke/Makefile
        src/ipsec/Makefile
        src/starter/Makefile