Module Name: othersrc
Committed By: lukem
Date: Thu Mar 21 02:56:57 UTC 2013
Modified Files:
othersrc/libexec/tnftpd: Makefile.am configure.ac
Log Message:
Require autoconf 2.69
Require libtool 2.4
Update to LT_INIT instead of AC_PROG_LIBTOOL
Crank copyrigth
Fix AC_PROG_YACC workaround to only be used if $YACC gets set to "yacc"
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 othersrc/libexec/tnftpd/Makefile.am
cvs rdiff -u -r1.32 -r1.33 othersrc/libexec/tnftpd/configure.ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/libexec/tnftpd/Makefile.am
diff -u othersrc/libexec/tnftpd/Makefile.am:1.2 othersrc/libexec/tnftpd/Makefile.am:1.3
--- othersrc/libexec/tnftpd/Makefile.am:1.2 Mon Jan 4 05:44:56 2010
+++ othersrc/libexec/tnftpd/Makefile.am Thu Mar 21 02:56:56 2013
@@ -1,4 +1,6 @@
-## $NetBSD: Makefile.am,v 1.2 2010/01/04 05:44:56 lukem Exp $
+## $NetBSD: Makefile.am,v 1.3 2013/03/21 02:56:56 lukem Exp $
+
+ACLOCAL_AMFLAGS = -I buildaux
SUBDIRS = examples libnetbsd ls src
Index: othersrc/libexec/tnftpd/configure.ac
diff -u othersrc/libexec/tnftpd/configure.ac:1.32 othersrc/libexec/tnftpd/configure.ac:1.33
--- othersrc/libexec/tnftpd/configure.ac:1.32 Wed Mar 20 09:14:54 2013
+++ othersrc/libexec/tnftpd/configure.ac Thu Mar 21 02:56:56 2013
@@ -1,26 +1,31 @@
-# $NetBSD: configure.ac,v 1.32 2013/03/20 09:14:54 lukem Exp $
+# $NetBSD: configure.ac,v 1.33 2013/03/21 02:56:56 lukem Exp $
#
# Process this file with autoconf to produce a configure script.
AC_INIT([tnftpd], [20100324], [[email protected]])
-AC_PREREQ([2.61])
+AC_PREREQ([2.69])
AC_COPYRIGHT([
-Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
+Copyright (c) 2001-2013 The NetBSD Foundation, Inc.
All rights reserved.
])
-AC_REVISION([$Revision: 1.32 $])
+AC_REVISION([$Revision: 1.33 $])
AS_SHELL_SANITIZE
AC_CONFIG_SRCDIR([tnftpd.h])
AC_CONFIG_AUX_DIR([buildaux])
+AC_CONFIG_MACRO_DIR([buildaux])
AC_CONFIG_HEADERS([tnftpd_config.h])
AC_CONFIG_LIBOBJ_DIR([libnetbsd])
AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc silent-rules])
AM_MAINTAINER_MODE
+LT_PREREQ([2.4])
+#LT_INIT([disable-shared])
+LT_INIT()
+
#
# Arguments for which features are included.
#
@@ -87,13 +92,13 @@ AH_TEMPLATE([USE_SKEY],
#
AC_PROG_CC
AC_PROG_AWK
-AC_PROG_LIBTOOL
AC_PROG_YACC
-AC_PATH_PROG([TOOL_YACC], [$YACC])
-AS_IF([test -n "$TOOL_YACC"],
- [:],
- [AC_MSG_ERROR([missing bison or yacc])])
+AS_IF([test x"$YACC" == x"yacc"],
+ [AC_PATH_PROG([TOOL_YACC], [$YACC])
+ AS_IF([test -n "$TOOL_YACC"],
+ [:],
+ [AC_MSG_ERROR([missing bison or yacc])])])
#
# Checks for tool features.
