From: Vincent Bernat <vincent@bernat.im>
Date: Thu, 19 Feb 2015 15:47:06 +0000 (+0100)
Subject: configure: put cpp flags into CPPFLAGS instead of CFLAGS
X-Git-Tag: 0.7.14~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a577598bb30b60e2914d4ca85548ceb72c867c16;p=thirdparty%2Flldpd.git

configure: put cpp flags into CPPFLAGS instead of CFLAGS
---

diff --git a/configure.ac b/configure.ac
index bc5f6d67..fe0da6e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@ AX_CFLAGS_GCC_OPTION([-Winline])
 AX_CFLAGS_GCC_OPTION([-fstack-protector])
 AX_CFLAGS_GCC_OPTION([-fstack-protector-strong])
 AX_CFLAGS_GCC_OPTION([-fno-omit-frame-pointer])
-AX_CFLAGS_GCC_OPTION([-D_FORTIFY_SOURCE=2])
+AX_CFLAGS_GCC_OPTION([-D_FORTIFY_SOURCE=2], [CPPFLAGS])
 AX_CFLAGS_GCC_OPTION([-Wno-unused-parameter])
 AX_CFLAGS_GCC_OPTION([-Wno-missing-field-initializers])
 AX_CFLAGS_GCC_OPTION([-Wno-sign-compare]) dnl Should be fixed later
diff --git a/m4/os.m4 b/m4/os.m4
index f5765d5f..521d1793 100644
--- a/m4/os.m4
+++ b/m4/os.m4
@@ -35,16 +35,16 @@ AC_DEFUN([lldp_CHECK_OS], [
 # Enable some additional CFLAGS depending on the OS
 AC_DEFUN([lldp_CFLAGS_OS], [
   # Most of what we want can be enabled nowadays with _GNU_SOURCE
-  AX_CFLAGS_GCC_OPTION([-D_GNU_SOURCE])    dnl GNU systems (asprintf, ...)
+  AX_CFLAGS_GCC_OPTION([-D_GNU_SOURCE], [CPPFLAGS])    dnl GNU systems (asprintf, ...)
 
   case $host_os in
      solaris*)
-       AX_CFLAGS_GCC_OPTION([-D__EXTENSIONS__]) dnl (CMSG_*)
-       AX_CFLAGS_GCC_OPTION([-D_XPG4_2])        dnl (CMSG_*)
+       AX_CFLAGS_GCC_OPTION([-D__EXTENSIONS__], [CPPFLAGS]) dnl (CMSG_*)
+       AX_CFLAGS_GCC_OPTION([-D_XPG4_2], [CPPFLAGS])        dnl (CMSG_*)
        ;;
      hpux*)
-       AX_CFLAGS_GCC_OPTION([-D_XOPEN_SOURCE=500])      dnl HP-UX
-       AX_CFLAGS_GCC_OPTION([-D_XOPEN_SOURCE_EXTENDED]) dnl HP-UX
+       AX_CFLAGS_GCC_OPTION([-D_XOPEN_SOURCE=500], [CPPFLAGS])      dnl HP-UX
+       AX_CFLAGS_GCC_OPTION([-D_XOPEN_SOURCE_EXTENDED], [CPPFLAGS]) dnl HP-UX
        ;;
   esac
 ])