libnetfilter_conntrack build updates 2

libnetfilter_conntrack build updates 2

[Jan Engelhardt]

The following changes since commit cc3b3ef6c269549a45ba16cd1bb3b4316091906d:

  Update .gitignore (2010-10-30 23:53:12 +0200)

are available in the git repository at:
  git://dev.medozas.de/libnetfilter_conntrack master

Jan Engelhardt (3):
      build: default to not building static libraries
      build: use AC_OUTPUT
      build: run autoupdate to replace obsolete constructs

 configure.ac |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

[PATCH 1/3] build: default to not building static libraries

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 configure.ac |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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
-- 
1.7.1

[PATCH 2/3] build: use AC_OUTPUT

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 configure.ac |    7 +++++--
 1 files 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
-- 
1.7.1

[PATCH 3/3] build: run autoupdate to replace obsolete constructs

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 configure.ac |    7 +++----
 1 files 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 <sys/types.h>
 #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
-- 
1.7.1

Re: libnetfilter_conntrack build updates 2

[Pablo Neira Ayuso]

On 05/11/10 18:37, Jan Engelhardt wrote:
> git://dev.medozas.de/libnetfilter_conntrack master

Pulled and pushed, thanks