diff options
Diffstat (limited to 'PATCHES-AC')
-rw-r--r-- | PATCHES-AC | 225 |
1 files changed, 225 insertions, 0 deletions
diff --git a/PATCHES-AC b/PATCHES-AC new file mode 100644 index 00000000..b97cfd0d --- /dev/null +++ b/PATCHES-AC @@ -0,0 +1,225 @@ +-------------------------------------------------------------------- +> François Pinard mailto:pinard@iro.umontreal.ca +> I have a collection of DOS-abling patches for Autoconf which came from +> Eli, I think, and which you may fetch from: +> +> http://www.iro.umontreal.ca/contrib/paxutils/dist/PATCHES-AC +> +> if I'm not mistaken. There are a few other mods not related to DOS ports. +-------------------------------------------------------------------- +> On Sun, 22 Nov 1998, Tim Rice(tim@trr.metro.net wrote: +> Here is a patch for Autoconf version 2.12 to address a couple of +> issues on SVR4.2 machines. +> +> It was failing the test for opendir() because opendir() is in libc +> not in libdir. The patch now checks libc first then libdir. +> +> It was failing on gethostbyname(). I added a third test for gethostbynane() +> in libsocket. +> +-------------------------------------------------------------------- +1998-12-01 + * acgeneral.m4: added support for DJGPP, 'test -f' changed + for 'test $ac_x'. Support for DOS DRIVE:xx\xx path '/*)' + changed for '/*|[A-z]:/*)' + + * acspecific.m4: check opendir in libc before -ldir + gethosbyname/connect check in -lsocket also + +diff -ru autoconf-2.12.orig/acgeneral.m4 autoconf-2.12/acgeneral.m4 +--- autoconf-2.12.orig/acgeneral.m4 Tue Nov 26 13:09:42 1996 ++++ autoconf-2.12/acgeneral.m4 Tue Dec 1 19:44:17 1998 +@@ -635,6 +635,9 @@ + esac + done + ++# Support of DJGPP port of bash. ++if test -n "$COMSPEC$ComSpec"; then ac_x=-x; else ac_x=-f; fi ++ + # NLS nuisances. + # Only set these to C if already set. These must not be set unconditionally + # because not all systems understand e.g. LANG=C (notably SCO). +@@ -1063,7 +1066,7 @@ + # and sets the high bit in the cache file unless we assign to the vars. + changequote(, )dnl + (set) 2>&1 | +- case `(ac_space=' '; set) 2>&1` in ++ case `(ac_space=' '; set) 2>&1 | grep ac_space` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). +@@ -1179,7 +1182,7 @@ + + dnl AC_MSG_WARN(PROBLEM-DESCRIPTION) + define(AC_MSG_WARN, +-[echo "configure: warning: $1" 1>&2]) ++[echo "configure: WARNING: $1" 1>&2]) + + dnl AC_MSG_ERROR(ERROR-DESCRIPTION) + define(AC_MSG_ERROR, +@@ -1259,7 +1262,7 @@ + + dnl AC_OBSOLETE(THIS-MACRO-NAME [, SUGGESTION]) + define(AC_OBSOLETE, +-[errprint(__file__:__line__: warning: [$1] is obsolete[$2] ++[errprint(__file__:__line__: WARNING: [$1] is obsolete[$2] + )]) + + +@@ -1284,7 +1287,7 @@ + dnl not every word. This closes a longstanding sh security hole. + for ac_dir in ifelse([$5], , $PATH, [$5$ac_dummy]); do + test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then ++ if test $ac_x $ac_dir/$ac_word; then + ifelse([$6], , , dnl + [ if test "[$ac_dir/$ac_word]" = "$6"; then + ac_prog_rejected=yes +@@ -1338,7 +1341,9 @@ + AC_MSG_CHECKING([for $ac_word]) + AC_CACHE_VAL(ac_cv_path_$1, + [case "[$]$1" in +- /*) ++changequote(, )dnl ++ /*|[A-z]:/*) ++changequote([, ])dnl + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) +@@ -1348,7 +1353,7 @@ + dnl not every word. This closes a longstanding sh security hole. + for ac_dir in ifelse([$4], , $PATH, [$4$ac_dummy]); do + test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then ++ if test $ac_x $ac_dir/$ac_word; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi +@@ -1686,7 +1691,7 @@ + AC_DEFUN(AC_TRY_RUN, + [if test "$cross_compiling" = yes; then + ifelse([$4], , +- [errprint(__file__:__line__: warning: [AC_TRY_RUN] called without default to allow cross compiling ++ [errprint(__file__:__line__: WARNING: [AC_TRY_RUN] called without default to allow cross compiling + )dnl + AC_MSG_ERROR(can not run test program while cross compiling)], + [$4]) +@@ -2109,7 +2114,10 @@ + .) 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" ;; ++changequote(, )dnl ++ /*|[A-z]:/*) ++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" ;; +@@ -2118,7 +2126,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 +@@ -2325,7 +2333,7 @@ + + case "$srcdir" in + changequote(, )dnl +- [/$]*) ac_rel_source="$srcdir/$ac_source" ;; ++ [/$]*|[A-z]:/*) ac_rel_source="$srcdir/$ac_source" ;; + changequote([, ])dnl + *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;; + esac +@@ -2400,7 +2408,9 @@ + case "$srcdir" in + .) # No --srcdir option. We are building in place. + ac_sub_srcdir=$srcdir ;; +- /*) # Absolute path. ++changequote(, )dnl ++ /*|[A-z]:/*) # Absolute path. ++changequote([, ])dnl + ac_sub_srcdir=$srcdir/$ac_config_dir ;; + *) # Relative path. + ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; +@@ -2421,14 +2431,16 @@ + + # Make the cache file name correct relative to the subdirectory. + case "$cache_file" in +- /*) ac_sub_cache_file=$cache_file ;; ++changequote(, )dnl ++ /*|[A-z]:/*) ac_sub_cache_file=$cache_file ;; ++changequote([, ])dnl + *) # 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 -ru autoconf-2.12.orig/acspecific.m4 autoconf-2.12/acspecific.m4 +--- autoconf-2.12.orig/acspecific.m4 Wed Nov 20 00:10:49 1996 ++++ autoconf-2.12/acspecific.m4 Tue Dec 1 19:55:00 1998 +@@ -444,15 +444,21 @@ + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + for ac_prog in ginstall installbsd scoinst install; do +- if test -f $ac_dir/$ac_prog; then ++ if test $ac_x $ac_dir/$ac_prog; then + if test $ac_prog = install && + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + # OSF/1 installbsd also uses dspmsg, but is usable. + : + else +- ac_cv_path_install="$ac_dir/$ac_prog -c" +- break 2 ++ if test $ac_prog = installbsd && ++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then ++ # AIX installbsd doesn't work without option "-g". ++ : ++ else ++ ac_cv_path_install="$ac_dir/$ac_prog -c" ++ break 2 ++ fi + fi + fi + done +@@ -592,7 +598,10 @@ + [ac_header_dirent=$ac_hdr; break]) + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then +-AC_CHECK_LIB(dir, opendir, LIBS="$LIBS -ldir") ++AC_CHECK_FUNC(opendir) ++if test $ac_cv_func_opendir = no; then ++ AC_CHECK_LIB(dir, opendir, LIBS="$LIBS -ldir") ++fi + else + AC_CHECK_LIB(x, opendir, LIBS="$LIBS -lx") + fi +@@ -2089,6 +2098,9 @@ + AC_CHECK_FUNC(gethostbyname) + if test $ac_cv_func_gethostbyname = no; then + AC_CHECK_LIB(nsl, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl") ++ if test $ac_cv_func_gethostbyname = no; then ++ AC_CHECK_LIB(socket, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lsocket -lnsl", , -lnsl) ++ fi + fi + + # lieder@skyler.mavd.honeywell.com says without -lsocket, +@@ -2100,7 +2112,7 @@ + # We assume that if connect needs -lnsl, so does gethostbyname. + AC_CHECK_FUNC(connect) + if test $ac_cv_func_connect = no; then +- AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", , ++ AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket -lnsl $X_EXTRA_LIBS", , + $X_EXTRA_LIBS) + fi + |