From b02829720a66b233388751dc8d233b658d35b71d Mon Sep 17 00:00:00 2001 From: green Date: Fri, 27 Feb 2004 15:23:44 +0000 Subject: Actually compile using the system CFLAGS, and add a WITH_DEBUG option. Version not bumped due to -O probably not making much difference. --- audio/xmms-imms/Makefile | 6 +++++- audio/xmms-imms/files/patch-configure.ac | 13 +++++++++++++ audio/xmms-imms/files/patch-vars.mk.in | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 audio/xmms-imms/files/patch-configure.ac (limited to 'audio/xmms-imms') diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile index bf252cb81301..111ba5d959fa 100644 --- a/audio/xmms-imms/Makefile +++ b/audio/xmms-imms/Makefile @@ -29,7 +29,11 @@ USE_AUTOCONF= yes USE_AUTOHEADER= yes WANT_AUTOCONF_VER= 257 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include" +CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+=--enable-debug +.endif INSTALLS_SHLIB= yes .include diff --git a/audio/xmms-imms/files/patch-configure.ac b/audio/xmms-imms/files/patch-configure.ac new file mode 100644 index 000000000000..7efde56e0a76 --- /dev/null +++ b/audio/xmms-imms/files/patch-configure.ac @@ -0,0 +1,13 @@ +--- configure.ac.orig Fri Feb 27 09:49:26 2004 ++++ configure.ac Fri Feb 27 09:49:50 2004 +@@ -29,8 +29,8 @@ + AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug], + [Extra debug output]), +- [enable_debug='yes' DEBUG_CFLAGS="-ggdb -O0 -DDEBUG"], +- [enable_debug='no' DEBUG_CFLAGS="-O3"]) ++ [enable_debug='yes' DEBUG_CFLAGS="-g -DDEBUG"], ++ [enable_debug='no' DEBUG_CFLAGS=""]) + + AC_PROG_CXX + AC_PROG_CC diff --git a/audio/xmms-imms/files/patch-vars.mk.in b/audio/xmms-imms/files/patch-vars.mk.in index 6e85f6c1dbe5..1dbf7eb9a67b 100644 --- a/audio/xmms-imms/files/patch-vars.mk.in +++ b/audio/xmms-imms/files/patch-vars.mk.in @@ -10,7 +10,7 @@ songinfo.o regexx.o strmanip.o levenshtein.o xidle.o md5.o -CFLAGS = `xmms-config --cflags` @DEBUG_CFLAGS@ -Wall -fPIC -D_REENTRANT -+CFLAGS = `xmms-config --cflags` @CFLAGS@ -Wall -fPIC -D_REENTRANT ++CFLAGS = `xmms-config --cflags` @DEBUG_CFLAGS@ @CFLAGS@ -Wall -fPIC -D_REENTRANT CPPFLAGS = ${CFLAGS} -pedantic -fno-rtti -LDFLAGS = `xmms-config --libs` @LIBS@ +LDFLAGS = `xmms-config --libs` -lc @LIBS@ -- cgit