Update of /cvsroot/mahogany/M
In directory usw-pr-cvs1:/tmp/cvs-serv21816
Modified Files:
configure configure.in
Log Message:
renamed some options and I'm fed up with using --enable-debug for wxWin and
--with-debug for Mahogany (besides the latter is simply wrong according to the
autoconf docs)
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.270
retrieving revision 1.271
diff -b -u -2 -r1.270 -r1.271
--- configure 29 Mar 2002 20:42:20 -0000 1.270
+++ configure 27 Apr 2002 11:46:58 -0000 1.271
@@ -13,13 +13,15 @@
# Any additions from configure.in:
ac_help="$ac_help
- --disable-opt no compiler optimisations - may not be effective"
+ --enable-debug generate code for debugging"
ac_help="$ac_help
- --with-debug compile debug code"
+ --disable-optimize disable compiler optimization"
ac_help="$ac_help
- --with-debuginfo include debug info from compiler"
+ --with-debug deprecated, use --enable-debug instead"
+ac_help="$ac_help
[...1520 lines suppressed...]
set dummy latex2html; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5152: checking for $ac_word" >&5
+echo "configure:5187: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX2HTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5222,5 +5257,5 @@
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5225: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5260: 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
@@ -5245,5 +5280,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5248: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5283: 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.257
retrieving revision 1.258
diff -b -u -2 -r1.257 -r1.258
--- configure.in 29 Mar 2002 20:42:21 -0000 1.257
+++ configure.in 27 Apr 2002 11:46:59 -0000 1.258
@@ -38,12 +38,16 @@
dnl --------------------------------------------------------------------------
-M_OVERRIDES(opt,optimization,USE_OPT,1,
---disable-opt no compiler optimisations - may not be effective)
+M_OVERRIDES(debugall,debugging,USE_DEBUG_ALL,0,
+--enable-debug generate code for debugging)
+M_OVERRIDES(optimize,optimization,USE_OPT,1,
+--disable-optimize disable compiler optimization)
+
+dnl TODO: the following three options should go
M_OVERRIDES(debug,debug code,USE_DEBUG,0,
---with-debug compile debug code)
+--with-debug [deprecated, use --enable-debug instead])
M_OVERRIDES(debuginfo,debuging info,USE_DEBUG_INFO,0,
---with-debuginfo include debug info from compiler)
+--with-debuginfo [deprecated, don't use])
M_OVERRIDES(wxdebug,wxWin debug libs,USE_WXDEBUG,0,
@@ -51,5 +55,5 @@
M_OVERRIDES(dmalloc,dmalloc library,USE_DMALLOC,0,
---with-dmalloc use dmalloc library (http://dmalloc.com/) for debugging)
+--with-dmalloc use dmalloc (http://dmalloc.com/) for debugging)
M_OVERRIDES(leaktracer,LeakTracer,USE_LEAKTRACER,0,
@@ -59,9 +63,9 @@
--with-efence use ElectricFence for debugging)
-M_OVERRIDES(prof,profiling,USE_PROFILER,0,
---with-prof generate profiling code)
+M_OVERRIDES(profile,profiling,USE_PROFILER,0,
+--enable-profile generate code for profiling)
M_OVERRIDES(strict,strict compiler options,USE_STRICT,0,
---with-strict strict compiler flags - may not work on all systems)
+--enable-strict strict compiler flags - may not work on all systems)
M_OVERRIDES(nls,i18n support,USE_I18N,1,
@@ -93,5 +97,5 @@
M_OVERRIDES(ssl,SSL support,USE_SSL,1,
---with-ssl=DIR path to SSL directories (requires OpenSSL))
+--with-ssl=ssldir specify path where OpenSSL is installed)
AC_MSG_CHECKING(for install location)
@@ -445,4 +449,13 @@
dnl set debug/optimisation flags
+
+case "$USE_DEBUG_ALL" in
+0|'') USE_DEBUG=""
+ ;;
+*) if test "x$USE_DEBUG" = "x"; then
+ USE_DEBUG=1
+ fi
+ ;;
+esac
case "$USE_DEBUG" in
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
