Update of /cvsroot/mahogany/M
In directory usw-pr-cvs1:/tmp/cvs-serv15186
Modified Files:
configure configure.in
Log Message:
don't check for options which are incompatible/not needed because of the values of the
other options
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.272
retrieving revision 1.273
diff -b -u -2 -r1.272 -r1.273
--- configure 28 Apr 2002 18:07:11 -0000 1.272
+++ configure 29 Apr 2002 16:54:15 -0000 1.273
@@ -15,5 +15,5 @@
--enable-debug generate code with debugging information"
ac_help="$ac_help
- --disable-optimize disable compiler optimization"
+ --disable-optimize disable optimization (automatic if debugging)"
ac_help="$ac_help
--with-wxdebug use debug wxWindows libraries"
@@ -562,5 +562,5 @@
-# From configure.in Id: configure.in,v 1.258 2002/04/27 11:46:59 vadz Exp
+# From configure.in Id: configure.in,v 1.259 2002/04/28 18:07:13 vadz Exp
[...1434 lines suppressed...]
set dummy latex2html; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5127: checking for $ac_word" >&5
+echo "configure:5135: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX2HTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5197,5 +5205,5 @@
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5200: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5208: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_cxx_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5220,5 +5228,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5223: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5231: checking whether ${CC} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_c_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.259
retrieving revision 1.260
diff -b -u -2 -r1.259 -r1.260
--- configure.in 28 Apr 2002 18:07:13 -0000 1.259
+++ configure.in 29 Apr 2002 16:54:16 -0000 1.260
@@ -41,24 +41,25 @@
--enable-debug generate code with debugging information)
-M_OVERRIDES(optimize,optimization,USE_OPT,1,
---disable-optimize disable compiler optimization)
-
-dnl M_OVERRIDES(debug,debug code,USE_DEBUG,0,
-dnl --with-debug [deprecated, use --enable-debug instead])
-dnl
-dnl M_OVERRIDES(debuginfo,debuging info,USE_DEBUG_INFO,0,
-dnl --with-debuginfo [deprecated, don't use])
-
-M_OVERRIDES(wxdebug,wxWin debug libs,USE_WXDEBUG,0,
---with-wxdebug use debug wxWindows libraries)
-
-M_OVERRIDES(dmalloc,dmalloc library,USE_DMALLOC,0,
---with-dmalloc use dmalloc (http://dmalloc.com/) for debugging)
-
-M_OVERRIDES(leaktracer,LeakTracer,USE_LEAKTRACER,0,
---with-leaktracer use LeakTracer for debugging)
-
-M_OVERRIDES(efence,ElectricFence,USE_EFENCE,0,
---with-efence use ElectricFence for debugging)
+case "$USE_DEBUG" in
+ dnl options which are incompatible with debugging
+ 0|'')
+ M_OVERRIDES(optimize,optimization,USE_OPT,1,
+ --disable-optimize disable optimization (automatic if debugging))
+ ;;
+
+ dnl options which only make sense if debug was given
+ *)
+ M_OVERRIDES(wxdebug,wxWin debug libs,USE_WXDEBUG,0,
+ --with-wxdebug use debug wxWindows libraries)
+
+ M_OVERRIDES(dmalloc,dmalloc library,USE_DMALLOC,0,
+ --with-dmalloc use dmalloc (http://dmalloc.com/) for debugging)
+
+ M_OVERRIDES(leaktracer,LeakTracer,USE_LEAKTRACER,0,
+ --with-leaktracer use LeakTracer for debugging)
+
+ M_OVERRIDES(efence,ElectricFence,USE_EFENCE,0,
+ --with-efence use ElectricFence for debugging)
+esac
M_OVERRIDES(profile,profiling,USE_PROFILER,0,
@@ -74,6 +75,10 @@
--with-python=xxx one of none/static/dynamic)
-M_OVERRIDES(swig,whether we should use SWIG,USE_SWIG,1,
---without-swig don't use swig even if it is available)
+case "$USE_PYTHON" in
+ static|Static|STATIC|dynamic|Dynamic|DYNAMIC|1)
+ M_OVERRIDES(swig,whether we should use SWIG,USE_SWIG,1,
+ --without-swig don't use swig even if it is available)
+ ;;
+esac
M_OVERRIDES(dialup,special dial-up support,USE_DIALUP,1,
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
