[GNUnet-SVN] r20606 - in gnunet: . src/core src/dht src/nse src/statistics

[gnunet]

Author: grothoff
Date: 2012-03-19 15:53:13 +0100 (Mon, 19 Mar 2012)
New Revision: 20606

Modified:
   gnunet/configure.ac
   gnunet/src/core/core.conf.in
   gnunet/src/dht/dht.conf.in
   gnunet/src/nse/nse.conf.in
   gnunet/src/statistics/statistics.conf.in
Log:
add configure option --enable-javaports to open ports of services with Java 
bindings by default (#2228)

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-03-19 14:19:46 UTC (rev 20605)
+++ gnunet/configure.ac 2012-03-19 14:53:13 UTC (rev 20606)
@@ -172,6 +172,7 @@
 # sockets in default configuratin:
 AC_SUBST(UNIXONLY)
 
+
 AC_MSG_CHECKING([for build target])
 AM_CONDITIONAL(DARWIN,  test "$build_target" = "darwin")
 AM_CONDITIONAL(CYGWIN,  test "$build_target" = "cygwin")
@@ -777,12 +778,27 @@
 # should expensive tests be run?
 AC_MSG_CHECKING(whether to run expensive tests)
 AC_ARG_ENABLE([expensivetests],
-   [AS_HELP_STRING([--enable-expensive-tests], [enable running expensive 
testcases])],
+   [AS_HELP_STRING([--enable-expensivetests], [enable running expensive 
testcases])],
    [enable_expensive=${enableval}],
    [enable_expensive=no])
 AC_MSG_RESULT($enable_expensive)
 AM_CONDITIONAL([HAVE_EXPENSIVE_TESTS], [test "x$enable_expensive" = "xyes"])
 
+# should ports be open for Java services?
+AC_MSG_CHECKING(whether to enable ports for gnunet-java)
+AC_ARG_ENABLE([javaports],
+   [AS_HELP_STRING([--enable-javaports], [use non-zero ports for services with 
Java bindings (default is NO)])],
+   [enable_java_ports=${enableval}],
+   [enable_java_ports=no])
+AC_MSG_RESULT($enable_java_ports)
+if test "x$enable_java_ports" = "xyes"
+then
+  JAVAPORT=""
+else
+  JAVAPORT="$UNIXONLY"
+fi
+AC_SUBST(JAVAPORT)
+
 # should benchmarks be run?
 AC_MSG_CHECKING(whether to run benchmarks during make check)
 AC_ARG_ENABLE([benchmarks],
@@ -930,6 +946,12 @@
   AC_MSG_NOTICE([NOTICE: sqlite not found.  sqLite support will not be 
compiled.])
 fi
 
+# java ports
+if test "x$enable_java_ports" = "xyes"
+then
+  AC_MSG_NOTICE([NOTICE: opening ports for gnunet-java bindings by default.])
+fi
+
 if test "x$lmhd" != "x1"
 then
  AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be 
installed.])

Modified: gnunet/src/core/core.conf.in
===================================================================
--- gnunet/src/core/core.conf.in        2012-03-19 14:19:46 UTC (rev 20605)
+++ gnunet/src/core/core.conf.in        2012-03-19 14:53:13 UTC (rev 20606)
@@ -1,6 +1,6 @@
 [core]
 AUTOSTART = YES
address@hidden@ PORT = 2092
address@hidden@PORT = 2092
 HOSTNAME = localhost
 HOME = $SERVICEHOME
 CONFIG = $DEFAULTCONFIG

Modified: gnunet/src/dht/dht.conf.in
===================================================================
--- gnunet/src/dht/dht.conf.in  2012-03-19 14:19:46 UTC (rev 20605)
+++ gnunet/src/dht/dht.conf.in  2012-03-19 14:53:13 UTC (rev 20606)
@@ -1,6 +1,6 @@
 [dht]
 AUTOSTART = YES
address@hidden@ PORT = 2095
address@hidden@PORT = 2095
 HOSTNAME = localhost
 HOME = $SERVICEHOME
 CONFIG = $DEFAULTCONFIG

Modified: gnunet/src/nse/nse.conf.in
===================================================================
--- gnunet/src/nse/nse.conf.in  2012-03-19 14:19:46 UTC (rev 20605)
+++ gnunet/src/nse/nse.conf.in  2012-03-19 14:53:13 UTC (rev 20606)
@@ -1,6 +1,6 @@
 [nse]
 AUTOSTART = YES
address@hidden@ PORT = 2097
address@hidden@PORT = 2097
 HOSTNAME = localhost
 HOME = $SERVICEHOME
 CONFIG = $DEFAULTCONFIG

Modified: gnunet/src/statistics/statistics.conf.in
===================================================================
--- gnunet/src/statistics/statistics.conf.in    2012-03-19 14:19:46 UTC (rev 
20605)
+++ gnunet/src/statistics/statistics.conf.in    2012-03-19 14:53:13 UTC (rev 
20606)
@@ -1,6 +1,6 @@
 [statistics]
 AUTOSTART = YES
address@hidden@ PORT = 2088
address@hidden@PORT = 2088
 HOSTNAME = localhost
 HOME = $SERVICEHOME
 CONFIG = $DEFAULTCONFIG