fix "make dist"

diff --git a/Makefile.am b/Makefile.am
index c2f4f2317bf08ec93594079108083f19d15af019..efc5f68ef34426e43c0df942eaa7ef5f818f252e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-AUTOMAKE_OPTIONS = no-dependencies foreign
+AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
-EXTRA_DIST = $(man_MANS) acinclude.m4
+EXTRA_DIST = $(man_MANS) 
 
 SUBDIRS = include src utils
 

diff --git a/autogen.sh b/autogen.sh
index ccce4f0a6001dff9f64e0fe85e7154e8db9e39b5..4999b584d288d54fdf50f14f7cc7ba68128865fb 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,8 +11,7 @@ run ()
     fi
 }
 
-run aclocal
+run aclocal-1.6
 #run autoheader
-run libtoolize -f
-run automake -a
+run automake-1.6 -a
 run autoconf

diff --git a/configure.in b/configure.in
index 5b77da2458d0ad584d4fd3ba04b42113eb724b3a..457028473fb0a5b2d58da2d4e0b8f45240335a9c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
 AC_INIT
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(libnfnetlink_queue, 0.10)
+AM_INIT_AUTOMAKE(libnfnetlink_queue, 0.0.10)
 
 AC_PROG_CC
 AC_EXEEXT

diff --git a/src/Makefile.am b/src/Makefile.am
index 229fa8cc8f3d244ec861a8c3d65d900a34239149..c75d7086177bf0fd15cf12a477c30f8ad6493081 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,3 @@
-#AUTOMAKE_OPTIONS = no-dependencies foreign
-
-#EXTRA_DIST = $(man_MANS) acinclude.m4
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
 AM_CFLAGS=-fPIC -Wall