diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-01-06 03:19:29 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-01-06 03:19:29 +0100 |
| commit | 89bb1e00f921a4e8b0e1e3b3e6aea5d26ccd0435 (patch) | |
| tree | a908925c927d48fae872efd023f915083c17f1f3 | |
| parent | dbbd8a22742a9f67c75c10411908835703d34728 (diff) | |
| parent | d732efa5ed400ce07ca50e8a44cf7059377d1f84 (diff) | |
Merge branch 'master' of git://dev.medozas.de/libmnl
| -rw-r--r-- | Make_global.am | 2 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 6 insertions, 5 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..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,15 +12,16 @@ AC_EXEEXT AC_DISABLE_STATIC LT_INIT CHECK_GCC_FVISIBILITY -case $target in +case "$host" in *-*-linux*) ;; *) 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 |