Reverting my last 2 commits in an attempt to fix my own screwball mistake.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1873 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 27 insertions, 88 deletions

diff --git a/Config b/Config
index dc7f91b5f..36ae5b34e 100755
--- a/Config
+++ b/Config
@@ -36,7 +36,7 @@ Load_Cache () {
 	fi
 }
 
-Run_Build_System () {
+Run_CMake () {
 	WITH_INST=""
 	WITH_RUN=""
 	WITH_PERM=""
@@ -44,77 +44,42 @@ Run_Build_System () {
 	RUN_CC_PL=""
 	GEN_TYPE=""
 
-	if [ "$INSTDIR" != "" ] ; then
-		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
-			WITH_INST="-DINSTDIR:STRING=$INSTDIR"
-		else
-			WITH_INST="--with-instdir=$INSTDIR"
-		fi
+	if [ "$INSTDEST" != "" ] ; then
+		WITH_INST="-DINSTDIR:STRING=$INSTDEST"
 	fi
 
 	if [ "$RUNGROUP" != "" ] ; then
-		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
-			WITH_RUN="-DRUNGROUP:STRING=$RUNGROUP"
-		else
-			WITH_RUN="--with-rungroup=$RUNGROUP"
-		fi
+		WITH_RUN="-DRUNGROUP:STRING=$RUNGROUP"
 	fi
 
 	if [ "$UMASK" != "" ] ; then
-		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
-			WITH_PERM="-DDEFUMASK:STRING=$UMASK"
-		else
-			WITH_PERM="--with-permissions=$UMASK"
-		fi
+		WITH_PERM="-DDEFUMASK:STRING=$UMASK"
 	fi
 
 	if [ "$DEBUG" = "yes" ] ; then
-		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
-			BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=DEBUG"
-		else
-			BUILD_TYPE="--with-debugsym"
-		fi
+		BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=DEBUG"
 	else
-		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
-			BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=RELEASE"
-		fi
+		BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=RELEASE"
 	fi
 
 	if [ "$USE_RUN_CC_PL" = "yes" ] ; then
-		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
-			RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=ON"
-		else
-			pwdsave=`pwd`
-			cd "`dirname $SOURCE_DIR/run-cc.pl`"
-			RUN_CC_PL="--with-makebin=`pwd`/run-cc.pl"
-			cd "$pwdsave"
-		fi
+		RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=ON"
 	else
-		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
-			RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=OFF"
-		else
-			RUN_CC_PL="--with-makebin="
-		fi
+		RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=OFF"
 	fi
 
-	if [ "$BUILD_SYSTEM" = "cmake" ] ; then
-		case `uname -s` in
-			MINGW*)
-				GEN_TYPE="-G\"MSYS Makefiles\""
-				;;
-		esac
+	case `uname -s` in
+		MINGW*)
+			GEN_TYPE="-G\"MSYS Makefiles\""
+			;;
+	esac
 
-		echo "cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL $SOURCE_DIR"
+	echo "cmake $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL $SOURCE_DIR"
 
-		cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL $SOURCE_DIR
+	cmake $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL $SOURCE_DIR
 
-		echo ""
-		echo "Now run make to build Anope."
-	else
-		echo "./configure $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL"
-
-		./configure $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL
-	fi
+	echo ""
+	echo "Now run make to build Anope."
 }
 
 ECHO2SUF=''
@@ -134,11 +99,10 @@ export ECHO2 ECHO2SUF
 # Init values
 ###########################################################################
 
-BUILD_SYSTEM="cmake"
-INSTDIR=$HOME/services
+INSTDEST=$HOME/services
 RUNGROUP=
 UMASK=
-DEBUG="yes"
+DEBUG="no"
 USE_RUN_CC_PL="no"
 CAN_QUICK="no"
 SOURCE_DIR=`dirname $0`
@@ -163,7 +127,7 @@ while [ $# -ge 1 ] ; do
 	elif [ $1 = "-quick" -o $1 = "-q" ] ; then
 		Load_Cache
 		if [ "$CAN_QUICK" = "yes" ] ; then
-			Run_Build_System
+			Run_CMake
 		else
 			echo ""
 			echo "Can't find cache file (config.cache), aborting..."
@@ -211,36 +175,12 @@ export ok INPUT
 
 ok=0
 echo "Note: press Return for the default, or enter a new value."
-echo "Are you using configure or cmake?"
-while [ $ok -eq 0 ] ; do
-	echo2 "[$BUILD_SYSTEM] "
-	if read INPUT ; then : ; else echo "" ; exit 1 ; fi
-	if [ ! "$INPUT" ] ; then
-		INPUT=$BUILD_SYSTEM
-	fi
-	case $INPUT in
-		cmake)
-			ok=1
-			;;
-		configure)
-			ok=1
-			;;
-		*)
-			echo "That is not a valid choice!"
-			ok=0
-			;;
-	esac
-done
-BUILD_SYSTEM=$INPUT
-echo ""
-
-ok=0
 echo "In what directory do you want the binaries to be installed?"
 while [ $ok -eq 0 ] ; do
-	echo2 "[$INSTDIR] "
+	echo2 "[$INSTDEST] "
 	if read INPUT ; then : ; else echo "" ; exit 1 ; fi
 	if [ ! "$INPUT" ] ; then
-		INPUT=$INSTDIR
+		INPUT=$INSTDEST
 	fi
 	if [ ! -d "$INPUT" ] ; then
 		if exists "$INPUT" ; then
@@ -261,7 +201,7 @@ while [ $ok -eq 0 ] ; do
 		ok=1
 	fi
 done
-INSTDIR=$INPUT
+INSTDEST=$INPUT
 echo ""
 
 
@@ -370,8 +310,7 @@ echo ""
 echo2 "Saving configuration results in config.cache... "
 
 cat <<EOT >$SOURCE_DIR/config.cache
-BUILD_SYSTEM="$BUILD_SYSTEM"
-INSTDIR="$INSTDIR"
+INSTDEST="$INSTDEST"
 RUNGROUP="$RUNGROUP"
 UMASK=$UMASK
 DEBUG="$DEBUG"
@@ -381,7 +320,7 @@ echo "done."
 
 
 ################################################################################
-# Build the build system string
+# Build the CMake string
 ################################################################################
 
-Run_Build_System
+Run_CMake