diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 150 |
1 files changed, 38 insertions, 112 deletions
@@ -400,9 +400,8 @@ fi PACKAGE=mkid -VERSION=3.0 -PATCH_LEVEL=7 -OLD_PATCH_LEVEL=`expr $PATCH_LEVEL - 1` +VERSION=3.0.8 +PREV_VERSION=3.0.7 cat >> confdefs.h <<EOF #define PACKAGE "$PACKAGE" EOF @@ -411,11 +410,6 @@ cat >> confdefs.h <<EOF #define VERSION "$VERSION" EOF -cat >> confdefs.h <<EOF -#define PATCH_LEVEL "$PATCH_LEVEL" -EOF - - @@ -453,7 +447,6 @@ test -n "$YACC" && break done test -n "$YACC" || YACC="yacc" - # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&4 @@ -643,38 +636,6 @@ else SET_MAKE="MAKE=${MAKE-make}" fi -for ac_prog in mawk gawk nawk awk -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&4 -if eval "test \"`echo '${'ac_cv_prog_AWK'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&4 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AWK="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -AWK="$ac_cv_prog_AWK" -if test -n "$AWK"; then - echo "$ac_t""$AWK" 1>&4 -else - echo "$ac_t""no" 1>&4 -fi - -test -n "$AWK" && break -done - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&4 @@ -692,7 +653,7 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 696 "configure" +#line 657 "configure" #include "confdefs.h" #include <assert.h> Syntax Error @@ -706,7 +667,7 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 710 "configure" +#line 671 "configure" #include "confdefs.h" #include <assert.h> Syntax Error @@ -738,7 +699,7 @@ else ac_cv_cross=yes else cat > conftest.$ac_ext <<EOF -#line 742 "configure" +#line 703 "configure" #include "confdefs.h" main(){return(0);} EOF @@ -759,7 +720,7 @@ if eval "test \"`echo '${'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 763 "configure" +#line 724 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -781,7 +742,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 785 "configure" +#line 746 "configure" #include "confdefs.h" #include <string.h> EOF @@ -799,7 +760,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 803 "configure" +#line 764 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -820,7 +781,7 @@ if test "$cross_compiling" = yes; then ac_cv_header_stdc=no else cat > conftest.$ac_ext <<EOF -#line 824 "configure" +#line 785 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -854,7 +815,7 @@ if eval "test \"`echo '${'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 858 "configure" +#line 819 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -897,7 +858,7 @@ if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 901 "configure" +#line 862 "configure" #include "confdefs.h" #include <$ac_hdr> EOF @@ -933,7 +894,7 @@ if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 937 "configure" +#line 898 "configure" #include "confdefs.h" #include <$ac_hdr> EOF @@ -969,7 +930,7 @@ if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 973 "configure" +#line 934 "configure" #include "confdefs.h" #include <$ac_hdr> EOF @@ -1003,7 +964,7 @@ if eval "test \"`echo '${'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1007 "configure" +#line 968 "configure" #include "confdefs.h" int main() { return 0; } @@ -1088,7 +1049,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xa -Xc do CFLAGS="$ac_save_CFLAGS $ac_arg" cat > conftest.$ac_ext <<EOF -#line 1092 "configure" +#line 1053 "configure" #include "confdefs.h" #if !defined(__STDC__) || __STDC__ != 1 choke me @@ -1137,7 +1098,7 @@ if eval "test \"`echo '${'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1141 "configure" +#line 1102 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -1171,7 +1132,7 @@ if eval "test \"`echo '${'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1175 "configure" +#line 1136 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1202,7 +1163,7 @@ if eval "test \"`echo '${'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1206 "configure" +#line 1167 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1228,38 +1189,6 @@ EOF fi -echo $ac_n "checking size of long""... $ac_c" 1>&4 -if eval "test \"`echo '${'ac_cv_sizeof_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&4 -else - 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 <<EOF -#line 1240 "configure" -#include "confdefs.h" -#include <stdio.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(long)); - exit(0); -} -EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_sizeof_long=`cat conftestval` -fi -fi -rm -fr conftest* -fi -echo "$ac_t""$ac_cv_sizeof_long" 1>&4 -cat >> confdefs.h <<EOF -#define SIZEOF_LONG $ac_cv_sizeof_long -EOF - - CFLAGS=${CFLAGS--g} LDFLAGS=${LDFLAGS--g} @@ -1273,7 +1202,7 @@ if eval "test \"`echo '${'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 1277 "configure" +#line 1206 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -1291,7 +1220,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 1295 "configure" +#line 1224 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -1318,7 +1247,7 @@ if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1322 "configure" +#line 1251 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1367,7 +1296,7 @@ if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1371 "configure" +#line 1300 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1416,7 +1345,7 @@ if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1420 "configure" +#line 1349 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1465,7 +1394,7 @@ if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1469 "configure" +#line 1398 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1514,7 +1443,7 @@ if eval "test \"`echo '${'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1518 "configure" +#line 1447 "configure" #include "confdefs.h" #include <alloca.h> int main() { return 0; } @@ -1545,7 +1474,7 @@ if eval "test \"`echo '${'ac_cv_func_alloca'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1549 "configure" +#line 1478 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -1603,7 +1532,7 @@ if eval "test \"`echo '${'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1607 "configure" +#line 1536 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -1630,7 +1559,7 @@ if eval "test \"`echo '${'ac_cv_func__getb67'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1634 "configure" +#line 1563 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1673,7 +1602,7 @@ if eval "test \"`echo '${'ac_cv_func_GETB67'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1677 "configure" +#line 1606 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1716,7 +1645,7 @@ if eval "test \"`echo '${'ac_cv_func_getb67'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1720 "configure" +#line 1649 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1770,7 +1699,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 1774 "configure" +#line 1703 "configure" #include "confdefs.h" find_stack_direction () { @@ -1816,15 +1745,15 @@ if test "$ac_cv_func_strerror" = no; then STRERROR="strerror.o"; fi if test "x$prefix" != xNONE; then - libdir=$prefix/lib + datadir=$prefix/share else - libdir=$ac_default_prefix/lib + datadir=$ac_default_prefix/share fi -IID_HELP_FILE=$libdir/iid.help +IID_HELP_FILE=$datadir/iid.help cat >> confdefs.h <<EOF -#define IID_HELP_FILE "$libdir/iid.help" +#define IID_HELP_FILE "$datadir/iid.help" EOF @@ -1934,15 +1863,13 @@ s%@prefix@%$prefix%g s%@program_transform_name@%$program_transform_name%g s%@PACKAGE@%$PACKAGE%g s%@VERSION@%$VERSION%g -s%@PATCH_LEVEL@%$PATCH_LEVEL%g -s%@OLD_PATCH_LEVEL@%$OLD_PATCH_LEVEL%g +s%@PREV_VERSION@%$PREV_VERSION%g s%@YACC@%$YACC%g s%@CC@%$CC%g s%@LN_S@%$LN_S%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@SET_MAKE@%$SET_MAKE%g -s%@AWK@%$AWK%g s%@CPP@%$CPP%g s%@U@%$U%g s%@ANSI2KNR@%$ANSI2KNR%g @@ -1951,7 +1878,7 @@ s%@REGEXP@%$REGEXP%g s%@GETOPT@%$GETOPT%g s%@STRCASECMP@%$STRCASECMP%g s%@STRERROR@%$STRERROR%g -s%@libdir@%$libdir%g +s%@datadir@%$datadir%g s%@IID_HELP_FILE@%$IID_HELP_FILE%g s%@DEPEND@%$DEPEND%g /@DEPEND_FILE@/r $DEPEND_FILE @@ -2114,11 +2041,10 @@ cat >> $CONFIG_STATUS <<\EOF fi; done - +test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h exit 0 EOF chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS -date >stamp-h |