From ae7f4a30812d687317ec42f70c15c72046219026 Mon Sep 17 00:00:00 2001
From: Othmar Gsenger <otti@anytun.org>
Date: Mon, 1 Sep 2014 21:17:11 +0000
Subject: moved anytun newthread from configure to makefile

---
 src/Makefile  |  9 ++++++++-
 src/configure | 26 +++++++++++++-------------
 2 files changed, 21 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index b2f1646..a764bdd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -161,7 +161,7 @@ else
   EXE := .exe
 endif
 
-EXECUTABLES := anytun$(EXE) anytun-config$(EXE) anytun-controld$(EXE) anytun-showtables$(EXE) anytun-nosync$(EXE)
+EXECUTABLES := anytun$(EXE) anytun-config$(EXE) anytun-controld$(EXE) anytun-showtables$(EXE) anytun-nosync$(EXE) anytun-newthread$(EXE)
 EXEOBJS := anytun.o anytun-config.o anytun-controld.o anytun-showtables.o
 
 ANYTUNSRCS := $(ANYTUNOBJS:%.o=%.cpp)
@@ -201,6 +201,12 @@ anytun-nosync$(EXE): $(ANYTUNOBJS) anytun-nosync.o
 anytun-nosync.o: anytun.cpp
 	$(CXX) $(CXXFLAGS) -DANYTUN_NOSYNC $< -c -o anytun-nosync.o
 
+anytun-newthread$(EXE): $(ANYTUNOBJS) $(SYNCOBJS) anytun-newthread.o
+	$(LD) $(ANYTUNOBJS) $(SYNCOBJS) anytun-newthread.o -o $@ $(LDFLAGS)
+
+anytun-newthread.o: anytun.cpp
+	$(CXX) $(CXXFLAGS) -DANYTUN_MULTITHREAD $< -c -o anytun-newthread.o
+
 anytun-showtables$(EXE): $(ANYSHOWOBJS) $(SYNCOBJS) anytun-showtables.o
 	$(LD) $(ANYSHOWOBJS) $(SYNCOBJS) anytun-showtables.o -o $@ $(LDFLAGS)
 
@@ -259,6 +265,7 @@ clean:
 	rm -f $(EXECUTABLES)
 	rm -f *.exe
 	rm -f anytun-nosync
+	rm -f anytun-newthread
 	rm -f -r doc/html/*
 	rm -f -r doc/latex/*
 	rm -f libAnysync.a
diff --git a/src/configure b/src/configure
index ff6ba01..4d55607 100755
--- a/src/configure
+++ b/src/configure
@@ -64,7 +64,7 @@ MANDIR=''
 INSTALLMANPAGE=1
 EXAMPLESDIR=''
 INSTALLEXAMPLES=1
-MULTITHREAD=0
+# MULTITHREAD=0
 
 BOOST_PREFIX=''
 GCRYPT_PREFIX=''
@@ -90,8 +90,8 @@ print_usage() {
   echo "          --enable-passphrase       enable master key and salt passphrase"
   echo "          --disable-routing         disable built-in routing capability"
   echo "          --enable-routing          enable built-in routing capability"
-  echo "          --enable-new-multithread  enable new experimental multithreading"
-  echo "          --disable-new-multithread disable new experimental multithreading"
+#  echo "          --enable-new-multithread  enable new experimental multithreading"
+#  echo "          --disable-new-multithread disable new experimental multithreading"
   echo "          --cross-prefix=<PREFIX>   add PREFIX to compiler calls"
   echo "          --with-boost=<PREFIX>     don't use systemwide boost"
   echo "          --with-gcrypt=<PREFIX>    don't use systemwide gcrypt"
@@ -157,12 +157,12 @@ do
   --disable-routing)
     ROUTING=0
   ;;
-  --enable-new-multithread)
-    MULTITHREAD=1
-  ;;
-  --disable-new-multithread)
-    MULTITHREAD=0
-  ;;
+#  --enable-new-multithread)
+#    MULTITHREAD=1
+#  ;;
+#  --disable-new-multithread)
+#    MULTITHREAD=0
+#  ;;
   --ebuild-compat)
     EBUILD_COMPAT=1
   ;;
@@ -309,10 +309,10 @@ if [ $ROUTING -eq 0 ]; then
   echo "disabling built-in routing capability"
 fi
 
-if [ $MULTITHREAD -eq 1 ]; then
-  CXXFLAGS=$CXXFLAGS' -DANYTUN_MULTITHREAD'
-  echo "enabling new experimental mutlithread"
-fi
+#if [ $MULTITHREAD -eq 1 ]; then
+#  CXXFLAGS=$CXXFLAGS' -DANYTUN_MULTITHREAD'
+#  echo "enabling new experimental mutlithread"
+#fi
 
 if [ -z "$BINDIR" ]; then
   BINDIR=$PREFIX/bin
-- 
cgit v1.2.3