[GNUnet-SVN] r4778 - in GNUnet: . src/applications

[gnunet]

Author: grothoff
Date: 2007-04-28 14:18:20 -0600 (Sat, 28 Apr 2007)
New Revision: 4778

Modified:
   GNUnet/configure.ac
   GNUnet/src/applications/Makefile.am
Log:
fixing Mantis 1201 -- only build vpn under Linux


Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2007-04-28 20:13:30 UTC (rev 4777)
+++ GNUnet/configure.ac 2007-04-28 20:18:20 UTC (rev 4778)
@@ -77,6 +77,7 @@
      ;;
 linux*)
      AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
+     build_target="linux"
      ;;
 freebsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
@@ -88,6 +89,7 @@
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system])
      LIBS=`echo $LIBS | sed -e "s/-ldl//"`
+     build_target="openbsd"
      ;;
 netbsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
@@ -103,6 +105,7 @@
 *arm-linux*)
      AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
      CFLAGS="-D_REENTRANT -fPIC -pipe $CFLAGS"
+     build_target="linux"
      ;;
 *cygwin*)
      AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
@@ -135,6 +138,8 @@
 AM_CONDITIONAL(MINGW,   test "$build_target" = "mingw")
 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])
 
 

Modified: GNUnet/src/applications/Makefile.am
===================================================================
--- GNUnet/src/applications/Makefile.am 2007-04-28 20:13:30 UTC (rev 4777)
+++ GNUnet/src/applications/Makefile.am 2007-04-28 20:18:20 UTC (rev 4778)
@@ -9,10 +9,9 @@
 
 if !MINGW
 # TESTBED_DIR = testbed
-if !MACOSX
+if LINUX
  VPN_DIR = vpn
 endif
-endif
 
 SUBDIRS        = \
  advertising \