From 7ba845297fd60c784ecff248b27db109750211bf Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 17 Oct 2016 19:14:56 +0100 Subject: CFLAGS/CPPFLAGS/LDFLAGS -> AM_*, requested by Dilyan Palauzov. --- configure.ac | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c172d6b2..4cc5fcfc 100644 --- a/configure.ac +++ b/configure.ac @@ -51,8 +51,8 @@ AC_ARG_ENABLE( AC_HELP_STRING(--enable-static, create a static build) ) if test "x$enable_static" = xyes; then - LDFLAGS="$LDFLAGS -static" test "x$PKG_CONFIG" != x && PKG_CONFIG="$PKG_CONFIG --static" + AM_LDFLAGS="-static" fi # Is this gcc? @@ -129,7 +129,7 @@ PKG_CHECK_MODULES( LIBEVENT, libevent, [ - CPPFLAGS="$LIBEVENT_CFLAGS $CPPFLAGS" + AM_CFLAGS="$LIBEVENT_CFLAGS $AM_CFLAGS" LIBS="$LIBEVENT_LIBS $LIBS" found_libevent=yes ], @@ -156,7 +156,7 @@ PKG_CHECK_MODULES( LIBNCURSES, ncurses, [ - CPPFLAGS="$LIBNCURSES_CFLAGS $CPPFLAGS" + AM_CFLAGS="$LIBNCURSES_CFLAGS $AM_CFLAGS" LIBS="$LIBNCURSES_LIBS $LIBS" found_ncurses=yes ], @@ -646,4 +646,7 @@ AM_CONDITIONAL(IS_HPUX, test "x$PLATFORM" = xhpux) AM_CONDITIONAL(IS_UNKNOWN, test "x$PLATFORM" = xunknown) # autoconf should create a Makefile. +AC_SUBST(AM_CFLAGS) +AC_SUBST(AM_CPPFLAGS) +AC_SUBST(AM_LDFLAGS) AC_OUTPUT(Makefile) -- cgit