From 5e902b72a0bfc918a51767f689d0f8e2a29ea45f Mon Sep 17 00:00:00 2001 From: Christos Zoulas Date: Tue, 25 Feb 2003 15:30:34 +0000 Subject: [PATCH] Autoconf changes. --- Makefile.in | 175 ++++++++++++++++++++++++++++++++++++++++++++++--- aclocal.m4 | 14 ++-- config.h.in | 3 + configure | 92 ++++++++++++++++++-------- configure.in | 1 + src/acconfig.h | 3 + 6 files changed, 244 insertions(+), 44 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8dd783a6..e46d84cb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -73,20 +73,177 @@ data_DATA = magic magic.mime magic.mgc magic.mime.mgc MAGIC = @datadir@/magic CPPFLAGS = -DMAGIC='"$(MAGIC)"' -@FSECT5_TRUE@man_MAGIC = magic.5 -@FSECT5_FALSE@man_MAGIC = magic.4 +@FSECT5_TRUE@man_MAGIC = @FSECT5_TRUE@magic.5 +@FSECT5_FALSE@man_MAGIC = @FSECT5_FALSE@magic.4 fsect = @fsect@ man_MANS = file.1 $(man_MAGIC) -file_SOURCES = file.c apprentice.c fsmagic.c softmagic.c ascmagic.c compress.c is_tar.c readelf.c print.c file.h names.h patchlevel.h readelf.h tar.h +file_SOURCES = file.c apprentice.c fsmagic.c softmagic.c ascmagic.c \ + compress.c is_tar.c readelf.c print.c \ + file.h names.h patchlevel.h readelf.h tar.h -EXTRA_DIST = LEGAL.NOTICE MAINT PORTING Makefile.std magic2mime Localstuff Header $(magic_FRAGMENTS) file.man magic.man +EXTRA_DIST = LEGAL.NOTICE MAINT PORTING Makefile.std magic2mime \ + Localstuff Header $(magic_FRAGMENTS) file.man magic.man CLEANFILES = $(man_MANS) magic magic.mgc magic.mime.mgc -magic_FRAGMENTS = Magdir/acorn Magdir/adi Magdir/adventure Magdir/allegro Magdir/alliant Magdir/alpha Magdir/amanda Magdir/amigaos Magdir/animation Magdir/apl Magdir/apple Magdir/applix Magdir/archive Magdir/asterix Magdir/att3b Magdir/audio Magdir/blender Magdir/blit Magdir/bsdi Magdir/c-lang Magdir/cddb Magdir/chi Magdir/cisco Magdir/citrus Magdir/claris Magdir/clipper Magdir/commands Magdir/compress Magdir/console Magdir/convex Magdir/ctags Magdir/cvs Magdir/database Magdir/diamond Magdir/diff Magdir/digital Magdir/dolby Magdir/dump Magdir/dyadic Magdir/editors Magdir/elf Magdir/encore Magdir/epoc Magdir/filesystems Magdir/flash Magdir/fonts Magdir/frame Magdir/freebsd Magdir/fsav Magdir/gimp Magdir/gnu Magdir/grace Magdir/gringotts Magdir/hitachi-sh Magdir/hp Magdir/ibm370 Magdir/ibm6000 Magdir/iff Magdir/images Magdir/intel Magdir/interleaf Magdir/island Magdir/ispell Magdir/java Magdir/jpeg Magdir/karma Magdir/lecter Magdir/lex Magdir/lif Magdir/linux Magdir/lisp Magdir/mach Magdir/macintosh Magdir/magic Magdir/mail.news Magdir/maple Magdir/mathematica Magdir/mcrypt Magdir/mime Magdir/mips Magdir/mirage Magdir/mkid Magdir/mmdf Magdir/mlssa Magdir/modem Magdir/motorola Magdir/msdos Magdir/msvc Magdir/natinst Magdir/ncr Magdir/netbsd Magdir/netscape Magdir/news Magdir/nitpicker Magdir/octave Magdir/olf Magdir/os2 Magdir/os9 Magdir/osf1 Magdir/palm Magdir/parix Magdir/pbm Magdir/pdf Magdir/pdp Magdir/perl Magdir/pgp Magdir/pkgadd Magdir/plus5 Magdir/printer Magdir/project Magdir/psdbms Magdir/pulsar Magdir/pyramid Magdir/python Magdir/riff Magdir/rpm Magdir/rtf Magdir/sc Magdir/sccs Magdir/sendmail Magdir/sequent Magdir/sgml Magdir/sharc Magdir/sketch Magdir/smalltalk Magdir/sniffer Magdir/softquad Magdir/spectrum Magdir/sun Magdir/sysex Magdir/teapot Magdir/terminfo Magdir/tex Magdir/tgif Magdir/ti-8x Magdir/timezone Magdir/troff Magdir/tuxedo Magdir/typeset Magdir/unknown Magdir/uuencode Magdir/varied.out Magdir/vax Magdir/vicar Magdir/visx Magdir/vms Magdir/vmware Magdir/vorbis Magdir/vxl Magdir/wordperfect Magdir/xdelta Magdir/xenix Magdir/zilog Magdir/zyxel +magic_FRAGMENTS = \ +Magdir/acorn \ +Magdir/adi \ +Magdir/adventure \ +Magdir/allegro \ +Magdir/alliant \ +Magdir/alpha \ +Magdir/amanda \ +Magdir/amigaos \ +Magdir/animation \ +Magdir/apl \ +Magdir/apple \ +Magdir/applix \ +Magdir/archive \ +Magdir/asterix \ +Magdir/att3b \ +Magdir/audio \ +Magdir/blender \ +Magdir/blit \ +Magdir/bsdi \ +Magdir/c-lang \ +Magdir/cddb \ +Magdir/chi \ +Magdir/cisco \ +Magdir/citrus \ +Magdir/claris \ +Magdir/clipper \ +Magdir/commands \ +Magdir/compress \ +Magdir/console \ +Magdir/convex \ +Magdir/ctags \ +Magdir/cvs \ +Magdir/database \ +Magdir/diamond \ +Magdir/diff \ +Magdir/digital \ +Magdir/dolby \ +Magdir/dump \ +Magdir/dyadic \ +Magdir/editors \ +Magdir/elf \ +Magdir/encore \ +Magdir/epoc \ +Magdir/filesystems \ +Magdir/flash \ +Magdir/fonts \ +Magdir/frame \ +Magdir/freebsd \ +Magdir/fsav \ +Magdir/gimp \ +Magdir/gnu \ +Magdir/grace \ +Magdir/gringotts \ +Magdir/hitachi-sh \ +Magdir/hp \ +Magdir/ibm370 \ +Magdir/ibm6000 \ +Magdir/iff \ +Magdir/images \ +Magdir/intel \ +Magdir/interleaf \ +Magdir/island \ +Magdir/ispell \ +Magdir/java \ +Magdir/jpeg \ +Magdir/karma \ +Magdir/lecter \ +Magdir/lex \ +Magdir/lif \ +Magdir/linux \ +Magdir/lisp \ +Magdir/mach \ +Magdir/macintosh \ +Magdir/magic \ +Magdir/mail.news \ +Magdir/maple \ +Magdir/mathematica \ +Magdir/mcrypt \ +Magdir/mime \ +Magdir/mips \ +Magdir/mirage \ +Magdir/mkid \ +Magdir/mmdf \ +Magdir/mlssa \ +Magdir/modem \ +Magdir/motorola \ +Magdir/msdos \ +Magdir/msvc \ +Magdir/natinst \ +Magdir/ncr \ +Magdir/netbsd \ +Magdir/netscape \ +Magdir/news \ +Magdir/nitpicker \ +Magdir/octave \ +Magdir/olf \ +Magdir/os2 \ +Magdir/os9 \ +Magdir/osf1 \ +Magdir/palm \ +Magdir/parix \ +Magdir/pbm \ +Magdir/pdf \ +Magdir/pdp \ +Magdir/perl \ +Magdir/pgp \ +Magdir/pkgadd \ +Magdir/plus5 \ +Magdir/printer \ +Magdir/project \ +Magdir/psdbms \ +Magdir/pulsar \ +Magdir/pyramid \ +Magdir/python \ +Magdir/riff \ +Magdir/rpm \ +Magdir/rtf \ +Magdir/sc \ +Magdir/sccs \ +Magdir/sendmail \ +Magdir/sequent \ +Magdir/sgml \ +Magdir/sharc \ +Magdir/sketch \ +Magdir/smalltalk \ +Magdir/sniffer \ +Magdir/softquad \ +Magdir/spectrum \ +Magdir/sun \ +Magdir/sysex \ +Magdir/teapot \ +Magdir/terminfo \ +Magdir/tex \ +Magdir/tgif \ +Magdir/ti-8x \ +Magdir/timezone \ +Magdir/troff \ +Magdir/tuxedo \ +Magdir/typeset \ +Magdir/unknown \ +Magdir/uuencode \ +Magdir/varied.out \ +Magdir/vax \ +Magdir/vicar \ +Magdir/visx \ +Magdir/vms \ +Magdir/vmware \ +Magdir/vorbis \ +Magdir/vxl \ +Magdir/wordperfect \ +Magdir/xdelta \ +Magdir/xenix \ +Magdir/zilog \ +Magdir/zyxel ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -122,7 +279,7 @@ missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best SOURCES = $(file_SOURCES) OBJECTS = $(file_OBJECTS) @@ -416,7 +573,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/aclocal.m4 b/aclocal.m4 index c8873bca..8c892019 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +dnl aclocal.m4 generated automatically by aclocal 1.4-p5 -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -274,7 +274,7 @@ AC_DEFUN([AC_FUNC_FSEEKO], dnl Usage: dnl AM_INIT_AUTOMAKE(package,version, [no-define]) -AC_DEFUN(AM_INIT_AUTOMAKE, +AC_DEFUN([AM_INIT_AUTOMAKE], [AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) @@ -302,7 +302,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])]) # Check to make sure that the build environment is sane. # -AC_DEFUN(AM_SANITY_CHECK, +AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 @@ -343,7 +343,7 @@ AC_MSG_RESULT(yes)]) dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. -AC_DEFUN(AM_MISSING_PROG, +AC_DEFUN([AM_MISSING_PROG], [AC_MSG_CHECKING(for working $2) # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. @@ -359,7 +359,7 @@ AC_SUBST($1)]) # Like AC_CONFIG_HEADER, but automatically create stamp file. -AC_DEFUN(AM_CONFIG_HEADER, +AC_DEFUN([AM_CONFIG_HEADER], [AC_PREREQ([2.12]) AC_CONFIG_HEADER([$1]) dnl When config.status generates a header, we must update the stamp-h file. @@ -382,7 +382,7 @@ changequote([,]))]) # Define a conditional. -AC_DEFUN(AM_CONDITIONAL, +AC_DEFUN([AM_CONDITIONAL], [AC_SUBST($1_TRUE) AC_SUBST($1_FALSE) if $2; then diff --git a/config.h.in b/config.h.in index 36e61edc..d00ad536 100644 --- a/config.h.in +++ b/config.h.in @@ -55,6 +55,9 @@ standard headers don't define. */ #undef uint64_t +/* Define to `int' if standard headers don't define. */ +#undef int32_t + /* The number of bytes in a uint8_t. */ #define SIZEOF_UINT8_T 0 diff --git a/configure b/configure index e4c04f19..f0b6b8d8 100755 --- a/configure +++ b/configure @@ -699,7 +699,7 @@ fi PACKAGE=file -VERSION=3.40 +VERSION=3.39 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1628,7 +1628,7 @@ else fi done -for ac_hdr in unistd.h +for ac_hdr in stdint.h inttypes.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -1668,7 +1668,7 @@ else fi done -for ac_hdr in getopt.h +for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -1708,7 +1708,7 @@ else fi done -for ac_hdr in locale.h +for ac_hdr in getopt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -1748,7 +1748,7 @@ else fi done -for ac_hdr in stdint.h +for ac_hdr in locale.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -2462,8 +2462,44 @@ EOF fi +echo $ac_n "checking for int32_t""... $ac_c" 1>&6 +echo "configure:2467: checking for int32_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#endif +#include +#if STDC_HEADERS +#include +#include +#endif +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_type_int32_t=yes +else + rm -rf conftest* + ac_cv_type_int32_t=no +fi +rm -f conftest* + +fi +echo "$ac_t""$ac_cv_type_int32_t" 1>&6 +if test $ac_cv_type_int32_t = no; then + cat >> confdefs.h <<\EOF +#define int32_t int +EOF + +fi + echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:2467: checking for long long" >&5 +echo "configure:2503: checking for long long" >&5 if eval "test \"`echo '$''{'ac_cv_c_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2474,13 +2510,13 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_long_long=yes else @@ -2509,12 +2545,12 @@ else long64='unsigned long'; fi echo $ac_n "checking for uint64_t""... $ac_c" 1>&6 -echo "configure:2513: checking for uint64_t" >&5 +echo "configure:2549: checking for uint64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2548,7 +2584,7 @@ fi echo $ac_n "checking size of uint8_t""... $ac_c" 1>&6 -echo "configure:2552: checking size of uint8_t" >&5 +echo "configure:2588: checking size of uint8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2556,7 +2592,7 @@ else ac_cv_sizeof_uint8_t=0 else cat > conftest.$ac_ext < @@ -2575,7 +2611,7 @@ main() exit(0); } EOF -if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint8_t=`cat conftestval` else @@ -2596,7 +2632,7 @@ EOF echo $ac_n "checking size of uint16_t""... $ac_c" 1>&6 -echo "configure:2600: checking size of uint16_t" >&5 +echo "configure:2636: checking size of uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2604,7 +2640,7 @@ else ac_cv_sizeof_uint16_t=0 else cat > conftest.$ac_ext < @@ -2623,7 +2659,7 @@ main() exit(0); } EOF -if { (eval echo configure:2627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint16_t=`cat conftestval` else @@ -2644,7 +2680,7 @@ EOF echo $ac_n "checking size of uint32_t""... $ac_c" 1>&6 -echo "configure:2648: checking size of uint32_t" >&5 +echo "configure:2684: checking size of uint32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2652,7 +2688,7 @@ else ac_cv_sizeof_uint32_t=0 else cat > conftest.$ac_ext < @@ -2671,7 +2707,7 @@ main() exit(0); } EOF -if { (eval echo configure:2675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint32_t=`cat conftestval` else @@ -2692,7 +2728,7 @@ EOF echo $ac_n "checking size of uint64_t""... $ac_c" 1>&6 -echo "configure:2696: checking size of uint64_t" >&5 +echo "configure:2732: checking size of uint64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2700,7 +2736,7 @@ else ac_cv_sizeof_uint64_t=0 else cat > conftest.$ac_ext < @@ -2719,7 +2755,7 @@ main() exit(0); } EOF -if { (eval echo configure:2723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint64_t=`cat conftestval` else @@ -2743,12 +2779,12 @@ EOF for ac_func in mmap strerror strtoul mkstemp getopt_long do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2747: checking for $ac_func" >&5 +echo "configure:2783: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2797,7 +2833,7 @@ done echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6 -echo "configure:2801: checking for gzopen in -lz" >&5 +echo "configure:2837: checking for gzopen in -lz" >&5 ac_lib_var=`echo z'_'gzopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2805,7 +2841,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/configure.in b/configure.in index ac460e92..4abe3dca 100644 --- a/configure.in +++ b/configure.in @@ -76,6 +76,7 @@ AC_SYS_LARGEFILE AC_CHECK_TYPE_STDC(uint8_t, unsigned char) AC_CHECK_TYPE_STDC(uint16_t, unsigned short) AC_CHECK_TYPE_STDC(uint32_t, unsigned int) +AC_CHECK_TYPE_STDC(int32_t, int) AC_C_LONG_LONG if test $ac_cv_c_long_long = yes; then long64='unsigned long long'; diff --git a/src/acconfig.h b/src/acconfig.h index 78181910..e6293daf 100644 --- a/src/acconfig.h +++ b/src/acconfig.h @@ -41,6 +41,9 @@ 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. */ -- 2.40.0