file 4.24

diff --git a/configure.ac b/configure.ac
index 84d998b658afb22c8ff15b86e0c17ccb7c4d6923..211cc8adf17fee9f9b068218ac8cb84d59bd57b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,122 +1,122 @@
-dnl Process this file with autoconf to produce a configure script.\r
-AC_INIT(file, 4.23, christos@astron.com)\r
-AM_INIT_AUTOMAKE\r
-AM_CONFIG_HEADER(config.h)\r
-\r
-AC_MSG_CHECKING(for builtin ELF support)\r
-AC_ARG_ENABLE(elf,\r
-[  --disable-elf            disable builtin ELF support],\r
-[if test "${enableval}" = yes; then\r
-  AC_MSG_RESULT(yes)\r
-  AC_DEFINE([BUILTIN_ELF], 1, [Define if built-in ELF support is used])\r
-else\r
-  AC_MSG_RESULT(no)\r
-fi], [\r
-  # enable by default\r
-  AC_MSG_RESULT(yes)\r
-  AC_DEFINE([BUILTIN_ELF], 1, [Define in built-in ELF support is used])\r
-])\r
-\r
-AC_MSG_CHECKING(for ELF core file support)\r
-AC_ARG_ENABLE(elf-core,\r
-[  --disable-elf-core       disable ELF core file support],\r
-[if test "${enableval}" = yes; then\r
-  AC_MSG_RESULT(yes)\r
-  AC_DEFINE([ELFCORE], 1, [Define for ELF core file support])\r
-else\r
-  AC_MSG_RESULT(no)\r
-fi], [\r
-  # enable by default\r
-  AC_MSG_RESULT(yes)\r
-  AC_DEFINE([ELFCORE], 1, [Define for ELF core file support])\r
-])\r
-\r
-AC_MSG_CHECKING(for file formats in man section 5)\r
-AC_ARG_ENABLE(fsect-man5,\r
-[  --enable-fsect-man5      enable file formats in man section 5],\r
-[if test "${enableval}" = yes; then\r
-  AC_MSG_RESULT(yes)\r
-  fsect=5\r
-else\r
-  AC_MSG_RESULT(no)\r
-  fsect=4\r
-fi], [\r
-  # disable by default\r
-  AC_MSG_RESULT(no)\r
-  fsect=4\r
-])\r
-AC_SUBST(fsect)\r
-AM_CONDITIONAL(FSECT5, test x$fsect = x5)\r
-AC_GNU_SOURCE\r
-\r
-dnl Checks for programs.\r
-AC_PROG_CC\r
-AC_PROG_INSTALL\r
-AC_PROG_LN_S\r
-AC_PROG_LIBTOOL\r
-\r
-dnl Checks for headers\r
-AC_HEADER_STDC\r
-AC_HEADER_MAJOR\r
-AC_HEADER_SYS_WAIT\r
-AC_CHECK_HEADERS(stdint.h fcntl.h locale.h stdint.h inttypes.h unistd.h)\r
-AC_CHECK_HEADERS(utime.h wchar.h wctype.h limits.h)\r
-AC_CHECK_HEADERS(sys/mman.h sys/stat.h sys/types.h sys/utime.h sys/time.h)\r
-AC_CHECK_HEADERS(zlib.h)\r
-\r
-dnl Checks for typedefs, structures, and compiler characteristics.\r
-AC_C_CONST\r
-AC_TYPE_OFF_T\r
-AC_TYPE_SIZE_T\r
-AC_CHECK_MEMBERS([struct stat.st_rdev])\r
-\r
-AC_STRUCT_TIMEZONE_DAYLIGHT\r
-AC_SYS_LARGEFILE\r
-AC_FUNC_FSEEKO\r
-AC_TYPE_MBSTATE_T\r
-\r
-AC_CHECK_TYPES([uint8_t, uint16_t, uint32_t, int32_t, uint64_t, int64_t])\r
-AC_CHECK_SIZEOF(long long)\r
-AH_BOTTOM([\r
-#ifndef HAVE_UINT8_T\r
-typedef unsigned char uint8_t;\r
-#endif\r
-#ifndef HAVE_UINT16_T\r
-typedef unsigned short uint16_t;\r
-#endif\r
-#ifndef HAVE_UINT32_T\r
-typedef unsigned int uint32_t;\r
-#endif\r
-#ifndef HAVE_INT32_T\r
-typedef int int32_t;\r
-#endif\r
-#ifndef HAVE_UINT64_T\r
-#if SIZEOF_LONG_LONG == 8\r
-typedef unsigned long long uint64_t;\r
-#else\r
-typedef unsigned long uint64_t;\r
-#endif\r
-#endif\r
-#ifndef HAVE_INT64_T\r
-#if SIZEOF_LONG_LONG == 8\r
-typedef long long int64_t;\r
-#else\r
-typedef long int64_t;\r
-#endif\r
-#endif\r
-])\r
-\r
-dnl Checks for functions\r
-AC_CHECK_FUNCS(mmap strerror strndup strtoul mbrtowc mkstemp utimes utime wcwidth strtof)\r
-\r
-dnl Provide implementation of some required functions if necessary\r
-AC_REPLACE_FUNCS(getopt_long asprintf vasprintf)\r
-\r
-dnl Checks for libraries\r
-AC_CHECK_LIB(z,gzopen)\r
-\r
-dnl See if we are cross-compiling\r
-AM_CONDITIONAL(IS_CROSS_COMPILE, test "$cross_compiling" = yes)\r
-\r
-AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile])\r
-AC_OUTPUT\r
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT(file, 4.24, christos@astron.com)
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER(config.h)
+
+AC_MSG_CHECKING(for builtin ELF support)
+AC_ARG_ENABLE(elf,
+[  --disable-elf            disable builtin ELF support],
+[if test "${enableval}" = yes; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE([BUILTIN_ELF], 1, [Define if built-in ELF support is used])
+else
+  AC_MSG_RESULT(no)
+fi], [
+  # enable by default
+  AC_MSG_RESULT(yes)
+  AC_DEFINE([BUILTIN_ELF], 1, [Define in built-in ELF support is used])
+])
+
+AC_MSG_CHECKING(for ELF core file support)
+AC_ARG_ENABLE(elf-core,
+[  --disable-elf-core       disable ELF core file support],
+[if test "${enableval}" = yes; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE([ELFCORE], 1, [Define for ELF core file support])
+else
+  AC_MSG_RESULT(no)
+fi], [
+  # enable by default
+  AC_MSG_RESULT(yes)
+  AC_DEFINE([ELFCORE], 1, [Define for ELF core file support])
+])
+
+AC_MSG_CHECKING(for file formats in man section 5)
+AC_ARG_ENABLE(fsect-man5,
+[  --enable-fsect-man5      enable file formats in man section 5],
+[if test "${enableval}" = yes; then
+  AC_MSG_RESULT(yes)
+  fsect=5
+else
+  AC_MSG_RESULT(no)
+  fsect=4
+fi], [
+  # disable by default
+  AC_MSG_RESULT(no)
+  fsect=4
+])
+AC_SUBST(fsect)
+AM_CONDITIONAL(FSECT5, test x$fsect = x5)
+AC_GNU_SOURCE
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_LIBTOOL
+
+dnl Checks for headers
+AC_HEADER_STDC
+AC_HEADER_MAJOR
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS(stdint.h fcntl.h locale.h stdint.h inttypes.h unistd.h)
+AC_CHECK_HEADERS(utime.h wchar.h wctype.h limits.h)
+AC_CHECK_HEADERS(sys/mman.h sys/stat.h sys/types.h sys/utime.h sys/time.h)
+AC_CHECK_HEADERS(zlib.h)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_OFF_T
+AC_TYPE_SIZE_T
+AC_CHECK_MEMBERS([struct stat.st_rdev])
+
+AC_STRUCT_TIMEZONE_DAYLIGHT
+AC_SYS_LARGEFILE
+AC_FUNC_FSEEKO
+AC_TYPE_MBSTATE_T
+
+AC_CHECK_TYPES([uint8_t, uint16_t, uint32_t, int32_t, uint64_t, int64_t])
+AC_CHECK_SIZEOF(long long)
+AH_BOTTOM([
+#ifndef HAVE_UINT8_T
+typedef unsigned char uint8_t;
+#endif
+#ifndef HAVE_UINT16_T
+typedef unsigned short uint16_t;
+#endif
+#ifndef HAVE_UINT32_T
+typedef unsigned int uint32_t;
+#endif
+#ifndef HAVE_INT32_T
+typedef int int32_t;
+#endif
+#ifndef HAVE_UINT64_T
+#if SIZEOF_LONG_LONG == 8
+typedef unsigned long long uint64_t;
+#else
+typedef unsigned long uint64_t;
+#endif
+#endif
+#ifndef HAVE_INT64_T
+#if SIZEOF_LONG_LONG == 8
+typedef long long int64_t;
+#else
+typedef long int64_t;
+#endif
+#endif
+])
+
+dnl Checks for functions
+AC_CHECK_FUNCS(mmap strerror strndup strtoul mbrtowc mkstemp utimes utime wcwidth strtof)
+
+dnl Provide implementation of some required functions if necessary
+AC_REPLACE_FUNCS(getopt_long asprintf vasprintf)
+
+dnl Checks for libraries
+AC_CHECK_LIB(z,gzopen)
+
+dnl See if we are cross-compiling
+AM_CONDITIONAL(IS_CROSS_COMPILE, test "$cross_compiling" = yes)
+
+AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile])
+AC_OUTPUT

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 7b4a1065f5e25a8aba99a7f3b05461a2d9d1e514..ce0f9be2510606759435afa92bd3bc6ab82c76f3 100644 (file)
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -1,11 +1,14 @@
 #define        FILE_VERSION_MAJOR      4
-#define        patchlevel              23
+#define        patchlevel              24
 
 /*
  * Patchlevel file for Ian Darwin's MAGIC command.
- * $File: patchlevel.h,v 1.66 2007/12/27 16:38:24 christos Exp $
+ * $File: patchlevel.h,v 1.67 2007/12/28 20:08:40 christos Exp $
  *
  * $Log: patchlevel.h,v $
+ * Revision 1.68  2008/03/22 21:39:43  christos
+ * file 4.24
+ *
  * Revision 1.67  2007/12/28 20:08:40  christos
  * welcome to 4.23.
  *