From b90b8384b6f7cfbcca88b05505a2fb15e9e3bc4e Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Fri, 20 Jan 2012 01:19:03 +0000 Subject: [PATCH] configure.ac, wireshark/Makefile.am: Leave CFLAGS and CPPFLAGS to user. Organization: Straylight/Edgeware From: Mark Wooding Only fiddle with AM_CFLAGS, so that users can use CFLAGS to do stuff like set debugging and fiddle with optimization settings. This turns out to be a bit fiddly because Autoconf doesn't really understand this stuff. --- configure.ac | 16 ++++++++++++---- wireshark/Makefile.am | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 54caf9d1..3ca6cf6c 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,11 @@ AM_PROG_LIBTOOL AC_CHECK_PROGS([AUTOM4TE], [autom4te]) +mdw_ORIG_CFLAGS=$CFLAGS +mdw_ORIG_CPPFLAGS=$CPPFLAGS +AC_SUBST(AM_CFLAGS) +AC_SUBST(AM_CPPFLAGS) + dnl-------------------------------------------------------------------------- dnl C programming environment. @@ -51,17 +56,17 @@ AC_SEARCH_LIBS([socket], [socket]) case "$host_os" in linux) AC_ARG_WITH([linux-includes], - AS_HELP_STRING( + AS_HELP_STRING( [--with-linux-includes=DIR], [Linux kernel includes]), - [CFLAGS="$CFLAGS -I$withval"], [:]) + [AM_CPPFLAGS="AM_CPPFLAGS -I$withval"], [:]) ;; esac PKG_CHECK_MODULES([mLib], [mLib >= 2.1.0]) PKG_CHECK_MODULES([catacomb], [catacomb >= 2.1.1]) -CFLAGS="$CFLAGS $mLib_CFLAGS $catacomb_CFLAGS" +AM_CFLAGS="$AM_CFLAGS $mLib_CFLAGS $catacomb_CFLAGS" dnl-------------------------------------------------------------------------- dnl Directories to install things into. @@ -296,7 +301,7 @@ case "$haveshark,$needshark" in AC_MSG_ERROR([failed to configure Wireshark plugin]) ;; yes,*) - WIRESHARK_CFLAGS="$CFLAGS $GLIB_CFLAGS $mdw_cv_wireshark_includes" + WIRESHARK_CFLAGS="$GLIB_CFLAGS $mdw_cv_wireshark_includes" AC_SUBST(WIRESHARK_CFLAGS) AC_SUBST(wireshark_plugindir) ;; @@ -307,6 +312,9 @@ AM_CONDITIONAL([HAVE_WIRESHARK], [test "$haveshark" = yes]) dnl-------------------------------------------------------------------------- dnl Produce output. +CFLAGS=$mdw_ORIG_CFLAGS +CPPFLAGS=$mdw_ORIG_CPPFLAGS + AC_CONFIG_HEADER([config/config.h]) AC_CONFIG_TESTDIR([t]) diff --git a/wireshark/Makefile.am b/wireshark/Makefile.am index ae3ccf43..6342178e 100644 --- a/wireshark/Makefile.am +++ b/wireshark/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/vars.am ###-------------------------------------------------------------------------- ### Wireshark plugin. -CFLAGS += $(WIRESHARK_CFLAGS) +AM_CFLAGS += $(WIRESHARK_CFLAGS) LIBS = wireshark_plugin_LTLIBRARIES = tripe.la -- [mdw]