- fix building with automake 1.12

[packages/cvs-nserver.git] / cvs-nserver-am_ac.patch

diff -urN cvs-nserver-1.11.1.52.orig/configure.in cvs-nserver-1.11.1.52/configure.in
--- cvs-nserver-1.11.1.52.orig/configure.in	Sun May 19 11:06:44 2002
+++ cvs-nserver-1.11.1.52/configure.in	Sun May 19 11:10:49 2002
@@ -10,7 +10,6 @@
 # initialize test framework
 AC_CONFIG_TESTDIR(tests)
 AC_CONFIG_FILES([tests/Makefile \
-                 tests/atconfig \
                  tests/package.m4 \
                  tests/cvs:tests/wrapsh.in],
                 [chmod +x tests/cvs])
@@ -22,10 +21,7 @@
 # their path, the installer can configure with a path that has GNU m4
 # first and get that path embedded in the installed autoconf and
 # autoheader scripts.
-AC_PROG_GNU_M4
-if test x"$ac_cv_prog_gnu_m4" != xyes; then
-  AC_MSG_ERROR([GNU m4 1.4 is required])
-fi
+AC_CHECK_PROG(M4,m4)
 # This is needed because Automake does not seem to realize there is
 # a AC-SUBST inside AC-PROG-GNU-M4.  Grmph!
 AC_SUBST(M4)
@@ -95,8 +95,6 @@
 LIBS="-lcrypt $LIBS"
 fi
 
-AM_C_PROTOTYPES
-
 AM_MAINTAINER_MODE
 
 AC_HEADER_DIRENT
@@ -172,7 +172,7 @@
 
 AC_FUNC_FNMATCH
 if test "$ac_cv_func_fnmatch_works" = no; then
-  LIBOBJS="$LIBOBJS fnmatch.o"
+  AC_LIBOBJ([fnmatch])
 fi
 
 # Try to find connect and gethostbyname.
@@ -277,7 +277,7 @@
   AC_DEFINE(ENCRYPTION)
 fi
 
-AC_CHECK_FUNC(gethostname, :, LIBOBJS="$LIBOBJS hostname.o")
+AC_CHECK_FUNC(gethostname, :, [AC_LIBOBJ([hostname])])
 
 # Check for options requesting client and server feature. If none are
 # given and we have connect(), we want the full client & server arrangement.
@@ -361,7 +361,7 @@
 [AC_TRY_COMPILE([], [return __CYGWIN32__;],
 ccvs_cv_sys_cygwin32=yes, ccvs_cv_sys_cygwin32=no)])
 if test $ccvs_cv_sys_cygwin32 = yes; then
-  LIBOBJS="$LIBOBJS fncase.o"
+  AC_LIBOBJ([fncase])
   LIBS="$LIBS -ladvapi32"
 
   dnl On Windows you can only change file times if you can write to
@@ -453,7 +453,6 @@
 	  lib/Makefile \
 	  man/Makefile \
 	  os2/Makefile \
-	  scripts/Makefile \
 	  src/Makefile \
           src/tests/Makefile \
 	  tools/Makefile \
diff -urN cvs-nserver-1.11.1.4.org/doc/Makefile.am cvs-nserver-1.11.1.4/doc/Makefile.am
--- cvs-nserver-1.11.1.4.org/doc/Makefile.am	Sun May 19 11:06:44 2002
+++ cvs-nserver-1.11.1.4/doc/Makefile.am	Sun May 19 11:13:13 2002
@@ -14,7 +14,7 @@
 
 #DISTFILES = \
 #	.cvsignore \
-#	RCSFILES \
+#	RCSFILES
 
 # AUTOMAKE_OPTIONS = no-texinfo.tex
 
diff -ur cvs-nserver-1.11.1.52.orig/acl/Makefile.am cvs-nserver-1.11.1.52/acl/Makefile.am
--- cvs-nserver-1.11.1.52.orig/acl/Makefile.am	2002-01-19 17:33:05.000000000 +0000
+++ cvs-nserver-1.11.1.52/acl/Makefile.am	2013-05-21 10:51:44.498634651 +0000
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = ../lib/ansi2knr
-
 INCLUDES = -I$(top_srcdir)/lib
 
 TESTS = check_stringbuf check_user_acl \
diff -ur cvs-nserver-1.11.1.52.orig/src/Makefile.am cvs-nserver-1.11.1.52/src/Makefile.am
--- cvs-nserver-1.11.1.52.orig/src/Makefile.am	2013-05-21 10:19:41.000000000 +0000
+++ cvs-nserver-1.11.1.52/src/Makefile.am	2013-05-21 10:52:36.445634549 +0000
@@ -12,8 +12,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-AUTOMAKE_OPTIONS = ../lib/ansi2knr
-
 SUBDIRS = . tests
 
 # $(includeopt) is CVS specific and set by configure