From a0b68d260f04776f021e8117ba4d88bcc5c70b9a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 30 Dec 2010 16:38:32 +0100 Subject: build: use AM_CPPFLAGS Signed-off-by: Jan Engelhardt --- Make_global.am | 2 +- configure.ac | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Make_global.am b/Make_global.am index 7049189..1c9ed63 100644 --- a/Make_global.am +++ b/Make_global.am @@ -20,5 +20,5 @@ # LIBVERSION=0:1:0 -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} diff --git a/configure.ac b/configure.ac index 264242a..819cbf7 100644 --- a/configure.ac +++ b/configure.ac @@ -17,10 +17,11 @@ case $target in *) AC_MSG_ERROR([Linux only, dude!]);; esac -regular_CFLAGS="-D_FILE_OFFSET_BITS=64 \ - -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \ +regular_CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_REENTRANT" +regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ -Wformat=2 -pipe" +AC_SUBST([regular_CPPFLAGS]) AC_SUBST([regular_CFLAGS]) AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libmnl/Makefile include/linux/Makefile examples/Makefile examples/genl/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg]) AC_OUTPUT -- cgit v1.2.3 From d732efa5ed400ce07ca50e8a44cf7059377d1f84 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 31 Dec 2010 00:13:49 +0100 Subject: build: use only AC_CANONICAL_HOST Calculating AC_CANONICAL_TARGET is superfluous, because libmnl is not a code generator. Signed-off-by: Jan Engelhardt --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 819cbf7..82a6ce4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to create configure. AC_INIT([libmnl], [1.0.1]) -AC_CANONICAL_TARGET +AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign dist-bzip2 1.6 subdir-objects]) @@ -12,7 +12,7 @@ AC_EXEEXT AC_DISABLE_STATIC LT_INIT CHECK_GCC_FVISIBILITY -case $target in +case "$host" in *-*-linux*) ;; *) AC_MSG_ERROR([Linux only, dude!]);; esac -- cgit v1.2.3