build: fix for automake>=1.13

Also fix a couple of related deprecation warnings.

Signed-off-by: Tom Gundersen <teg@jklm.no>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/autogen.sh b/autogen.sh
index 1613b6de7b1a8682b0dffe0402bec6a7a710c649..3aef4d93270d29683c12452ba9a3a8ad69af6ebf 100644 (file)
--- a/autogen.sh
+++ b/autogen.sh
@@ -37,6 +37,6 @@ fi
 
 aclocal
 libtoolize --force --copy
-autoheader
+#autoheader
 automake --add-missing --copy --gnu # -Wall
 autoconf # -Wall

diff --git a/configure.ac b/configure.ac
index 4a4adbad6465d5375edb2621aec835f812ab5bc8..c5eb1855908d2db83c8578e025ca4b8d5a9d389c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(libtirpc, 0.2.3)
-AM_INIT_AUTOMAKE(libtirpc, 0.2.3)
+AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([src/auth_des.c])
 AC_CONFIG_MACRO_DIR([m4])
@@ -39,7 +39,7 @@ if test "x$enable_ipv6" != xno; then
 fi
 
 AC_PROG_CC
-AM_CONFIG_HEADER(config.h)
+m4_pattern_allow(AM_CONFIG_HEADERS(config.h))
 AC_PROG_LIBTOOL
 AC_HEADER_DIRENT
 AC_PREFIX_DEFAULT(/usr)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2dd7768bbb04f3fa482530820f18d10371bf1597..4c859fd31f6c37042f65d06e4fe72b43a4a2bdab 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@
 ## anything like that.
 
 
-INCLUDES = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
+AM_CPPFLAGS = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 \
                -D_GNU_SOURCE -Wall -pipe  
 
 lib_LTLIBRARIES = libtirpc.la