summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure108
1 files changed, 72 insertions, 36 deletions
diff --git a/configure b/configure
index 8d11898..2a357ea 100755
--- a/configure
+++ b/configure
@@ -401,7 +401,7 @@ fi
PACKAGE=mkid
VERSION=3.0
-PATCH_LEVEL=6
+PATCH_LEVEL=7
OLD_PATCH_LEVEL=`expr $PATCH_LEVEL - 1`
cat >> confdefs.h <<EOF
#define PACKAGE "$PACKAGE"
@@ -506,8 +506,8 @@ if test $ac_cv_prog_gcc = yes; then
if eval "test \"`echo '${'ac_cv_prog_gcc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&4
else
- echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1 |grep -v warning:`"; then
+ echo 'void f(void); void f(void){}' > conftest.c
+if test -z "`${CC-cc} -g -O -c conftest.c 2>&1`"; then
ac_cv_prog_gcc_g=yes
else
ac_cv_prog_gcc_g=no
@@ -643,6 +643,38 @@ 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
@@ -660,7 +692,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 664 "configure"
+#line 696 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
@@ -674,7 +706,7 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 678 "configure"
+#line 710 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
@@ -706,7 +738,7 @@ else
ac_cv_cross=yes
else
cat > conftest.$ac_ext <<EOF
-#line 710 "configure"
+#line 742 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
@@ -727,7 +759,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 731 "configure"
+#line 763 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -749,7 +781,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 753 "configure"
+#line 785 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -767,7 +799,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 771 "configure"
+#line 803 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -788,7 +820,7 @@ if test "$cross_compiling" = yes; then
ac_cv_header_stdc=no
else
cat > conftest.$ac_ext <<EOF
-#line 792 "configure"
+#line 824 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -822,7 +854,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 826 "configure"
+#line 858 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -865,7 +897,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 869 "configure"
+#line 901 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
@@ -901,7 +933,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 905 "configure"
+#line 937 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
@@ -929,7 +961,7 @@ else
fi
done
-for ac_hdr in sys/ioctl.h termios.h termio.h sgttyb.h regex.h
+for ac_hdr in sys/ioctl.h termios.h termio.h sgtty.h regex.h
do
ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
@@ -937,7 +969,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 941 "configure"
+#line 973 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
@@ -971,7 +1003,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 975 "configure"
+#line 1007 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -1056,7 +1088,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 1060 "configure"
+#line 1092 "configure"
#include "confdefs.h"
#if !defined(__STDC__) || __STDC__ != 1
choke me
@@ -1105,7 +1137,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 1109 "configure"
+#line 1141 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -1139,7 +1171,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 1143 "configure"
+#line 1175 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1170,7 +1202,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 1174 "configure"
+#line 1206 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1204,7 +1236,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1208 "configure"
+#line 1240 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1241,7 +1273,7 @@ if eval "test \"`echo '${'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 1245 "configure"
+#line 1277 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -1259,7 +1291,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 1263 "configure"
+#line 1295 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -1279,14 +1311,14 @@ fi
fi
fi
-for ac_func in getwd getcwd getopt_long
+for ac_func in getwd getcwd getopt_long basename dirname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
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 1290 "configure"
+#line 1322 "configure"
#include "confdefs.h"
#include <ctype.h> /* Arbitrary system header to define __stub macros. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -1335,7 +1367,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 1339 "configure"
+#line 1371 "configure"
#include "confdefs.h"
#include <ctype.h> /* Arbitrary system header to define __stub macros. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -1384,7 +1416,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 1388 "configure"
+#line 1420 "configure"
#include "confdefs.h"
#include <ctype.h> /* Arbitrary system header to define __stub macros. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -1433,7 +1465,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 1437 "configure"
+#line 1469 "configure"
#include "confdefs.h"
#include <ctype.h> /* Arbitrary system header to define __stub macros. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -1482,7 +1514,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 1486 "configure"
+#line 1518 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() { return 0; }
@@ -1513,7 +1545,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 1517 "configure"
+#line 1549 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -1571,7 +1603,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 1575 "configure"
+#line 1607 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -1598,7 +1630,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 1602 "configure"
+#line 1634 "configure"
#include "confdefs.h"
#include <ctype.h> /* Arbitrary system header to define __stub macros. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -1641,7 +1673,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 1645 "configure"
+#line 1677 "configure"
#include "confdefs.h"
#include <ctype.h> /* Arbitrary system header to define __stub macros. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -1684,7 +1716,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 1688 "configure"
+#line 1720 "configure"
#include "confdefs.h"
#include <ctype.h> /* Arbitrary system header to define __stub macros. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -1738,7 +1770,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 1742 "configure"
+#line 1774 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -1796,7 +1828,10 @@ cat >> confdefs.h <<EOF
EOF
-DEPEND=${srcdir:-.}/depend.out
+case x$srcdir in
+x) DEPEND=depend.out;;
+*) DEPEND=$srcdir/depend.out;;
+esac
DEPEND_FILE=$DEPEND
@@ -1907,6 +1942,7 @@ 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-25 19:46:49 +0000