More build system changes to make it play better with up-to-date

autotools. In particular, this round gets rid of acconfig.h, putting
the necessary bits into conf/configure.in.in, and using AM_CFLAGS &
co. instead of plain CFLAGS, which rightly upsets automake.

5 files changed, 34 insertions, 73 deletions

diff --git a/Makefile.cvs b/Makefile.cvs
index 721eaed..2765a18 100644
--- a/Makefile.cvs
+++ b/Makefile.cvs
@@ -37,7 +37,7 @@ htmldoc:
 $(ACLOCAL):
 	aclocal -I conf/m4/plptools $(M4SUB)
 
-$(CONFIGHIN): acconfig.h configure.in
+$(CONFIGHIN): configure.in
 	autoheader
 
 $(LIBTOOLFILES):
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 576770a..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
-
-@TOP@
-
-/* Define this, if you have sys/time.h */
-#undef HAVE_SYS_TIME_H
-
-/* Define this, if libc provides bind_textdomain_codeset */
-#undef HAVE_BIND_TEXTDOMAIN_CODESET
-
-/* Define this, if you have libreadline */
-#undef HAVE_LIBREADLINE
-
-/* Define this, if you want NLS support */
-#undef ENABLE_NLS
-
-/* Define this, if you have catgets */
-#undef HAVE_CATGETS
-
-/* Define this, if you have gettext */
-#undef HAVE_GETTEXT
-
-/* Define this, if you have stpcpy */
-#undef HAVE_STPCPY
-
-/* Define this, if your locale.h defines LC_MESSAGES */
-#undef HAVE_LC_MESSAGES
-
-/* The package version */
-#undef VERSION 
-
-/* The package name */
-#undef PACKAGE
-
-/* Define this to enable debugging code */
-#undef DEBUG
-
-/* Define this, if sys/int_types.h is on your system */
-#undef HAVE_SYS_INT_TYPES_H
-
-/* Define this, if stdint.h is on your system */
-#undef HAVE_STDINT_H
-
-/* Define this, if your int-types have an underscore after the first u/s */
-#undef GNU_INTTYPES
-
-/* Define to 401 or 402, depending on readline version 4.1 or 4.2 */
-#define READLINE_VERSION 401
-
-@BOTTOM@
-
-/* Some reasonable defaults */
-
-#ifndef PSIONHOSTNAME
-# define PSIONHOSTNAME "localhost"
-#endif
-
-/* misc tweaks */
-
-#ifdef _IBMR2
-# undef DONT_UPDATE_MTAB
-# define DONT_UPDATE_MTAB /* The mount table is obtained from the kernel (!?) */
-#endif
-
-#endif /* _CONFIG_H_ */
-
diff --git a/conf/configure.in.in b/conf/configure.in.in
index da0ee6b..b8c19ab 100644
--- a/conf/configure.in.in
+++ b/conf/configure.in.in
@@ -1,6 +1,7 @@
 AC_REVISION($Revision$)dnl revision of this configure.in script
 
 AC_INIT(Makefile.am)
+AC_GNU_SOURCE
 AC_CONFIG_AUX_DIR(conf)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(include/config.h)
@@ -12,6 +13,7 @@ dnl Enable Maintainer stuff
 AM_MAINTAINER_MODE
 
 dnl checks for programs
+AM_PROG_CC_C_O
 AC_PROG_MAKE_SET
 AC_PROG_AWK
 AC_PATH_PROG(SED,sed)
@@ -41,6 +43,10 @@ AM_GNU_GETTEXT
 dnl Additional glibc-intl checks
 PLP_CHECK_INTL
 
+dnl Large File Support
+AC_SYS_LARGEFILE
+AC_FUNC_FSEEKO
+
 dnl checking for aix
 AC_MSG_CHECKING(for AIX)
 if test "`uname -s 2>/dev/null`" = AIX ; then
@@ -263,6 +269,29 @@ AC_SUBST(LIB_PLP)
 PLP_LDFLAGS='-L$(top_builddir)/lib/.libs'
 AC_SUBST(PLP_LDFLAGS)
 
+dnl Extra definitions for config.h
+AH_BOTTOM([
+/* Define this, if libc provides bind_textdomain_codeset */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Define to 401 or 402, depending on readline version 4.1 or 4.2 */
+#define READLINE_VERSION 401
+
+/* Some reasonable defaults */
+
+#ifndef PSIONHOSTNAME
+# define PSIONHOSTNAME "localhost"
+#endif
+
+/* misc tweaks */
+
+#ifdef _IBMR2
+# undef DONT_UPDATE_MTAB
+# define DONT_UPDATE_MTAB /* The mount table is obtained from the kernel (!?) */
+#endif
+])
+
+
 AC_OUTPUT(
 	Makefile
 	intl/Makefile
@@ -278,7 +307,6 @@ AC_OUTPUT(
 	doc/api/Makefile
 	etc/psion
 	etc/psion.SuSE
-	etc/psion.SuSE8
 	etc/plptools.spec
 	doc/ncpd.man
 	doc/plpnfsd.man
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 10f4358..ec6989b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,8 +1,8 @@
 # $Id$
 #
 INCLUDES = -I$(top_srcdir)/intl
-CFLAGS = $(THREADED_CFLAGS)
-CXXFLAGS = $(THREADED_CXXFLAGS)
+AM_CFLAGS = $(THREADED_CFLAGS)
+AM_CXXFLAGS = $(THREADED_CXXFLAGS)
 
 lib_LTLIBRARIES = libplp.la
 
diff --git a/ncpd/Makefile.am b/ncpd/Makefile.am
index a2a58ae..03978bf 100644
--- a/ncpd/Makefile.am
+++ b/ncpd/Makefile.am
@@ -1,8 +1,8 @@
 # $Id$
 #
 INCLUDES=-I$(top_srcdir)/lib
-CFLAGS = $(THREADED_CFLAGS)
-CXXFLAGS = $(THREADED_CXXFLAGS)
+AM_CFLAGS = $(THREADED_CFLAGS)
+AM_CXXFLAGS = $(THREADED_CXXFLAGS)
 
 sbin_PROGRAMS = ncpd