From: <pst...@us...> - 2008-04-02 00:55:00
|
Revision: 383 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=383&view=rev Author: pstieber Date: 2008-04-01 17:54:59 -0700 (Tue, 01 Apr 2008) Log Message: ----------- Added configure options for debug, optimized and profiled builds. Modified Paths: -------------- trunk/jazz/configure.ac Modified: trunk/jazz/configure.ac =================================================================== --- trunk/jazz/configure.ac 2008-04-02 00:31:44 UTC (rev 382) +++ trunk/jazz/configure.ac 2008-04-02 00:54:59 UTC (rev 383) @@ -10,9 +10,37 @@ AC_CONFIG_HEADERS(src/config.h) -# Checks for programs. +dnl Checks for programs. + +AC_PROG_CPP + +dnl C-compiler checks +dnl defines CC with the compiler to use +dnl defines GCC with yes if using gcc +dnl defines GCC empty if not using gcc +dnl defines CFLAGS +dnl +dnl this magic incantation is needed to prevent AC_PROG_CC from setting the +dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add +dnl -g and -O flags ourselves below +CFLAGS=${CFLAGS:=} AC_PROG_CC + +AC_LANG_SAVE +AC_LANG_CPLUSPLUS + +dnl C++-compiler checks +dnl defines CXX with the compiler to use +dnl defines GXX with yes if using gxx +dnl defines GXX empty if not using gxx +dnl defines CXXFLAGS +dnl +dnl see CFLAGS line above +CXXFLAGS=${CXXFLAGS:=} AC_PROG_CXX + +AC_LANG_RESTORE + AC_PROG_LIBTOOL dnl Make autoconf use C++ for its tests. @@ -30,21 +58,9 @@ dnl Check for st_blksize in struct stat AC_ST_BLKSIZE - -dnl These were taken from acconfig.h when it was removed. They do not yet have -dnl equivalents in this file. - -dnl // in ms-windows, we have nothing -dnl #ifdef wx_msw -dnl #undef DEV_SEQUENCER2 -dnl #undef DEV_MPU401 -dnl #endif - - dnl Check to see if we are using _Ios_Openmode. gcc 3.2 doesn't like using dnl ints and std::_Ios_Openmode interchangeably. There's probably a simpler dnl autoconf technique for checking this feature. - AC_MSG_CHECKING(for _Ios_Openmode) AC_COMPILE_IFELSE( [#include <iostream> @@ -56,11 +72,8 @@ fi AC_MSG_RESULT($result) - - dnl optional stuff, like alsa oss... - dnl --------------------------------------- dnl check if we are to enable alsa support dnl --------------------------------------- @@ -104,8 +117,6 @@ AC_DEFINE(DEV_SEQUENCER2, 1, [support /dev/sequencer2]) fi - - dnl ---------------------------------------- dnl check if we are to enable mpu401 support dnl ---------------------------------------- @@ -116,9 +127,7 @@ AC_DEFINE(DEV_MPU401,1,[support jazz's own driver over tcp/ip]) fi - dnl Check for wxWidgets - AM_OPTIONS_WXCONFIG AM_PATH_WXCONFIG(2.8.7, wxWin=1) @@ -139,6 +148,68 @@ JAZZ_PATH=\${top_srcdir} AC_SUBST(JAZZ_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 + TLDEBUG="-DNDEBUG" +fi + +PROFILE= +if test x$ac_arg_profile = xyes ; then + dnl The debug flag must be on for profiling to work. + if test x$TLDEBUG = x ; then + TLDEBUG="-g -fno-inline" + fi + PROFILE="-pg" +fi + +OPTIMISE=-O0 +if test x$ac_arg_optimize = xyes ; then + if test x$opt_level = x; then + OPTIMISE="-O2" + elif test x$opt_level = x0 ; then + OPTIMISE="-O1" + elif test x$opt_level = x1 ; then + OPTIMISE="-O1" + elif test x$opt_level = x2 ; then + OPTIMISE="-O2" + elif test x$opt_level = x3 ; then + OPTIMISE="-O3" + fi +fi + +EXTRA_CFLAGS="$TLDEBUG $PROFILE $OPTIMISE" + BITMAPS_PATH="$JAZZ_PATH/Bitmaps" AC_SUBST(BITMAPS_PATH) BITMAPS_FLAGS="-I$BITMAPS_PATH" @@ -146,9 +217,9 @@ # CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CPPFLAGS=`echo -Wall -Wno-unknown-pragmas $BITMAPS_FLAGS $WX_CPPFLAGS | sed 's/ \+/ /g'` -CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" +CFLAGS=`echo $EXTRA_CFLAGS $CFLAGS $WX_CFLAGS_ONLY | sed 's/ \\+/ /g'` -CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" +CXXFLAGS=`echo $EXTRA_CFLAGS $CXXFLAGS $WX_CXXFLAGS_ONLY | sed 's/ \+/ /g'` LDFLAGS="$LDFLAGS $WX_LIBS" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-05-05 03:56:33
|
Revision: 488 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=488&view=rev Author: pstieber Date: 2008-05-04 20:56:15 -0700 (Sun, 04 May 2008) Log Message: ----------- 1. Temporarily commented out the AM_PATH_ALSA line so I can work on the Mac build. This may break the Linux build. 2. Added an AM_CONDITIONAL statement that may set USE_ALSA. Modified Paths: -------------- trunk/jazz/configure.ac Modified: trunk/jazz/configure.ac =================================================================== --- trunk/jazz/configure.ac 2008-05-05 03:53:22 UTC (rev 487) +++ trunk/jazz/configure.ac 2008-05-05 03:56:15 UTC (rev 488) @@ -93,12 +93,13 @@ dnl fi dnl This test comes with the alsa distribution! - - AM_PATH_ALSA(0.9.0) +dnl AM_PATH_ALSA(0.9.0) LIBS="$LIBS $ALSA_LIBS" fi +AM_CONDITIONAL(USE_ALSA, test "$enable_alsa" = yes) + dnl -------------------------------------------- dnl check if we are to enable sequencer2 support dnl -------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-05-06 04:31:15
|
Revision: 491 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=491&view=rev Author: pstieber Date: 2008-05-05 21:31:13 -0700 (Mon, 05 May 2008) Log Message: ----------- Started taking the Mac OS X build into consideration. Modified Paths: -------------- trunk/jazz/configure.ac Modified: trunk/jazz/configure.ac =================================================================== --- trunk/jazz/configure.ac 2008-05-05 06:20:13 UTC (rev 490) +++ trunk/jazz/configure.ac 2008-05-06 04:31:13 UTC (rev 491) @@ -74,17 +74,34 @@ dnl optional stuff, like alsa oss... -dnl --------------------------------------- -dnl check if we are to enable alsa support -dnl --------------------------------------- -AC_ARG_ENABLE(alsa, --enable-alsa Support ALSA) +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 +dnl SHARED_LIB_SETUP to find the exact place. +case "${host}" in + *-darwin* ) + mac_build=yes + ;; + *-*-linux* ) + mac_build=no + ;; + *) + AC_MSG_ERROR(unknown system type ${host}.) +esac -if test x$enable_alsa = xyes ; then - AC_MSG_RESULT(alsa is enabled) - AC_DEFINE(DEV_ALSA,1,[use alsa drivers]) +if test x$mac_build = xno ; then - dnl for alsa to work it must be installed(logical no?) - dnl this test is just preliminary + dnl --------------------------------------- + dnl check if we are to enable alsa support + dnl --------------------------------------- + AC_ARG_ENABLE(alsa, --enable-alsa Support ALSA) + + if test x$enable_alsa = xyes ; then + AC_MSG_RESULT(alsa is enabled) + AC_DEFINE(DEV_ALSA,1,[use alsa drivers]) + + dnl for alsa to work it must be installed(logical no?) + dnl this test is just preliminary dnl if test -f /proc/asound/version; then dnl AC_MSG_RESULT(alsa seems to be running...very good!) dnl LIBS="$LIBS -lasound" @@ -92,10 +109,11 @@ dnl AC_MSG_ERROR(no alsa i can use! check if its at least 090 and running) dnl fi - dnl This test comes with the alsa distribution! -dnl AM_PATH_ALSA(0.9.0) + dnl This test comes with the alsa distribution! + AM_PATH_ALSA(0.9.0) - LIBS="$LIBS $ALSA_LIBS" + LIBS="$LIBS $ALSA_LIBS" + fi fi AM_CONDITIONAL(USE_ALSA, test "$enable_alsa" = yes) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-05-06 14:11:33
|
Revision: 492 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=492&view=rev Author: pstieber Date: 2008-05-06 07:11:22 -0700 (Tue, 06 May 2008) Log Message: ----------- Changed to attempt to deal with ALSA on all platforms. Modified Paths: -------------- trunk/jazz/configure.ac Modified: trunk/jazz/configure.ac =================================================================== --- trunk/jazz/configure.ac 2008-05-06 04:31:13 UTC (rev 491) +++ trunk/jazz/configure.ac 2008-05-06 14:11:22 UTC (rev 492) @@ -72,52 +72,39 @@ fi AC_MSG_RESULT($result) -dnl optional stuff, like alsa oss... - 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 dnl SHARED_LIB_SETUP to find the exact place. case "${host}" in *-darwin* ) - mac_build=yes ;; *-*-linux* ) - mac_build=no + AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no) + if [[ $have_alsa = "yes" ]] ; then + LIBS="$LIBS -lasound" + fi ;; *) AC_MSG_ERROR(unknown system type ${host}.) esac -if test x$mac_build = xno ; then +dnl --------------------------------------- +dnl check if we are to enable alsa support +dnl --------------------------------------- +dnl AC_ARG_ENABLE(alsa, --enable-alsa Support ALSA) +dnl +dnl if test x$enable_alsa = xyes ; then +dnl AC_MSG_RESULT(alsa is enabled) +dnl AC_DEFINE(DEV_ALSA,1,[use alsa drivers]) +dnl +dnl dnl This test comes with the alsa distribution! +dnl AM_PATH_ALSA(0.9.0) +dnl +dnl fi - dnl --------------------------------------- - dnl check if we are to enable alsa support - dnl --------------------------------------- - AC_ARG_ENABLE(alsa, --enable-alsa Support ALSA) +AM_CONDITIONAL(USE_ALSA, test "$have_alsa" = yes) - if test x$enable_alsa = xyes ; then - AC_MSG_RESULT(alsa is enabled) - AC_DEFINE(DEV_ALSA,1,[use alsa drivers]) - - dnl for alsa to work it must be installed(logical no?) - dnl this test is just preliminary -dnl if test -f /proc/asound/version; then -dnl AC_MSG_RESULT(alsa seems to be running...very good!) -dnl LIBS="$LIBS -lasound" -dnl else -dnl AC_MSG_ERROR(no alsa i can use! check if its at least 090 and running) -dnl fi - - dnl This test comes with the alsa distribution! - AM_PATH_ALSA(0.9.0) - - LIBS="$LIBS $ALSA_LIBS" - fi -fi - -AM_CONDITIONAL(USE_ALSA, test "$enable_alsa" = yes) - dnl -------------------------------------------- dnl check if we are to enable sequencer2 support dnl -------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-05-09 21:24:37
|
Revision: 496 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=496&view=rev Author: pstieber Date: 2008-05-09 14:24:35 -0700 (Fri, 09 May 2008) Log Message: ----------- If ALSA is possible, check for it as a configure option. This will fix the Linux build, but might break the Mac build. Modified Paths: -------------- trunk/jazz/configure.ac Modified: trunk/jazz/configure.ac =================================================================== --- trunk/jazz/configure.ac 2008-05-09 19:03:45 UTC (rev 495) +++ trunk/jazz/configure.ac 2008-05-09 21:24:35 UTC (rev 496) @@ -89,22 +89,25 @@ AC_MSG_ERROR(unknown system type ${host}.) esac -dnl --------------------------------------- -dnl check if we are to enable alsa support -dnl --------------------------------------- -dnl AC_ARG_ENABLE(alsa, --enable-alsa Support ALSA) -dnl -dnl if test x$enable_alsa = xyes ; then -dnl AC_MSG_RESULT(alsa is enabled) -dnl AC_DEFINE(DEV_ALSA,1,[use alsa drivers]) -dnl -dnl dnl This test comes with the alsa distribution! -dnl AM_PATH_ALSA(0.9.0) -dnl -dnl fi - AM_CONDITIONAL(USE_ALSA, test "$have_alsa" = yes) +if [[ $have_alsa = "yes" ]] ; then + + dnl --------------------------------------- + dnl check if we are to enable alsa support + dnl --------------------------------------- + AC_ARG_ENABLE(alsa, --enable-alsa Support ALSA) + + if test x$enable_alsa = xyes ; then + AC_MSG_RESULT(alsa is enabled) + AC_DEFINE(DEV_ALSA,1,[use alsa drivers]) + + dnl This test comes with the alsa distribution! + AM_PATH_ALSA(0.9.0) + + fi +fi + dnl -------------------------------------------- dnl check if we are to enable sequencer2 support dnl -------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-05-10 18:13:26
|
Revision: 499 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=499&view=rev Author: pstieber Date: 2008-05-10 11:13:22 -0700 (Sat, 10 May 2008) Log Message: ----------- Removed the AM_PATH_ALSA macro. This macro comes with the ALSA distribution. Since the Mac doesn't use ALSA, the macro breaks the Mac build. I believe I now have the build setup to work with a Mac and a Linux Box with ALSA. *Please test.* Modified Paths: -------------- trunk/jazz/configure.ac Modified: trunk/jazz/configure.ac =================================================================== --- trunk/jazz/configure.ac 2008-05-10 16:38:38 UTC (rev 498) +++ trunk/jazz/configure.ac 2008-05-10 18:13:22 UTC (rev 499) @@ -101,10 +101,6 @@ if test x$enable_alsa = xyes ; then AC_MSG_RESULT(alsa is enabled) AC_DEFINE(DEV_ALSA,1,[use alsa drivers]) - - dnl This test comes with the alsa distribution! - AM_PATH_ALSA(0.9.0) - fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-05-19 01:00:01
|
Revision: 544 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=544&view=rev Author: pstieber Date: 2008-05-18 17:59:59 -0700 (Sun, 18 May 2008) Log Message: ----------- Added some literals to conditional tests to prevent complaints on the Mac. Modified Paths: -------------- trunk/jazz/configure.ac Modified: trunk/jazz/configure.ac =================================================================== --- trunk/jazz/configure.ac 2008-05-18 23:32:38 UTC (rev 543) +++ trunk/jazz/configure.ac 2008-05-19 00:59:59 UTC (rev 544) @@ -81,7 +81,7 @@ ;; *-*-linux* ) AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no) - if [[ $have_alsa = "yes" ]] ; then + if [[ x$have_alsa = x"yes" ]] ; then LIBS="$LIBS -lasound" fi ;; @@ -91,7 +91,7 @@ AM_CONDITIONAL(USE_ALSA, test "$have_alsa" = yes) -if [[ $have_alsa = "yes" ]] ; then +if [[ x$have_alsa = x"yes" ]] ; then dnl --------------------------------------- dnl check if we are to enable alsa support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2008-05-27 00:42:30
|
Revision: 571 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=571&view=rev Author: pstieber Date: 2008-05-26 17:42:28 -0700 (Mon, 26 May 2008) Log Message: ----------- Added a path to find the portmidi libraries. Modified Paths: -------------- trunk/jazz/configure.ac Modified: trunk/jazz/configure.ac =================================================================== --- trunk/jazz/configure.ac 2008-05-27 00:41:21 UTC (rev 570) +++ trunk/jazz/configure.ac 2008-05-27 00:42:28 UTC (rev 571) @@ -153,6 +153,9 @@ JAZZ_PATH=\${top_srcdir} AC_SUBST(JAZZ_PATH) +PORTMIDI_PATH=$JAZZ_PATH/portmidi +AC_SUBST(PORTMIDI_PATH) + AC_MSG_CHECKING([whether to enable debugging]) AC_ARG_ENABLE( debug, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |