X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=d212979694f37f338d17706c040564cf52351ac4;hb=9bc1d178f943c055a87eae6f501bddff29556f76;hp=fe9143dfb8c57e51b4ab67ba88e48b15978ee3f5;hpb=d23a3e621989e219c1d1cb62938b1aef3d0f306f;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index fe9143dfb..d21297969 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,29 +250,27 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
-USE_ATS=false
-
-if test x$USE_ATS = xtrue
+AC_ARG_ENABLE([ats],
+  [AS_HELP_STRING([--enable-ats], [enable ATS code])],
+  [enable_ats=${enableval}],
+  [enable_ats=no])
+if test x${enable_ats} = xyes
 then
-	glpk=true
-	AC_MSG_WARN([ATS enabled])
-	AC_CHECK_HEADERS(glpk.h, ,[gplk=false])
-	AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false])
+	AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false])
+	AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false])
 	# GLPK must support atm MLP presolving, version >= 4.32
-	AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]])
+	AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]])
 	if test x$gplk = xfalse
 	then
-		AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
-		AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk])
+		AM_CONDITIONAL(HAVE_LIBGLPK, false)
 		AC_MSG_WARN([GNUnet requires GLPK  >= 4.32])
 	else
-		AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
-		AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk])
+		AM_CONDITIONAL(HAVE_LIBGLPK, true)
+		AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
 	fi
 else
-	AC_MSG_WARN([ATS disabled])
-	AM_CONDITIONAL(HAVE_GLPK, false)
 	AM_CONDITIONAL(HAVE_LIBGLPK, false)
+	AC_MSG_RESULT([no])
 fi
 
 # test for kvm and kstat (for CPU stats under BSD/Solaris)
@@ -525,42 +523,6 @@ AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1)
 AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
 
 
-# openssl
-openssl=0
-AC_MSG_CHECKING([for openssl])
-AC_ARG_WITH(openssl,
-   [  --with-openssl=PFX   base of openssl installation],
-   [AC_MSG_RESULT([$with_openssl])
-    case $with_openssl in
-      no)
-        ;;
-      yes)
-        AC_CHECK_HEADERS([openssl/ssl.h],
-            AC_CHECK_LIB([ssl], [SSL_new],
-	     openssl=1))
-        ;;
-      *)
-        LDFLAGS="-L$with_openssl/lib $LDFLAGS"
-        CPPFLAGS="-I$with_openssl/include $CPPFLAGS"
-        AC_CHECK_HEADERS([openssl/ssl.h],
-            AC_CHECK_LIB([ssl], [SSL_new],
-              EXT_LIB_PATH="-L$with_openssl/lib $EXT_LIB_PATH"
-              openssl=1))
-        ;;
-    esac
-   ],
-   [AC_MSG_RESULT([--with-openssl not specified])
-    AC_CHECK_HEADERS([openssl/ssl.h],
-        AC_CHECK_LIB([ssl], [SSL_new],
-          openssl=1))])
-AM_CONDITIONAL(HAVE_OPENSSL, test x$openssl = x1)
-AC_DEFINE_UNQUOTED([HAVE_OPENSSL], $openssl, [We have openssl])
-
-
-
-
-
-
 # restore LIBS
 LIBS=$SAVE_LIBS
 
@@ -779,6 +741,7 @@ m4/Makefile
 po/Makefile.in 
 src/Makefile
 src/arm/Makefile
+src/ats/Makefile
 src/block/Makefile
 src/core/Makefile
 src/datacache/Makefile
@@ -793,6 +756,7 @@ src/include/gnunet_directories.h
 src/hostlist/Makefile
 src/mesh/Makefile
 src/nat/Makefile
+src/nse/Makefile
 src/peerinfo/Makefile
 src/peerinfo-tool/Makefile
 src/statistics/Makefile
@@ -815,6 +779,8 @@ pkgconfig/gnunetdv.pc
 pkgconfig/gnunetfragmentation.pc
 pkgconfig/gnunetfs.pc
 pkgconfig/gnunethello.pc
+pkgconfig/gnunetnat.pc
+pkgconfig/gnunetnse.pc
 pkgconfig/gnunetpeerinfo.pc
 pkgconfig/gnunetstatistics.pc
 pkgconfig/gnunettesting.pc
@@ -842,16 +808,6 @@ then
  AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.])
 fi
 
-if test "x$esmtp" != "x1"
-then
- AC_MSG_NOTICE([NOTICE: libesmtp not found, monkey will not be installed.])
-fi
-
-if test "x$openssl" != "x1"
-then
- AC_MSG_NOTICE([NOTICE: OpenSSL not found, monkey will not be installed.])
-fi
-
 AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres])
 
 if test "$enable_framework_build" = "yes"
@@ -883,5 +839,7 @@ configuration file:
 	mkdir $HOME/.gnunet/
 	touch $HOME/.gnunet/gnunet.conf
 	
-Optionally, download and compile gnunet-gtk to get a GUI.
+Optionally, download and compile:
+- gnunet-gtk to get a GUI for file-sharing.
+- gnunet-setup to get a GUI for configuration.
 ********************************************])