Modern autocrap conventions, dump acconfig.h.

CVS patchset: 7392
CVS date: 2004/08/03 21:16:26

diff --git a/file/acconfig.h b/file/acconfig.h
deleted file mode 100644 (file)
index e6293da..0000000
--- a/file/acconfig.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Autoheader needs me */
-#undef PACKAGE
-
-/* Autoheader needs me */
-#undef VERSION
-
-/* Define if builtin ELF support is enabled.  */
-#undef BUILTIN_ELF
-
-/* Define if ELF core file support is enabled.  */
-#undef ELFCORE
-
-/* Define if the `long long' type works.  */
-#undef HAVE_LONG_LONG
-
-/* Define if we have "tm_zone" in "struct tm".  */
-#undef HAVE_TM_ZONE
-
-/* Define if we have a global "char * []" "tzname" variable.  */
-#undef HAVE_TZNAME
-
-/* Define if we have "tm_isdst" in "struct tm".  */
-#undef HAVE_TM_ISDST
-
-/* Define if we have a global "int" variable "daylight".  */
-#undef HAVE_DAYLIGHT
-
-/* Define if we have a mkstemp */
-#undef HAVE_MKSTEMP
-
-/* Define to `unsigned char' if standard headers don't define.  */
-#undef uint8_t
-
-/* Define to `unsigned short' if standard headers don't define.  */
-#undef uint16_t
-
-/* Define to `unsigned int' if standard headers don't define.  */
-#undef uint32_t
-
-/* Define to `unsigned long long', if available, or `unsigned long', if
-   standard headers don't define.  */
-#undef uint64_t
-
-/* Define to `int' if standard headers don't define.  */
-#undef int32_t
-
-/* FIXME: These have to be added manually because autoheader doesn't know
-   about AC_CHECK_SIZEOF_INCLUDES.  */
-
-/* The number of bytes in a uint8_t.  */
-#define SIZEOF_UINT8_T 0
-
-/* The number of bytes in a uint16_t.  */
-#define SIZEOF_UINT16_T 0
-
-/* The number of bytes in a uint32_t.  */
-#define SIZEOF_UINT32_T 0
-
-/* The number of bytes in a uint64_t.  */
-#define SIZEOF_UINT64_T 0

diff --git a/file/configure.in b/file/configure.ac
similarity index 55%
rename from file/configure.in
rename to file/configure.ac
index a3b9c5d..074f0d9 100644 (file)
--- a/file/configure.in
+++ b/file/configure.ac
@@ -1,35 +1,41 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/file.c)
-AM_INIT_AUTOMAKE(file, 4.10)
-AM_CONFIG_HEADER(config.h)
+
+AC_PREREQ(2.59)
+AC_INIT([file],[4.10])
+AC_CANONICAL_TARGET
+AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([foreign])
 AM_MAINTAINER_MODE
 
 AC_MSG_CHECKING(for builtin ELF support)
 AC_ARG_ENABLE(elf,
 [  --disable-elf            disable builtin ELF support],
+AH_TEMPLATE([BUILTIN_ELF],     [Define if builtin ELF support is enabled.])
 [if test "${enableval}" = yes; then
   AC_MSG_RESULT(yes)
-  AC_DEFINE(BUILTIN_ELF)
+  AC_DEFINE([BUILTIN_ELF], 1)
 else
   AC_MSG_RESULT(no)
 fi], [
   # enable by default
   AC_MSG_RESULT(yes)
-  AC_DEFINE(BUILTIN_ELF)
+  AC_DEFINE([BUILTIN_ELF], 1)
 ])
 
 AC_MSG_CHECKING(for ELF core file support)
 AC_ARG_ENABLE(elf-core,
 [  --disable-elf-core       disable ELF core file support],
+AH_TEMPLATE([ELFCORE], [Define if ELF core file support is enabled.])
 [if test "${enableval}" = yes; then
   AC_MSG_RESULT(yes)
-  AC_DEFINE(ELFCORE)
+  AC_DEFINE([ELFCORE], 1)
 else
   AC_MSG_RESULT(no)
 fi], [
   # enable by default
   AC_MSG_RESULT(yes)
-  AC_DEFINE(ELFCORE)
+  AC_DEFINE([ELFCORE], 1)
 ])
 
 AC_MSG_CHECKING(for file formats in man section 5)
@@ -55,6 +61,11 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_LIBTOOL
 
+if test "$ac_cv_c_compiler_gnu" = yes; then
+    CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
+fi
+export CFLAGS
+
 dnl Checks for headers
 AC_HEADER_STDC
 AC_HEADER_MAJOR
@@ -68,17 +79,27 @@ AC_CHECK_HEADERS(getopt.h)
 AC_CHECK_HEADERS(locale.h)
 AC_CHECK_HEADERS(utime.h)
 AC_CHECK_HEADERS(sys/utime.h)
+AC_CHECK_HEADERS(regex.h)
 AC_CHECK_HEADERS(wchar.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_OFF_T
+AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_STRUCT_ST_RDEV
+AH_TEMPLATE([HAVE_DAYLIGHT], [Define if we have a global "int" variable "daylight".])
+AH_TEMPLATE([HAVE_TM_ISDST], [Define if we have "tm_isdst" in "struct tm".])
 AC_STRUCT_TIMEZONE_DAYLIGHT
 AC_SYS_LARGEFILE
 AC_MBSTATE_T
 
+AH_TEMPLATE([uint8_t], [Define to `unsigned char' if standard headers don't define.])
+AH_TEMPLATE([uint16_t], [Define to `unsigned short' if standard headers don't define.])
+AH_TEMPLATE([uint32_t], [Define to `unsigned int' if standard headers don't define.])
+AH_TEMPLATE([int32_t], [Define to `int' if standard headers don't define.])
+AH_TEMPLATE([HAVE_LONG_LONG],[Define if the `long long' type works.])
+AH_TEMPLATE([uint64_t], [Define to `unsigned long long', if available, or `unsigned long', if standard headers don't define.])
 AC_CHECK_TYPE_STDC(uint8_t, unsigned char)
 AC_CHECK_TYPE_STDC(uint16_t, unsigned short)
 AC_CHECK_TYPE_STDC(uint32_t, unsigned int)
@@ -92,6 +113,10 @@ fi
 dnl This needs a patch to autoconf 2.13 acgeneral.m4
 AC_CHECK_TYPE2_STDC(uint64_t, $long64)
 
+AH_TEMPLATE([SIZEOF_UINT8_T], [The number of bytes in a uint8_t.])
+AH_TEMPLATE([SIZEOF_UINT16_T], [The number of bytes in a uint16_t.])
+AH_TEMPLATE([SIZEOF_UINT32_T], [The number of bytes in a uint32_t.])
+AH_TEMPLATE([SIZEOF_UINT64_T], [The number of bytes in a uint64_t.])
 AC_CHECK_SIZEOF_STDC_HEADERS(uint8_t, 0)
 AC_CHECK_SIZEOF_STDC_HEADERS(uint16_t, 0)
 AC_CHECK_SIZEOF_STDC_HEADERS(uint32_t, 0)
@@ -100,7 +125,16 @@ AC_CHECK_SIZEOF_STDC_HEADERS(uint64_t, 0)
 dnl Checks for functions
 AC_CHECK_FUNCS(mmap strerror strtoul mbrtowc mkstemp getopt_long utimes utime wcwidth)
 
+# XXX Choose /usr/lib or /usr/lib64 for library installs.
+MARK64=
+case "${target_cpu}" in
+x86_64*|powerpc64*|ppc64*|sparc64*|s390x*)        MARK64=64 ;;
+esac
+AC_SUBST(MARK64)
+
 dnl Checks for libraries
 AC_CHECK_LIB(z,gzopen)
+dnl AC_CHECK_LIB(bz2, BZ2_bzReadOpen)
 
-AC_OUTPUT(Makefile src/Makefile magic/Makefile doc/Makefile)
+AC_CONFIG_FILES(Makefile src/Makefile magic/Makefile doc/Makefile)
+AC_OUTPUT