Menu
▾
▴
SF.net SVN: jazzplusplus:[612] trunk/jazz
|
From: <pst...@us...> - 2008-11-07 18:46:54
|
Revision: 612
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=612&view=rev
Author: pstieber
Date: 2008-11-07 18:46:50 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
1. Moved the location of some configure argument checks.
2. Fixed the selcted actionargument to AC_ARG_ENABLE.
3. Set wx_config_args to --debug if debug was enabled. This will require a
debug build of wxWidgets.
4. Updated the rwquired version of wxWidgets to 2.8.9 in the trunk.
Modified Paths:
--------------
branches/jazz-4.1.9/configure.ac
tex2rtf/configure.ac
trunk/jazz/configure.ac
Modified: branches/jazz-4.1.9/configure.ac
===================================================================
--- branches/jazz-4.1.9/configure.ac 2008-10-08 03:23:28 UTC (rev 611)
+++ branches/jazz-4.1.9/configure.ac 2008-11-07 18:46:50 UTC (rev 612)
@@ -95,7 +95,7 @@
AC_HELP_STRING(
[--enable-sequencer2],
[enable sequencer2 support (off by default)]),
- ac_arg_profile="yes",
+ ac_arg_profile="$enableval",
ac_arg_profile="no")
AC_MSG_RESULT(${enable_sequencer2-no})
@@ -119,6 +119,10 @@
dnl Check for wxWidgets
+if test x$ac_arg_debug = xyes ; then
+ wx_config_args=--debug
+fi
+
AM_OPTIONS_WXCONFIG
AM_PATH_WXCONFIG(2.8.7, wxWin=1)
Modified: tex2rtf/configure.ac
===================================================================
--- tex2rtf/configure.ac 2008-10-08 03:23:28 UTC (rev 611)
+++ tex2rtf/configure.ac 2008-11-07 18:46:50 UTC (rev 612)
@@ -58,6 +58,36 @@
dnl Check for st_blksize in struct stat
AC_ST_BLKSIZE
+AC_MSG_CHECKING([whether to enable debugging])
+AC_ARG_ENABLE(
+ debug,
+ AC_HELP_STRING(
+ [--enable-debug],
+ [enable debugging code (off by default)]),
+ ac_arg_debug="$enableval",
+ ac_arg_debug="no")
+AC_MSG_RESULT(${enable_debug-no})
+
+AC_MSG_CHECKING([whether to enable optimization])
+AC_ARG_ENABLE(
+ optimize,
+ AC_HELP_STRING(
+ [--enable-optimize@<:@=ARG@:>@],
+ [enable optimized code with ARG = 0, 1, 2, or 3 (off by default ARG = 0)]),
+ [opt_level="$enableval" ac_arg_optimize="yes"],
+ ac_arg_optimize="no")
+AC_MSG_RESULT(${enable_optimize-no})
+
+AC_MSG_CHECKING([whether to enable profiling])
+AC_ARG_ENABLE(
+ profile,
+ AC_HELP_STRING(
+ [--enable-profile],
+ [enable gprof profiling code (off by default)]),
+ ac_arg_profile="$enableval",
+ ac_arg_profile="no")
+AC_MSG_RESULT(${enable_profile-no})
+
dnl To support a new system, you need to add its canonical name (as determined
dnl by config.sub or specified by the configure command line) to this "case"
dnl and also define the shared library flags below - search for
@@ -71,6 +101,10 @@
AC_MSG_ERROR(unknown system type ${host}.)
esac
+if test x$ac_arg_debug = xyes ; then
+ wx_config_args=--debug
+fi
+
dnl Check for wxWidgets
AM_OPTIONS_WXCONFIG
@@ -92,36 +126,6 @@
TEX2RTF_PATH=\${top_srcdir}
AC_SUBST(TEX2RTF_PATH)
-AC_MSG_CHECKING([whether to enable debugging])
-AC_ARG_ENABLE(
- debug,
- AC_HELP_STRING(
- [--enable-debug],
- [enable debugging code (off by default)]),
- ac_arg_debug="yes",
- ac_arg_debug="no")
-AC_MSG_RESULT(${enable_debug-no})
-
-AC_MSG_CHECKING([whether to enable optimization])
-AC_ARG_ENABLE(
- optimize,
- AC_HELP_STRING(
- [--enable-optimize@<:@=ARG@:>@],
- [enable optimized code with ARG = 0, 1, 2, or 3 (off by default ARG = 0)]),
- [opt_level="$enableval" ac_arg_optimize="yes"],
- ac_arg_optimize="no")
-AC_MSG_RESULT(${enable_optimize-no})
-
-AC_MSG_CHECKING([whether to enable profiling])
-AC_ARG_ENABLE(
- profile,
- AC_HELP_STRING(
- [--enable-profile],
- [enable gprof profiling code (off by default)]),
- ac_arg_profile="yes",
- ac_arg_profile="no")
-AC_MSG_RESULT(${enable_profile-no})
-
if test x$ac_arg_debug = xyes ; then
TLDEBUG="-g -fno-inline"
else
Modified: trunk/jazz/configure.ac
===================================================================
--- trunk/jazz/configure.ac 2008-10-08 03:23:28 UTC (rev 611)
+++ trunk/jazz/configure.ac 2008-11-07 18:46:50 UTC (rev 612)
@@ -72,6 +72,36 @@
fi
AC_MSG_RESULT($result)
+AC_MSG_CHECKING([whether to enable debugging])
+AC_ARG_ENABLE(
+ debug,
+ AC_HELP_STRING(
+ [--enable-debug],
+ [enable debugging code (off by default)]),
+ ac_arg_debug="$enableval",
+ ac_arg_debug="no")
+AC_MSG_RESULT(${enable_debug-no})
+
+AC_MSG_CHECKING([whether to enable optimization])
+AC_ARG_ENABLE(
+ optimize,
+ AC_HELP_STRING(
+ [--enable-optimize@<:@=ARG@:>@],
+ [enable optimized code with ARG = 0, 1, 2, or 3 (off by default ARG = 0)]),
+ [opt_level="$enableval" ac_arg_optimize="yes"],
+ ac_arg_optimize="no")
+AC_MSG_RESULT(${enable_optimize-no})
+
+AC_MSG_CHECKING([whether to enable profiling])
+AC_ARG_ENABLE(
+ profile,
+ AC_HELP_STRING(
+ [--enable-profile],
+ [enable gprof profiling code (off by default)]),
+ ac_arg_profile="$enableval",
+ ac_arg_profile="no")
+AC_MSG_RESULT(${enable_profile-no})
+
dnl To support a new system, you need to add its canonical name (as determined
dnl by config.sub or specified by the configure command line) to this "case"
dnl and also define the shared library flags below - search for
@@ -113,7 +143,7 @@
AC_HELP_STRING(
[--enable-sequencer2],
[enable sequencer2 support (off by default)]),
- ac_arg_profile="yes",
+ ac_arg_profile="$enableval",
ac_arg_profile="no")
AC_MSG_RESULT(${enable_sequencer2-no})
@@ -132,10 +162,14 @@
AC_DEFINE(DEV_MPU401,1,[support jazz's own driver over tcp/ip])
fi
+if test x$ac_arg_debug = xyes ; then
+ wx_config_args=--debug
+fi
+
dnl Check for wxWidgets
AM_OPTIONS_WXCONFIG
-AM_PATH_WXCONFIG(2.8.7, wxWin=1)
+AM_PATH_WXCONFIG(2.8.9, wxWin=1)
if test "$wxWin" != 1; then
AC_MSG_ERROR([
@@ -146,7 +180,7 @@
directory where wxWidgets libraries are installed
(returned by 'wx-config --libs' command) is in
LD_LIBRARY_PATH or equivalent variable, and the
- wxWidgets version is 2.8.7 or above.
+ wxWidgets version is 2.8.9 or above.
])
fi
@@ -156,36 +190,6 @@
PORTMIDI_PATH=$JAZZ_PATH/portmidi
AC_SUBST(PORTMIDI_PATH)
-AC_MSG_CHECKING([whether to enable debugging])
-AC_ARG_ENABLE(
- debug,
- AC_HELP_STRING(
- [--enable-debug],
- [enable debugging code (off by default)]),
- ac_arg_debug="yes",
- ac_arg_debug="no")
-AC_MSG_RESULT(${enable_debug-no})
-
-AC_MSG_CHECKING([whether to enable optimization])
-AC_ARG_ENABLE(
- optimize,
- AC_HELP_STRING(
- [--enable-optimize@<:@=ARG@:>@],
- [enable optimized code with ARG = 0, 1, 2, or 3 (off by default ARG = 0)]),
- [opt_level="$enableval" ac_arg_optimize="yes"],
- ac_arg_optimize="no")
-AC_MSG_RESULT(${enable_optimize-no})
-
-AC_MSG_CHECKING([whether to enable profiling])
-AC_ARG_ENABLE(
- profile,
- AC_HELP_STRING(
- [--enable-profile],
- [enable gprof profiling code (off by default)]),
- ac_arg_profile="yes",
- ac_arg_profile="no")
-AC_MSG_RESULT(${enable_profile-no})
-
if test x$ac_arg_debug = xyes ; then
TLDEBUG="-g -fno-inline"
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
