X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=fe414b31ed0d60fa73c7ac2026bf0e150b10a9d7;hb=0ea2ffb99da4645d3984fd0b207bd78d261e8356;hp=a68b28820adf9cf918f05a32dc537301b28af5e6;hpb=f4d2eeaa31e2bcf232f2691ebf2246b465fe01fc;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index a68b28820..fe414b31e 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)
@@ -757,6 +755,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
@@ -837,5 +836,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.
 ********************************************])