Changeset ce35060 for configure.ac


Ignore:
Timestamp:
Nov 6, 2010, 6:34:03 PM (10 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Branches:
master, 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>
File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r12a6616 rce35060  
    1717AS_IF([test "x$with_stack_protector" != xno],
    1818  [AX_C_CHECK_FLAG([-fstack-protector],[],[],
    19     [CFLAGS="$CFLAGS -fstack-protector"],
     19    [AM_CFLAGS="$AM_CFLAGS -fstack-protector"],
    2020    [if test "x$with_stack_protector" != xcheck; then
    2121       AC_MSG_FAILURE([--with-stack-protector selected, but gcc does support it.])
     
    4545      [AC_MSG_RESULT([yes])
    4646       AC_DEFINE([HAVE_KERBEROS_IV], [1], [Define if you have kerberos IV])
    47        CFLAGS="${CFLAGS} `krb5-config krb4 --cflags`"
     47       AM_CFLAGS="${AM_CFLAGS} `krb5-config krb4 --cflags`"
    4848       LIBS="${LIBS} `krb5-config krb4 --libs`"
    4949      ],
     
    5252             [AC_MSG_ERROR([Kerberos IV requested but not found])])
    5353       PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto])
    54        CFLAGS="${CFLAGS} ${LIBCRYPTO_CFLAGS}"
     54       AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}"
    5555       LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
    5656     ])])
     
    8686PERL_CFLAGS=`perl -MExtUtils::Embed -e ccopts`
    8787AC_MSG_NOTICE([Adding perl CFLAGS ${PERL_CFLAGS}])
    88 CFLAGS="${CFLAGS} ${PERL_CFLAGS}"
     88AM_CFLAGS="${AM_CFLAGS} ${PERL_CFLAGS}"
    8989
    9090dnl Find the location of perl XSUBPP
     
    118118
    119119AC_MSG_NOTICE([Adding glib-2.0 CFLAGS ${GLIB_CFLAGS}])
    120 CFLAGS="${GLIB_CFLAGS} ${CFLAGS}"
     120AM_CFLAGS="${GLIB_CFLAGS} ${AM_CFLAGS}"
    121121AC_MSG_NOTICE([Adding glib-2.0 LDFLAGS ${GLIB_LIBS}])
    122 LDFLAGS="${GLIB_LIBS} ${LDFLAGS}"
     122AM_LDFLAGS="${GLIB_LIBS} ${AM_LDFLAGS}"
    123123
    124124if test "x${prefix}" = "xNONE"; then
     
    128128dnl Checks for typedefs, structures, and compiler characteristics.
    129129
    130 AX_CFLAGS_WARN_ALL
    131 AX_CFLAGS_STRICT_PROTOTYPES
     130AX_CFLAGS_WARN_ALL([AM_CFLAGS])
     131AX_CFLAGS_STRICT_PROTOTYPES([AM_CFLAGS])
    132132
    133133AX_C_CHECK_FLAG([-Wno-pointer-sign],[],[],
     
    138138                                 test "$HAVE_DES_ECB_ENCRYPT"])
    139139
    140 CFLAGS="$CFLAGS -D_XOPEN_SOURCE"
     140AM_CFLAGS="$AM_CFLAGS -D_XOPEN_SOURCE"
    141141dnl __EXTENSIONS__ is needed for struct timeval on Solaris when
    142142dnl _XOPEN_SOURCE is defined.
    143 CFLAGS="$CFLAGS -D__EXTENSIONS__"
     143AM_CFLAGS="$AM_CFLAGS -D__EXTENSIONS__"
    144144
     145AC_SUBST([AM_CFLAGS])
     146AC_SUBST([AM_LDFLAGS])
    145147AC_SUBST([LIBFAIM_CFLAGS])
    146148
Note: See TracChangeset for help on using the changeset viewer.