diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-11-07 20:49:19 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-11-07 20:49:19 +0100 |
commit | 417dc5fb87ade355d699ea523de870abc6dd1657 (patch) | |
tree | d74a779c3a7a90b35a800a412f9d6ab391caeb5d | |
parent | 424b581b012f38597ec06088cf98273eba25e7ba (diff) | |
parent | caac08128586a7e4d84744ad9367af81f74bde63 (diff) |
Merge branch 'master' of git://dev.medozas.de/libnetfilter_conntrack
-rw-r--r-- | configure.ac | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 429f0a7..b194ea8 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,7 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6]) AC_PROG_CC +AC_DISABLE_STATIC AM_PROG_LIBTOOL AC_PROG_INSTALL AC_PROG_LN_S @@ -27,8 +28,7 @@ AC_CHECK_FUNCS(inet_ntop) dnl Again, some systems have it, but not IPv6 if test "$ac_cv_func_inet_ntop" = "yes" ; then AC_MSG_CHECKING(if inet_ntop supports IPv6) -AC_TRY_RUN( - [ +AC_RUN_IFELSE([AC_LANG_SOURCE([[ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif @@ -51,9 +51,9 @@ int main() else exit(0); } - ], [ AC_MSG_RESULT(yes) + ]])],[ AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_INET_NTOP_IPV6, 1, [Define to 1 if inet_ntop supports IPv6.]) - ], AC_MSG_RESULT(no),AC_MSG_RESULT(no)) + ],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)]) fi if test ! -z "$libdir"; then @@ -62,5 +62,8 @@ if test ! -z "$libdir"; then fi dnl Output the makefile -AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile qa/Makefile include/libnetfilter_conntrack/Makefile include/internal/Makefile src/conntrack/Makefile src/expect/Makefile libnetfilter_conntrack.pc doxygen.cfg) - +AC_CONFIG_FILES([Makefile src/Makefile include/Makefile utils/Makefile + qa/Makefile include/libnetfilter_conntrack/Makefile + include/internal/Makefile src/conntrack/Makefile src/expect/Makefile + libnetfilter_conntrack.pc doxygen.cfg]) +AC_OUTPUT |