Changeset ce35060

Timestamp:

Nov 6, 2010, 6:34:03 PM (14 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

9fc473a

Parents:

6ad7bed

git-author:

Anders Kaseorg <andersk@mit.edu> (08/09/10 01:49:07)

git-committer:

Anders Kaseorg <andersk@mit.edu> (11/06/10 18:34:03)

Message:

Use AM_{CPP,C,LD}FLAGS instead of overriding {CPP,C,LD}FLAGS

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• Makefile.am (modified) (3 diffs)
• configure.ac (modified) (7 diffs)

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
-CFLAGS += $(EXTRA_CFLAGS)
 
 GIT_DESCRIPTION := $(if $(wildcard .git),$(shell git describe --match='barnowl-*' HEAD 2>/dev/null))
@@ -33 +32 @@
 TESTS=runtests.sh
 
-CPPFLAGS = -I$(top_srcdir)/ \
+AM_CPPFLAGS = -I$(top_srcdir)/ \
            -I$(top_srcdir)/libfaim/ \
            -DDATADIR='"$(pkgdatadir)"' \
@@ -77 +76 @@
 # For emacs flymake-mode
 check-syntax: proto
-        $(CC) $(CFLAGS) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES)
+        $(COMPILE) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES)
 
 install-data-local:

configure.ac

@@ -17 +17 @@
 AS_IF([test "x$with_stack_protector" != xno],
   [AX_C_CHECK_FLAG([-fstack-protector],[],[],
-    [CFLAGS="$CFLAGS -fstack-protector"],
+    [AM_CFLAGS="$AM_CFLAGS -fstack-protector"],
     [if test "x$with_stack_protector" != xcheck; then
        AC_MSG_FAILURE([--with-stack-protector selected, but gcc does support it.])
@@ -45 +45 @@
       [AC_MSG_RESULT([yes])
        AC_DEFINE([HAVE_KERBEROS_IV], [1], [Define if you have kerberos IV])
-       CFLAGS="${CFLAGS} `krb5-config krb4 --cflags`"
+       AM_CFLAGS="${AM_CFLAGS} `krb5-config krb4 --cflags`"
        LIBS="${LIBS} `krb5-config krb4 --libs`"
       ],
@@ -52 +52 @@
              [AC_MSG_ERROR([Kerberos IV requested but not found])])
        PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto])
-       CFLAGS="${CFLAGS} ${LIBCRYPTO_CFLAGS}"
+       AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}"
        LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
      ])])
@@ -86 +86 @@
 PERL_CFLAGS=`perl -MExtUtils::Embed -e ccopts`
 AC_MSG_NOTICE([Adding perl CFLAGS ${PERL_CFLAGS}])
-CFLAGS="${CFLAGS} ${PERL_CFLAGS}"
+AM_CFLAGS="${AM_CFLAGS} ${PERL_CFLAGS}"
 
 dnl Find the location of perl XSUBPP
@@ -118 +118 @@
 
 AC_MSG_NOTICE([Adding glib-2.0 CFLAGS ${GLIB_CFLAGS}])
-CFLAGS="${GLIB_CFLAGS} ${CFLAGS}"
+AM_CFLAGS="${GLIB_CFLAGS} ${AM_CFLAGS}"
 AC_MSG_NOTICE([Adding glib-2.0 LDFLAGS ${GLIB_LIBS}])
-LDFLAGS="${GLIB_LIBS} ${LDFLAGS}"
+AM_LDFLAGS="${GLIB_LIBS} ${AM_LDFLAGS}"
 
 if test "x${prefix}" = "xNONE"; then
@@ -128 +128 @@
 dnl Checks for typedefs, structures, and compiler characteristics.
 
-AX_CFLAGS_WARN_ALL
-AX_CFLAGS_STRICT_PROTOTYPES
+AX_CFLAGS_WARN_ALL([AM_CFLAGS])
+AX_CFLAGS_STRICT_PROTOTYPES([AM_CFLAGS])
 
 AX_C_CHECK_FLAG([-Wno-pointer-sign],[],[],
@@ -138 +138 @@
                                  test "$HAVE_DES_ECB_ENCRYPT"])
 
-CFLAGS="$CFLAGS -D_XOPEN_SOURCE"
+AM_CFLAGS="$AM_CFLAGS -D_XOPEN_SOURCE"
 dnl __EXTENSIONS__ is needed for struct timeval on Solaris when
 dnl _XOPEN_SOURCE is defined.
-CFLAGS="$CFLAGS -D__EXTENSIONS__"
+AM_CFLAGS="$AM_CFLAGS -D__EXTENSIONS__"
 
+AC_SUBST([AM_CFLAGS])
+AC_SUBST([AM_LDFLAGS])
 AC_SUBST([LIBFAIM_CFLAGS])