From 0f1237d24be8b2a6f61df82e507b9b6eb35ea2d5 Mon Sep 17 00:00:00 2001 From: fgerlits Date: Tue, 12 Sep 2006 17:35:09 +0000 Subject: [PATCH] fixing #1796 --- .../bin/setupDevelopmentEnvironment.sh | 6 ++- livesupport/etc/Makefile.in | 43 ++++++++++++------- livesupport/etc/configure.ac | 15 ++++++- .../modules/authentication/etc/configure.ac | 20 +++++++++ livesupport/src/modules/core/etc/configure.ac | 20 +++++++++ livesupport/src/modules/db/etc/configure.ac | 20 +++++++++ .../modules/eventScheduler/etc/configure.ac | 20 +++++++++ .../gstreamerElements/etc/configure.ac | 20 +++++++++ .../modules/playlistExecutor/etc/configure.ac | 20 +++++++++ .../modules/schedulerClient/etc/configure.ac | 19 ++++++++ .../modules/storageClient/etc/configure.ac | 20 +++++++++ .../src/modules/widgets/etc/configure.ac | 20 +++++++++ .../products/gLiveSupport/etc/configure.ac | 20 +++++++++ .../src/products/scheduler/etc/configure.ac | 19 ++++++++ 14 files changed, 264 insertions(+), 18 deletions(-) diff --git a/livesupport/bin/setupDevelopmentEnvironment.sh b/livesupport/bin/setupDevelopmentEnvironment.sh index a400e5e9b..1a64b2ebe 100755 --- a/livesupport/bin/setupDevelopmentEnvironment.sh +++ b/livesupport/bin/setupDevelopmentEnvironment.sh @@ -99,8 +99,10 @@ fi #------------------------------------------------------------------------------- rm -rf $tmpdir/configure $bindir/autogen.sh || exit 1 -$basedir/configure --prefix=$usrdir --with-www-docroot=$usrdir/var \ - --with-apache-group=$apache_group || exit 1 +$basedir/configure --prefix=$usrdir \ + --with-www-docroot=$usrdir/var \ + --with-apache-group=$apache_group \ + --enable-debug || exit 1 #------------------------------------------------------------------------------- diff --git a/livesupport/etc/Makefile.in b/livesupport/etc/Makefile.in index 65dbfddac..012a51823 100644 --- a/livesupport/etc/Makefile.in +++ b/livesupport/etc/Makefile.in @@ -81,6 +81,8 @@ STUDIO_AUDIO_CUE = "@STUDIO_AUDIO_CUE@" export LD_LIBRARY_PATH:=${prefix}/lib:${LD_LIBRARY_PATH} export PKG_CONFIG_PATH=${prefix}/lib/pkgconfig +DEBUG = @DEBUG@ + DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config XMLRPC-DOXYGEN_CONFIG = ${ETC_DIR}/xmlrpc-doxygen.config @@ -310,13 +312,13 @@ ${TMP_DIR}/modules_setup.stamp: --with-database-password=${DB_PASSWORD} cd ${GETID3_DIR} && ./configure --prefix=${prefix} cd ${HTML_UI_DIR} && ./configure --prefix=${prefix} \ - --with-apache-group=${APACHE_GROUP} \ - --with-www-docroot=${WWW_DOCROOT} \ - --with-configure-apache=${CONFIGURE_APACHE} \ - --with-storage-server=${prefix}/var/LiveSupport/storageServer + --with-apache-group=${APACHE_GROUP} \ + --with-www-docroot=${WWW_DOCROOT} \ + --with-configure-apache=${CONFIGURE_APACHE} \ + --with-storage-server=${prefix}/var/LiveSupport/storageServer cd ${STORAGE_ADMIN_DIR} && ./configure --prefix=${prefix} \ - --with-storage-server=${prefix}/var/LiveSupport/storageServer \ - --with-phppart-dir=${prefix}/var/LiveSupport/storageAdmin + --with-storage-server=${prefix}/var/LiveSupport/storageServer \ + --with-phppart-dir=${prefix}/var/LiveSupport/storageAdmin cd ${STORAGE_SERVER_DIR} && \ ./configure --prefix=${prefix} \ --with-apache-group=${APACHE_GROUP} \ @@ -329,21 +331,31 @@ ${TMP_DIR}/modules_setup.stamp: --with-database-user=${DB_USER} \ --with-database-password=${DB_PASSWORD} \ --with-init-database=${INIT_LS_DATABASE} - cd ${CORE_DIR} && ./configure --prefix=${prefix} - cd ${AUTHENTICATION_DIR} && ./configure --prefix=${prefix} - cd ${DB_DIR} && ./configure --prefix=${prefix} - cd ${STORAGE_CLIENT_DIR} && ./configure --prefix=${prefix} - cd ${GSTREAMER_ELEMENTS_DIR} && ./configure --prefix=${prefix} - cd ${PLAYLIST_EXECUTOR_DIR} && ./configure --prefix=${prefix} - cd ${EVENT_SCHEDULER_DIR} && ./configure --prefix=${prefix} - cd ${SCHEDULER_CLIENT_DIR} && ./configure --prefix=${prefix} - cd ${WIDGETS_DIR} && ./configure --prefix=${prefix} + cd ${CORE_DIR} && \ + ./configure --prefix=${prefix} --enable-debug=${DEBUG} + cd ${AUTHENTICATION_DIR} && \ + ./configure --prefix=${prefix} --enable-debug=${DEBUG} + cd ${DB_DIR} && \ + ./configure --prefix=${prefix} --enable-debug=${DEBUG} + cd ${STORAGE_CLIENT_DIR} && \ + ./configure --prefix=${prefix} --enable-debug=${DEBUG} + cd ${GSTREAMER_ELEMENTS_DIR} && \ + ./configure --prefix=${prefix} --enable-debug=${DEBUG} + cd ${PLAYLIST_EXECUTOR_DIR} && \ + ./configure --prefix=${prefix} --enable-debug=${DEBUG} + cd ${EVENT_SCHEDULER_DIR} && \ + ./configure --prefix=${prefix} --enable-debug=${DEBUG} + cd ${SCHEDULER_CLIENT_DIR} && \ + ./configure --prefix=${prefix} --enable-debug=${DEBUG} + cd ${WIDGETS_DIR} && \ + ./configure --prefix=${prefix} --enable-debug=${DEBUG} touch ${TMP_DIR}/modules_setup.stamp products_setup: ${TMP_DIR}/products_setup.stamp ${TMP_DIR}/products_setup.stamp: cd ${SCHEDULER_DIR} && \ ./configure --prefix=${prefix} \ + --enable-debug=${DEBUG} \ --with-hostname=${HOSTNAME} \ --with-www-port=${WWW_PORT} \ --with-scheduler-port=${SCHEDULER_PORT} \ @@ -356,6 +368,7 @@ ${TMP_DIR}/products_setup.stamp: --with-init-database=${INIT_LS_DATABASE} cd ${GLIVESUPPORT_DIR} && \ ./configure --prefix=${prefix} \ + --enable-debug=${DEBUG} \ --with-hostname=${HOSTNAME} \ --with-www-port=${WWW_PORT} \ --with-scheduler-port=${SCHEDULER_PORT} \ diff --git a/livesupport/etc/configure.ac b/livesupport/etc/configure.ac index 0756e33a3..c59a70d04 100644 --- a/livesupport/etc/configure.ac +++ b/livesupport/etc/configure.ac @@ -43,6 +43,19 @@ AC_PROG_CC() AC_PROG_CXX() +dnl----------------------------------------------------------------------------- +dnl specify whether debug info should be compiled into the executable +dnl----------------------------------------------------------------------------- +AC_SUBST(DEBUG) + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), + [DEBUG=${enable_debug}], + [DEBUG=no]) + +AC_MSG_RESULT([compiling with debug info: ${DEBUG}]) + + dnl----------------------------------------------------------------------------- dnl specify whether the LiveSupport database and user should be created dnl----------------------------------------------------------------------------- @@ -231,7 +244,7 @@ AC_ARG_WITH([station-audio-out], either ALSA or OSS (default)]), [STATION_AUDIO_OUT=${withval}], [STATION_AUDIO_OUT=default]) -AC_MSG_RESULT([using audio output device for the station: ${STAITON_AUDIO_OUT}]) +AC_MSG_RESULT([using audio output device for the station: ${STATION_AUDIO_OUT}]) dnl----------------------------------------------------------------------------- diff --git a/livesupport/src/modules/authentication/etc/configure.ac b/livesupport/src/modules/authentication/etc/configure.ac index c478c3fe4..c5e35adde 100644 --- a/livesupport/src/modules/authentication/etc/configure.ac +++ b/livesupport/src/modules/authentication/etc/configure.ac @@ -44,6 +44,26 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h) + +dnl----------------------------------------------------------------------------- +dnl specify whether debug info should be compiled into the executable +dnl----------------------------------------------------------------------------- +AC_SUBST(CXXFLAGS) + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), + [], + [enable_debug=no]) + +if test "x${enable_debug}" = "xyes"; then + CXXFLAGS="-g -O0" +else + CXXFLAGS="-O3" +fi + +AC_MSG_RESULT([using compiler options: ${CXXFLAGS}]) + + dnl----------------------------------------------------------------------------- dnl specify the pkg-config path dnl----------------------------------------------------------------------------- diff --git a/livesupport/src/modules/core/etc/configure.ac b/livesupport/src/modules/core/etc/configure.ac index 7e5e5cf82..eeaa81055 100644 --- a/livesupport/src/modules/core/etc/configure.ac +++ b/livesupport/src/modules/core/etc/configure.ac @@ -50,6 +50,26 @@ fi AC_CHECK_HEADERS(getopt.h sys/time.h time.h sys/types.h pwd.h errno.h stdint.h) + +dnl----------------------------------------------------------------------------- +dnl specify whether debug info should be compiled into the executable +dnl----------------------------------------------------------------------------- +AC_SUBST(CXXFLAGS) + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), + [], + [enable_debug=no]) + +if test "x${enable_debug}" = "xyes"; then + CXXFLAGS="-g -O0" +else + CXXFLAGS="-O3" +fi + +AC_MSG_RESULT([using compiler options: ${CXXFLAGS}]) + + dnl----------------------------------------------------------------------------- dnl specify the pkg-config path dnl----------------------------------------------------------------------------- diff --git a/livesupport/src/modules/db/etc/configure.ac b/livesupport/src/modules/db/etc/configure.ac index 1ccdd29b6..4cd55e6d7 100644 --- a/livesupport/src/modules/db/etc/configure.ac +++ b/livesupport/src/modules/db/etc/configure.ac @@ -44,6 +44,26 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h) + +dnl----------------------------------------------------------------------------- +dnl specify whether debug info should be compiled into the executable +dnl----------------------------------------------------------------------------- +AC_SUBST(CXXFLAGS) + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), + [], + [enable_debug=no]) + +if test "x${enable_debug}" = "xyes"; then + CXXFLAGS="-g -O0" +else + CXXFLAGS="-O3" +fi + +AC_MSG_RESULT([using compiler options: ${CXXFLAGS}]) + + dnl----------------------------------------------------------------------------- dnl specify the pkg-config path dnl----------------------------------------------------------------------------- diff --git a/livesupport/src/modules/eventScheduler/etc/configure.ac b/livesupport/src/modules/eventScheduler/etc/configure.ac index e6344b9e9..998c88ff0 100644 --- a/livesupport/src/modules/eventScheduler/etc/configure.ac +++ b/livesupport/src/modules/eventScheduler/etc/configure.ac @@ -44,6 +44,26 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h unistd.h sys/time.h) + +dnl----------------------------------------------------------------------------- +dnl specify whether debug info should be compiled into the executable +dnl----------------------------------------------------------------------------- +AC_SUBST(CXXFLAGS) + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), + [], + [enable_debug=no]) + +if test "x${enable_debug}" = "xyes"; then + CXXFLAGS="-g -O0" +else + CXXFLAGS="-O3" +fi + +AC_MSG_RESULT([using compiler options: ${CXXFLAGS}]) + + dnl----------------------------------------------------------------------------- dnl specify the pkg-config path dnl----------------------------------------------------------------------------- diff --git a/livesupport/src/modules/gstreamerElements/etc/configure.ac b/livesupport/src/modules/gstreamerElements/etc/configure.ac index 00d5a9cb5..9d896c83d 100644 --- a/livesupport/src/modules/gstreamerElements/etc/configure.ac +++ b/livesupport/src/modules/gstreamerElements/etc/configure.ac @@ -45,6 +45,26 @@ AC_PROG_CXX() AC_CHECK_HEADERS(string.h getopt.h sys/time.h) + +dnl----------------------------------------------------------------------------- +dnl specify whether debug info should be compiled into the executable +dnl----------------------------------------------------------------------------- +AC_SUBST(CXXFLAGS) + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), + [], + [enable_debug=no]) + +if test "x${enable_debug}" = "xyes"; then + CXXFLAGS="-g -O0" +else + CXXFLAGS="-O3" +fi + +AC_MSG_RESULT([using compiler options: ${CXXFLAGS}]) + + dnl----------------------------------------------------------------------------- dnl specify the pkg-config path dnl----------------------------------------------------------------------------- diff --git a/livesupport/src/modules/playlistExecutor/etc/configure.ac b/livesupport/src/modules/playlistExecutor/etc/configure.ac index 5accc054c..360aa42e9 100644 --- a/livesupport/src/modules/playlistExecutor/etc/configure.ac +++ b/livesupport/src/modules/playlistExecutor/etc/configure.ac @@ -44,6 +44,26 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h sys/time.h) + +dnl----------------------------------------------------------------------------- +dnl specify whether debug info should be compiled into the executable +dnl----------------------------------------------------------------------------- +AC_SUBST(CXXFLAGS) + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), + [], + [enable_debug=no]) + +if test "x${enable_debug}" = "xyes"; then + CXXFLAGS="-g -O0" +else + CXXFLAGS="-O3" +fi + +AC_MSG_RESULT([using compiler options: ${CXXFLAGS}]) + + dnl----------------------------------------------------------------------------- dnl specify the pkg-config path dnl----------------------------------------------------------------------------- diff --git a/livesupport/src/modules/schedulerClient/etc/configure.ac b/livesupport/src/modules/schedulerClient/etc/configure.ac index 7104ba05d..7b4754779 100644 --- a/livesupport/src/modules/schedulerClient/etc/configure.ac +++ b/livesupport/src/modules/schedulerClient/etc/configure.ac @@ -47,6 +47,25 @@ AC_CHECK_HEADERS(getopt.h sys/time.h) AC_CHECK_HEADERS(libtar.h) +dnl----------------------------------------------------------------------------- +dnl specify whether debug info should be compiled into the executable +dnl----------------------------------------------------------------------------- +AC_SUBST(CXXFLAGS) + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), + [], + [enable_debug=no]) + +if test "x${enable_debug}" = "xyes"; then + CXXFLAGS="-g -O0" +else + CXXFLAGS="-O3" +fi + +AC_MSG_RESULT([using compiler options: ${CXXFLAGS}]) + + dnl----------------------------------------------------------------------------- dnl specify the pkg-config path dnl----------------------------------------------------------------------------- diff --git a/livesupport/src/modules/storageClient/etc/configure.ac b/livesupport/src/modules/storageClient/etc/configure.ac index 5a14e2004..0a854110d 100644 --- a/livesupport/src/modules/storageClient/etc/configure.ac +++ b/livesupport/src/modules/storageClient/etc/configure.ac @@ -44,6 +44,26 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h sys/time.h time.h) + +dnl----------------------------------------------------------------------------- +dnl specify whether debug info should be compiled into the executable +dnl----------------------------------------------------------------------------- +AC_SUBST(CXXFLAGS) + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), + [], + [enable_debug=no]) + +if test "x${enable_debug}" = "xyes"; then + CXXFLAGS="-g -O0" +else + CXXFLAGS="-O3" +fi + +AC_MSG_RESULT([using compiler options: ${CXXFLAGS}]) + + dnl----------------------------------------------------------------------------- dnl specify the pkg-config path dnl----------------------------------------------------------------------------- diff --git a/livesupport/src/modules/widgets/etc/configure.ac b/livesupport/src/modules/widgets/etc/configure.ac index dbd652d6f..45f55e7d4 100644 --- a/livesupport/src/modules/widgets/etc/configure.ac +++ b/livesupport/src/modules/widgets/etc/configure.ac @@ -44,6 +44,26 @@ AC_PROG_CXX() AC_CHECK_HEADERS(getopt.h) + +dnl----------------------------------------------------------------------------- +dnl specify whether debug info should be compiled into the executable +dnl----------------------------------------------------------------------------- +AC_SUBST(CXXFLAGS) + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), + [], + [enable_debug=no]) + +if test "x${enable_debug}" = "xyes"; then + CXXFLAGS="-g -O0" +else + CXXFLAGS="-O3" +fi + +AC_MSG_RESULT([using compiler options: ${CXXFLAGS}]) + + dnl----------------------------------------------------------------------------- dnl specify the pkg-config path dnl----------------------------------------------------------------------------- diff --git a/livesupport/src/products/gLiveSupport/etc/configure.ac b/livesupport/src/products/gLiveSupport/etc/configure.ac index fcb395304..606c84291 100644 --- a/livesupport/src/products/gLiveSupport/etc/configure.ac +++ b/livesupport/src/products/gLiveSupport/etc/configure.ac @@ -45,6 +45,26 @@ AC_PROG_CXX() AC_CHECK_HEADERS(sys/types.h unistd.h getopt.h signal.h sys/stat.h time.h) AC_CHECK_HEADERS(stdio.h fcntl.h sys/time.h pwd.h) + +dnl----------------------------------------------------------------------------- +dnl specify whether debug info should be compiled into the executable +dnl----------------------------------------------------------------------------- +AC_SUBST(CXXFLAGS) + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), + [], + [enable_debug=no]) + +if test "x${enable_debug}" = "xyes"; then + CXXFLAGS="-g -O0" +else + CXXFLAGS="-O3" +fi + +AC_MSG_RESULT([using compiler options: ${CXXFLAGS}]) + + dnl----------------------------------------------------------------------------- dnl specify the pkg-config path dnl----------------------------------------------------------------------------- diff --git a/livesupport/src/products/scheduler/etc/configure.ac b/livesupport/src/products/scheduler/etc/configure.ac index 9cf4fb200..6ccaea50c 100644 --- a/livesupport/src/products/scheduler/etc/configure.ac +++ b/livesupport/src/products/scheduler/etc/configure.ac @@ -48,6 +48,25 @@ AC_CHECK_HEADERS(stdio.h fcntl.h sys/time.h) AC_CHECK_HEADERS(libtar.h) +dnl----------------------------------------------------------------------------- +dnl specify whether debug info should be compiled into the executable +dnl----------------------------------------------------------------------------- +AC_SUBST(CXXFLAGS) + +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), + [], + [enable_debug=no]) + +if test "x${enable_debug}" = "xyes"; then + CXXFLAGS="-g -O0" +else + CXXFLAGS="-O3" +fi + +AC_MSG_RESULT([using compiler options: ${CXXFLAGS}]) + + dnl----------------------------------------------------------------------------- dnl specify the pkg-config path dnl-----------------------------------------------------------------------------