Message-Id: Date: Fri, 26 Mar 99 15:52:45 MET From: Michel de Ruiter To: "Mark E." cc: djgpp-workers AT delorie DOT com Subject: Autoconf Reply-To: djgpp-workers AT delorie DOT com Dear sir, I understand you did the last port of autoconf to DJGPP, and made some changes to be able to server DJGPP better. During the years I used the older version of autoconf myself, I also changed a couple of things (mostly the same as you did), and thought I should share them with you. Do whatever you want with it, or just throw it away. A diff between your version (from simtel) and mine follows. Oh, [\/] might have to be [\\/], I'm not familiar enough with `case'. Hope this helps, (but think it doesn't), Michel. diff -u old/acgenera.m4 acgenera.m4 --- old/acgenera.m4 Thu Jan 14 13:53:14 1999 +++ acgenera.m4 Thu Mar 18 14:04:28 1999 @@ -154,7 +154,11 @@ # Defaults: ac_help= -ac_default_prefix=/usr/local +if test -n "$DJDIR"; then + ac_default_prefix='${DJDIR}' +else + ac_default_prefix=/usr/local +fi [#] Any additions from configure.in:]) dnl AC_PREFIX_DEFAULT(PREFIX) @@ -1321,7 +1325,7 @@ [if test -n "[$]$1"; then ac_cv_prog_$1="[$]$1" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_SEPARATOR-:}" ifelse([$6], , , [ ac_prog_rejected=no ])dnl dnl $ac_dummy forces splitting on constant user-supplied paths. @@ -1331,7 +1335,6 @@ ac_test_flag="-f" if ! test -z "$COMSPEC$ComSpec"; then ac_test_flag="-x" - IFS=";" fi for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. @@ -1392,11 +1395,13 @@ /*) ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ;; - ?:/*) +changequote(, )dnl + [A-z]:[\/]*) +changequote([, ])dnl ac_cv_path_$1="[$]$1" # Let the user override the test with a dos path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_SEPARATOR-:}" dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. @@ -1404,8 +1409,7 @@ ac_test_flag="-f" if ! test -z "$COMSPEC$ComSpec"; then ac_test_flag="-x" - IFS=";" - fi; + fi for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test $ac_test_flag $ac_dir/$ac_word; then @@ -2277,7 +2281,14 @@ .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + /*) + srcdir="$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_given_srcdir" ;; +changequote(, )dnl + [A-z]:[\/]*) # Absolute dos path +changequote([, ])dnl + srcdir="$ac_given_srcdir$ac_dir_suffix"; + top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; @@ -2286,7 +2297,7 @@ ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ case "$ac_given_INSTALL" in changequote(, )dnl - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/$]* | [A-z]:[\/]*) INSTALL="$ac_given_INSTALL" ;; changequote([, ])dnl *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac @@ -2570,6 +2581,10 @@ ac_sub_srcdir=$srcdir ;; /*) # Absolute path. ac_sub_srcdir=$srcdir/$ac_config_dir ;; +changequote(, )dnl + [A-z]:[\/]*) # Absolute dos path. +changequote([, ])dnl + ac_sub_srcdir=$srcdir/$ac_config_dir ;; *) # Relative path. ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; esac @@ -2590,13 +2605,17 @@ # Make the cache file name correct relative to the subdirectory. case "$cache_file" in /*) ac_sub_cache_file=$cache_file ;; +changequote(, )dnl + [A-z]:[\/]*) # Absolute dos path +changequote([, ])dnl + ac_sub_cache_file=$cache_file ;; *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ case "$ac_given_INSTALL" in changequote(, )dnl - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/$]* | [A-z]:[\/]*) INSTALL="$ac_given_INSTALL" ;; changequote([, ])dnl *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac diff -u old/acspecif.m4 acspecif.m4 --- old/acspecif.m4 Thu Jan 14 13:53:14 1999 +++ acspecif.m4 Thu Mar 18 17:52:36 1999 @@ -605,12 +605,7 @@ AC_MSG_CHECKING(for a BSD compatible install) if test -z "$INSTALL"; then AC_CACHE_VAL(ac_cv_path_install, -[ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - ac_test_flag="-f" - if ! test -z "$COMSPEC$ComSpec"; then - ac_test_flag="-x" - IFS=";" - fi +[ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${PATH_SEPARATOR-:}" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in @@ -619,6 +614,11 @@ # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. + + ac_test_flag="-f" + if ! test -z "$COMSPEC$ComSpec"; then + ac_test_flag="-x" + fi for ac_prog in ginstall scoinst install; do if test $ac_test_flag $ac_dir/$ac_prog; then if test $ac_prog = install && @@ -665,10 +665,10 @@ AC_DEFUN(AC_PROG_LN_S, [AC_MSG_CHECKING(whether ln -s works) AC_CACHE_VAL(ac_cv_prog_LN_S, -[rm -f conftestdata -if ln -s X conftestdata 2>/dev/null +[rm -f conftest.data +if ln -s X conftest.data 2>/dev/null then - rm -f conftestdata + rm -f conftest.data ac_cv_prog_LN_S="ln -s" else ac_cv_prog_LN_S=ln @@ -1583,14 +1583,14 @@ AC_DEFUN(AC_FUNC_UTIME_NULL, [AC_CACHE_CHECK(whether utime accepts a null argument, ac_cv_func_utime_null, -[rm -f conftestdata; > conftestdata +[rm -f conftest.data; > conftest.data # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong. AC_TRY_RUN([#include #include main() { struct stat s, t; -exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0 -&& stat("conftestdata", &t) == 0 && t.st_mtime >= s.st_mtime +exit(!(stat ("conftest.data", &s) == 0 && utime("conftest.data", (long *)0) == 0 +&& stat("conftest.data", &t) == 0 && t.st_mtime >= s.st_mtime && t.st_mtime - s.st_mtime < 120)); }], ac_cv_func_utime_null=yes, ac_cv_func_utime_null=no, ac_cv_func_utime_null=no) diff -u /dev/null Makefile --- /dev/null Sun Mar 21 00:00:00 1999 +++ Makefile Wed Mar 18 10:51:24 1998 @@ -0,0 +1,7 @@ +all: autoconf.m4f autohead.m4f + +%.m4f: %.m4 + m4 $< -F $@ + +autoconf.m4f: acgeneral.m4 acspecific.m4 acoldnames.m4 +autohead.m4f: acgeneral.m4 acspecific.m4 acoldnames.m4