1 files changed, 193 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index 5276c8b..5f6e8e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,17 +20,16 @@
 # Process this file with autoconf to produce a configure script.
 #
 AC_PREREQ(2.61)
-AC_INIT([gnunet-secushare],[0.0.0],[bug-gnunet@gnu.org])
-AM_INIT_AUTOMAKE([gnunet-secushare], [0.0.0])
-AM_CONFIG_HEADER(gnunet_secushare_config.h)
-
+AC_INIT([gnunet-secushare],[0.11.0],[bug-gnunet@gnu.org])
+AM_INIT_AUTOMAKE
+AC_CONFIG_HEADERS([gnunet_secushare_config.h])
+AC_CONFIG_MACRO_DIR([m4])
 AH_TOP([#define _GNU_SOURCE  1])
 
 AC_ISC_POSIX
 AC_PROG_AWK
 AC_PROG_CC
 
-AC_PROG_MKDIR_P
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -40,6 +39,7 @@ AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 AC_CANONICAL_HOST
+AC_SUBST(MKDIR_P)
 
 # dynamic libraries/plugins
 AC_DISABLE_STATIC
@@ -168,6 +168,45 @@ then
 fi
 
 
+# gcov compilation
+AC_MSG_CHECKING(whether to compile with support for code coverage analysis)
+AC_ARG_ENABLE([coverage],
+              AS_HELP_STRING([--enable-coverage],
+                             [compile the library with code coverage support]),
+              [use_gcov=${enableval}],
+              [use_gcov=no])
+AC_MSG_RESULT($use_gcov)
+AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
+
+# should 'make check' run tests?
+AC_MSG_CHECKING(whether to run tests)
+AC_ARG_ENABLE([testruns],
+   [AS_HELP_STRING([--disable-testruns], [disable running tests on make check (default is YES)])],
+   [enable_tests_run=${enableval}],
+   [enable_tests_run=yes])
+AC_MSG_RESULT($enable_test_run)
+AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"])
+
+
+
+# should gnunet-testing be compiled
+AC_MSG_CHECKING(wether to compile gnunet-testing)
+AC_ARG_ENABLE([testing],
+   [AS_HELP_STRING([--disable-testing], [do not build gnunet-testing])],
+   [enable_testing=${enableval}],
+   [enable_testing=yes])
+AC_MSG_RESULT($enable_testing)
+AM_CONDITIONAL([HAVE_TESTING], [test "x$enable_testing" = "xyes"])
+
+# should experimental code be compiled (code that may not yet compile)?
+AC_MSG_CHECKING(whether to compile experimental code)
+AC_ARG_ENABLE([experimental],
+   [AS_HELP_STRING([--enable-experimental], [enable compiling experimental code])],
+   [enable_experimental=${enableval}],
+   [enable_experimental=no])
+AC_MSG_RESULT($enable_experimental)
+AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
+
 
 # Linker hardening options
 # Currently these options are ELF specific - you can't use this with MacOSX
@@ -178,6 +217,155 @@ AC_ARG_ENABLE(linker-hardening,
 fi])
 
 
+SAVE_LDFLAGS=$LDFLAGS
+SAVE_CPPFLAGS=$CPPFLAGS
+
+# test for sqlite
+sqlite=false
+AC_MSG_CHECKING(for SQLite)
+AC_ARG_WITH(sqlite,
+  [  --with-sqlite=PFX       base of SQLite installation],
+  [AC_MSG_RESULT("$with_sqlite")
+   case $with_sqlite in
+   no)
+     ;;
+   yes)
+    AC_CHECK_HEADERS(sqlite3.h,
+     sqlite=true)
+     ;;
+   *)
+    LDFLAGS="-L$with_sqlite/lib $LDFLAGS"
+    CPPFLAGS="-I$with_sqlite/include $CPPFLAGS"
+    AC_CHECK_HEADERS(sqlite3.h,
+     EXT_LIB_PATH="-L$with_sqlite/lib $EXT_LIB_PATH"
+     SQLITE_LDFLAGS="-L$with_sqlite/lib"
+     SQLITE_CPPFLAGS="-I$with_sqlite/include"
+     sqlite=true)
+    LDFLAGS=$SAVE_LDFLAGS
+    CPPFLAGS=$SAVE_CPPFLAGS
+    ;;
+   esac
+  ],
+  [AC_MSG_RESULT([--with-sqlite not specified])
+    AC_CHECK_HEADERS(sqlite3.h, sqlite=true)])
+AM_CONDITIONAL(HAVE_SQLITE, test x$sqlite = xtrue)
+AC_SUBST(SQLITE_CPPFLAGS)
+AC_SUBST(SQLITE_LDFLAGS)
+
+LDFLAGS=$SAVE_LDFLAGS
+CPPFLAGS=$SAVE_CPPFLAGS
+
+# test for postgres
+postgres=false
+# even running the check for postgres breaks emscripten ...
+AS_IF([test "$taler_only" != yes],
+      [AX_LIB_POSTGRESQL([9.5],
+        [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
+         AC_CHECK_HEADERS([libpq-fe.h],
+         postgres=true)
+        ],
+        [AC_MSG_RESULT([no postgres])])])
+AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
+
+
+LDFLAGS=$SAVE_LDFLAGS
+CPPFLAGS=$SAVE_CPPFLAGS
+
+# mysql & windows
+AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
+AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])
+
+if test "$build_target" = "mingw"
+then
+  CYGWIN_MYSQL_MAGIC="#include <mysql/my_global.h>"
+fi
+
+# test for mysql
+mysql=false
+mysqlfail=false
+SAVE_LDFLAGS=$LDFLAGS
+SAVE_CPPFLAGS=$CPPFLAGS
+AC_MSG_CHECKING(for mysql)
+AC_ARG_WITH(mysql,
+  [  --with-mysql=PFX        base of MySQL installation],
+  [AC_MSG_RESULT([$with_mysql])
+   case $with_mysql in
+   no)
+      ;;
+   yes|"")
+      AC_CHECK_HEADERS(mysql/mysql.h,
+       AC_CHECK_LIB(mysqlclient, mysql_init,
+
+       mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
+      ;;
+   *)
+      LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
+      CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
+      AC_CHECK_HEADERS(mysql/mysql.h,
+       AC_CHECK_LIB(mysqlclient, mysql_init,
+        MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql"
+        MYSQL_CPPFLAGS="-I$with_mysql/include"
+
+        mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
+      ;;
+   esac
+  ],
+  [AC_MSG_RESULT([--with-mysql not specified])
+   if test -d "/usr/lib64/mysql"; then
+    MYSQL_LIBDIR="/usr/lib64/mysql"
+   elif test -d "/usr/lib/mysql"; then
+    MYSQL_LIBDIR="/usr/lib/mysql"
+   else
+    MYSQL_LIBDIR="/usr/lib"
+   fi
+   LDFLAGS="-L$MYSQL_LIBDIR $LDFLAGS $ZLIBS"
+   AC_CHECK_LIB(mysqlclient, mysql_init,
+    [AC_CHECK_HEADERS(mysql/mysql.h,
+      MYSQL_LDFLAGS="-L$MYSQL_LIBDIR"
+      mysql=true
+
+     , [], [$CYGWIN_MYSQL_MAGIC])])
+  ])
+
+AC_SUBST(MYSQL_LDFLAGS)
+AC_SUBST(MYSQL_CPPFLAGS)
+
+# additional version check for mysql
+AC_ARG_ENABLE(mysql-version-check, [  --disable-mysql-version-check  do not check MySQL version],, enable_mysql_version_check=yes)
+if test "$mysql" = "true" -a "x$enable_mysql_version_check" = "xyes"
+then
+  AC_MSG_CHECKING(mysql version)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+    [[$CYGWIN_MYSQL_MAGIC
+      #include <mysql/mysql.h>]],
+    [[
+      #if (MYSQL_VERSION_ID < 40100)
+      #error needs at least version >= 4.1
+      #endif
+      int main () { return 0; }
+    ]])
+    ],mysql=true,mysql=false)
+  if test "$mysql" = "false"
+  then
+    mysqlfail=true
+    AC_MSG_RESULT([fail, >= 4.1 required])
+  else
+    AC_MSG_RESULT(ok)
+  fi
+fi
+AM_CONDITIONAL(HAVE_MYSQL, test x$mysql = xtrue)
+AM_CONDITIONAL(HAVE_MYSQLE, false)
+# restore LIBS
+LIBS=$SAVE_LIBS
+LDFLAGS=$SAVE_LDFLAGS
+CPPFLAGS=$SAVE_CPPFLAGS
+
+if test "$sqlite" = 0 -a "$mysql" = 0
+then
+ AC_MSG_ERROR([GNUnet requires SQLite or MySQL])
+fi
+
+
 extra_logging=GNUNET_NO
 AC_ARG_ENABLE([logging],
    AS_HELP_STRING([--enable-logging@<:@=value@:>@],[Enable logging calls. Possible values: yes,no,verbose,veryverbose ('yes' is the default)]),