From a4d2ac6ab8d5fa9613520860cf7acd433f433de2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 31 Oct 2010 00:33:04 +0200 Subject: build: default to not building static libraries Signed-off-by: Jan Engelhardt --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 429f0a7..18e546f 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 -- cgit v1.2.3 From bf3dc4c7db95ff7203bc6257f73efa0a28e720f4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 31 Oct 2010 10:09:43 +0100 Subject: build: use AC_OUTPUT Signed-off-by: Jan Engelhardt --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 18e546f..d0145bd 100644 --- a/configure.ac +++ b/configure.ac @@ -63,5 +63,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 -- cgit v1.2.3 From caac08128586a7e4d84744ad9367af81f74bde63 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 31 Oct 2010 10:10:30 +0100 Subject: build: run autoupdate to replace obsolete constructs Signed-off-by: Jan Engelhardt --- configure.ac | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d0145bd..b194ea8 100644 --- a/configure.ac +++ b/configure.ac @@ -28,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 #endif @@ -52,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 -- cgit v1.2.3