X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=2e2b90321cbdcd7fe8203fd81f0a98a959bc6ad7;hb=7fb21027ff8726fec229ef0a55b84263be0c18d0;hp=40608c5ce98cc4f130d06b821cc896da1521c4e7;hpb=e3dca1bf40ac8d8a884c261045ad1e9cade49a15;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index 40608c5ce..2e2b90321 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,7 @@ AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris")
 AM_CONDITIONAL(XFREEBSD, test "$build_target" = "freebsd")
 AM_CONDITIONAL(OPENBSD, test "$build_target" = "openbsd")
 AM_CONDITIONAL(LINUX, test "$build_target" = "linux")
+
 AC_MSG_RESULT([$build_target])
 AC_SUBST(build_target)
 AM_CONDITIONAL([am__fastdepOBJC], false)
@@ -189,10 +190,7 @@ fi
 
 
 # libcurl
-LIBCURL_CHECK_CONFIG(,7.18.0,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.18.0]))
-# restore LIBS
-LIBS=$SAVE_LIBS
-
+LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
@@ -244,7 +242,7 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files]))
 
 # Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there)
-AC_CHECK_HEADERS([langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h])
+AC_CHECK_HEADERS([langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h])
 
 # test for libgmp
 gmp=0
@@ -332,8 +330,8 @@ AC_ARG_WITH(postgres,
     CPPFLAGS="-I$with_postgres/include $CPPFLAGS"
     AC_CHECK_HEADERS(postgresql/libpq-fe.h,
      EXT_LIB_PATH="-L$with_postgres/lib $EXT_LIB_PATH"
-     SQLITE_LDFLAGS="-L$with_postgres/lib"
-     SQLITE_CPPFLAGS="-I$with_postgres/include"
+     POSTGRES_LDFLAGS="-L$with_postgres/lib"
+     POSTGRES_CPPFLAGS="-I$with_postgres/include"
      postgres=true)
     LDFLAGS=$SAVE_LDFLAGS
     CPPFLAGS=$SAVE_CPPFLAGS
@@ -347,7 +345,7 @@ AC_SUBST(POSTGRES_CPPFLAGS)
 AC_SUBST(POSTGRES_LDFLAGS)
 
 # test for pcap
-pcap=false
+pcap=0
 AC_MSG_CHECKING(for libpcap)
 AC_ARG_WITH(pcap,
   [  --with-pcap=PFX       base of pcap installation],
@@ -357,7 +355,7 @@ AC_ARG_WITH(pcap,
      ;;
    yes)
     AC_CHECK_HEADERS(pcap.h,
-     pcap=true)
+     pcap=1)
      ;;
    *)
     LDFLAGS="-L$with_pcap/lib $LDFLAGS"
@@ -366,15 +364,15 @@ AC_ARG_WITH(pcap,
      EXT_LIB_PATH="-L$with_pcap/lib $EXT_LIB_PATH"
      PCAP_LDFLAGS="-L$with_pcap/lib"
      PCAP_CPPFLAGS="-I$with_pcap/include"
-     pcap=true)
+     pcap=1)
     LDFLAGS=$SAVE_LDFLAGS
     CPPFLAGS=$SAVE_CPPFLAGS
     ;;
    esac
   ],
   [AC_MSG_RESULT([--with-pcap not specified])
-    AC_CHECK_HEADERS(pcap.h, pcap=true)])
-AM_CONDITIONAL(HAVE_PCAP, test x$pcap = xtrue)
+    AC_CHECK_HEADERS(pcap.h, pcap=1)])
+AM_CONDITIONAL(HAVE_PCAP, test x$pcap = x1)
 AC_SUBST(PCAP_CPPFLAGS)
 AC_SUBST(PCAP_LDFLAGS)
 
@@ -707,14 +705,14 @@ AC_SUBST(EXT_LIB_PATH)
 
 
 # should 'make check' run tests?
-AC_MSG_CHECKING(whether to disable running tests)
+AC_MSG_CHECKING(whether to run tests)
 AC_ARG_ENABLE(testruns,
-   [AS_HELP_STRING([--enable-test-suppression],
-               [disable running tests on make check])],
-   [disable_tests_run=$enableval],
-   [disable_tests_run="no"])
-AC_MSG_RESULT($disable_test_run)
-AM_CONDITIONAL([DISABLE_TEST_RUN], [test "x$disable_tests_run" = "xyes"])
+   [AS_HELP_STRING([--enable-testruns=yes/no],
+               [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([DISABLE_TEST_RUN], [test "x$enable_tests_run" = "xno"])
 
 # should experimental code be compiled (code that may not yet compile)?
 disable_experimental=yes
@@ -727,6 +725,18 @@ AC_ARG_ENABLE(experimental,
 AC_MSG_RESULT($enable_experimental)
 AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
 
+# should malicious code be compiled (code used for testing with malicious peers)
+enable_malicious=0
+AC_MSG_CHECKING(whether to compile malicious code)
+AC_ARG_ENABLE(malicious,
+   [AS_HELP_STRING([--enable-malicious],
+               [enable compiling malicious code (only for developers for testing)])],
+   [enable_malicious=1],
+   [enable_malicious=0])
+AC_MSG_RESULT($enable_malicious)
+AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "x1"])
+AC_DEFINE_UNQUOTED([HAVE_MALICIOUS], $enable_malicious, [Compile malicious code])
+
 # gcov compilation
 use_gcov=no
 AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage],
@@ -755,8 +765,6 @@ src/include/gnunet_directories.h
 src/hostlist/Makefile
 src/monkey/Makefile
 src/nat/Makefile
-src/nat/libnatpmp/Makefile
-src/nat/miniupnp/Makefile
 src/peerinfo/Makefile
 src/peerinfo-tool/Makefile
 src/statistics/Makefile
@@ -811,16 +819,28 @@ then
 fi
 
 AC_MSG_NOTICE([********************************************
-You can build GNUnet with
-	make install
-now. After that, install gnunet-gtk or gnunet-qt and run 
-	gnunet-setup -d wizard-gtk
-(on graphical systems with GTK) or
-	gnunet-setup -d wizard-qt
-(on graphical systems with QT) or
-	gnunet-setup -d wizard-curses
-(on text-based systems with curses) in order to make important configuration
-settings. If neither works for you, you can find a template configuration
-file in the contrib/ subdirectory. Copy it to /etc/gnunetd.conf and modify it
-using your favourite text editor.
+You can compile GNUnet with
+	make
+now. After that, run (if necessary as 'root')
+        make install
+to install everything. You may want to create a new user account
+to run the GNUnet service:
+	adduser gnunet
+You also need to create an configuration file that should
+specify the path where GNUnet should store data.  For example,
+you could store in "/etc/gnunet.conf" the following lines:
+
+[PATHS]
+SERVICEHOME = /opt/gnunet/
+DEFAULTCONFIG = /etc/gnunet.conf
+
+Now, in order to start your peer, run as the 'gnunet' user
+	gnunet-arm -s
+
+Each GNUnet user should also create an (at least initially) empty
+configuration file:
+	mkdir $HOME/.gnunet/
+	touch $HOME/.gnunet/gnunet.conf
+	
+Optionally, download and compile gnunet-gtk to get a GUI.
 ********************************************])