BSDBuild: r803 - trunk

Author: vedge
Date: 2009-06-03 13:51:59 -0300 (Wed, 03 Jun 2009)
New Revision: 803

Modified:
   trunk/configure
   trunk/configure.in
Log:
2.5

Modified: trunk/configure
===================================================================
--- trunk/configure	2009-06-03 09:59:32 UTC (rev 802)
+++ trunk/configure	2009-06-03 16:51:59 UTC (rev 803)
@@ -8,7 +8,7 @@
 #
 #     $ cat configure.in | mkconfigure > configure
 #
-# Copyright (c) 2001-2008 Hypertriton, Inc. <http://hypertriton.com/>
+# Copyright (c) 2001-2009 Hypertriton, Inc. <http://hypertriton.com/>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -144,7 +144,7 @@
 fi

 if [ "${srcdir}" != "" ]; then
-	echo "concurrent build (source in ${srcdir})"
+	echo "* Separate build (source in ${srcdir})"
 	SRC=${srcdir}
 	perl ${SRC}/mk/mkconcurrent.pl ${SRC}
 	if [ $? != 0 ]; then
@@ -155,6 +155,9 @@
 fi
 BLD=`pwd`

+SRCDIR="${SRC}"
+BLDDIR="${BLD}"
+
 if [ "${testdir}" != "" ]; then
 	echo "Configure tests will be executed in ${testdir}"
 	if [ ! -e "${testdir}" ]; then
@@ -204,7 +207,6 @@
 echo "    --with-cygwin             Add cygwin dependencies under cygwin [no]"
 echo "    --enable-nls              Native Language Support [no]"
 echo "    --with-gettext            Use gettext tools [check]"
-echo "    --enable-debug            Include debugging code [no]"
 exit 1
 fi

@@ -282,16 +284,6 @@
 	echo "NODOC=yes" >> Makefile.config
 fi

-# Process debug option.
-if [ "${enable_debug}" = "yes" ]; then
-	echo "LDFLAGS+=-g" >> Makefile.config
-	echo "#ifndef DEBUG" > config/debug.h
-	echo "#define DEBUG 1" >> config/debug.h
-	echo "#endif /* DEBUG */" >> config/debug.h
-else
-	echo "#undef DEBUG" > config/debug.h
-fi
-
 # Process NLS options.
 if [ "${enable_nls}" = "yes" ]; then
 	ENABLE_NLS="yes"
@@ -421,10 +413,10 @@
 SHAREDIR="$PREFIX/share/bsdbuild"
 echo "SHAREDIR=$SHAREDIR" >>Makefile.config
 echo "mdefs[\"SHAREDIR\"] = \"$SHAREDIR\"" >>configure.lua
-VERSION="2.4"
+VERSION="2.5"
 echo "VERSION=$VERSION" >>Makefile.config
 echo "mdefs[\"VERSION\"] = \"$VERSION\"" >>configure.lua
-RELEASE="Alive in Strange Reality"
+RELEASE="Chatiment de la Rose"
 echo "RELEASE=$RELEASE" >>Makefile.config
 echo "mdefs[\"RELEASE\"] = \"$RELEASE\"" >>configure.lua
 echo "*"

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-06-03 09:59:32 UTC (rev 802)
+++ trunk/configure.in	2009-06-03 16:51:59 UTC (rev 803)
@@ -1,8 +1,8 @@
 # Public domain

 MDEFINE(SHAREDIR, "$PREFIX/share/bsdbuild")
-MDEFINE(VERSION, "2.4")
-MDEFINE(RELEASE, "Alive in Strange Reality")
+MDEFINE(VERSION, "2.5")
+MDEFINE(RELEASE, "Chatiment de la Rose")

 echo "*"
 echo "* Configuration successful."