[Opende-svn] SF.net SVN: opende: [988] trunk

[<kw...@us...>]

Revision: 988
Author:   kwizatz
Date:     2006-06-11 17:38:41 -0700 (Sun, 11 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=988&view=rev

Log Message:
-----------
Applied Changes by Mike Frysinger

Modified Paths:
--------------
    trunk/autogen.sh
    trunk/configure.in
Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2006-06-09 22:15:50 UTC (rev 987)
+++ trunk/autogen.sh	2006-06-12 00:38:41 UTC (rev 988)
@@ -29,13 +29,13 @@
 echo "Warnings about underquoted definitions are harmless"
  
 echo "Running aclocal"
-aclocal -I .
+aclocal -I . || exit 1
 echo "Running autoheader"
-autoheader
+autoheader || exit 1
 echo "Running automake"
-automake --foreign --include-deps --add-missing --copy
+automake --foreign --include-deps --add-missing --copy || exit 1
 echo "Running autoconf"
-autoconf
+autoconf || exit 1
 
 #./configure $*
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-06-09 22:15:50 UTC (rev 987)
+++ trunk/configure.in	2006-06-12 00:38:41 UTC (rev 988)
@@ -33,9 +33,10 @@
 AC_PROG_RANLIB
 AC_TYPE_SIZE_T
 
-AC_ARG_WITH(arch,
-[	--with-arch=[arch]	build for $arch, where arch is any of the -march flags passed to gcc, without the -march, for example --with-arch=pentium3],
+AC_ARG_WITH(arch,AC_HELP_STRING([--with-arch=[arch]],
+[build for $arch, where arch is any of the -march flags passed to gcc, without the -march, for example --with-arch=pentium3]),
 arch=$withval,arch=no)
+ARCHFLAGS=""
 if test "x$arch" != xno
 then
     ARCHFLAGS="-march=$arch"
@@ -241,13 +242,22 @@
     CPPFLAGS="-fomit-frame-pointer -ffast-math"
     CXXFLAGS="-fomit-frame-pointer -ffast-math"
     AC_DEFINE(dNODEBUG,,[Disable debug output])
-else
+fi
+AC_MSG_RESULT($release)
+
+AC_MSG_CHECKING(if building a debug library)
+AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],
+[build a debug library with -g]),
+debug=$enableval,debug=no)
+if test "x$debug" == xyes
+then
     CFLAGS="-g"
     CPPFLAGS="-g"
     CXXFLAGS="-g"
 fi
-AC_MSG_RESULT($release)
+AC_MSG_RESULT($debug)
 
+
 dnl Check variable type sizes
 AC_CHECK_SIZEOF(char)
 AC_CHECK_SIZEOF(int)
@@ -477,5 +487,6 @@
 echo "  Is this a Pentium:       $pentium"
 echo "  Is the CPU x86-64:       $cpu64"
 echo "  Is this a release build: $release"
+echo "  Is this a debug build:   $debug"
 echo "  Headers will be installed in $prefix/include/ode"
 echo "  Libraries will be installed in $prefix/lib"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.