Changeset 3159

Timestamp:

Apr 22, 2007, 2:29:09 AM (18 years ago)

Author:

bird

Message:

Applied OS/2 patches.

Location:

trunk/essentials/sys-devel/autoconf-2.13

Files:

• acgeneral.m4 (modified) (21 diffs)
• acspecific.m4 (modified) (13 diffs)
• autoconf.sh (modified) (4 diffs)
• autoheader.sh (modified) (2 diffs)
• autoreconf.sh (modified) (3 diffs)
• autoupdate.sh (modified) (1 diff)
• ifnames.sh (modified) (1 diff)

trunk/essentials/sys-devel/autoconf-2.13/acgeneral.m4

@@ -588 +588 @@
 AC_INIT_PARSE_ARGS
 AC_INIT_PREPARE($1)dnl
+AC_PATHIFS
+AC_DIVERT_POP()dnl to NORMAL
+AC_DIVERT_PUSH(AC_DIVERSION_NORMAL_4)dnl
+AC_EXEEXT
 AC_DIVERT_POP()dnl to NORMAL
 ])
@@ -1322 +1326 @@
   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_IFS"
 ifelse([$6], , , [  ac_prog_rejected=no
 ])dnl
@@ -1328 +1332 @@
 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.
-  ac_dummy="ifelse([$5], , $PATH, [$5])"
+  ac_dummy="ifelse([$5], , $PATH, AC_FORMAT_PATH([$5]))"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
+    if test -f $ac_dir/$ac_word -o \
+            -f $ac_dir/$ac_word$ac_exeext ; then
 ifelse([$6], , , dnl
-[      if test "[$ac_dir/$ac_word]" = "$6"; then
+[      if test "[$ac_dir/$ac_word]" = "$6" -o \
+               "[$ac_dir/$ac_word$ac_exeext]" = "$6" ; then
         ac_prog_rejected=yes
         continue
@@ -1359 +1365 @@
     # Default is a loser.
     AC_MSG_ERROR([$1=$6 unacceptable, but no other $4 found in dnl
-ifelse([$5], , [\$]PATH, [$5])])
+ifelse([$5], , [\$]PATH, AC_FORMAT_PATH([$5]))])
 ])dnl
   fi
@@ -1385 +1391 @@
 AC_CACHE_VAL(ac_cv_path_$1,
 [case "[$]$1" in
-  /*)
+changequote(, )dnl
+  [/\\]* | [a-zA-Z]:*)
+changequote([, ])dnl
   ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
   ;;
@@ -1392 +1400 @@
   ;;
   *)
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="$PATH_IFS"
 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.
-  ac_dummy="ifelse([$4], , $PATH, [$4])"
+  ac_dummy="ifelse([$4], , $PATH, AC_FORMAT_PATH([$4]))"
   for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_$1="$ac_dir/$ac_word"
+      break
+    fi
+    if test -f $ac_dir/$ac_word$ac_exeext; then
+      ac_cv_path_$1="$ac_dir/$ac_word$ac_exeext"
       break
     fi
@@ -1660 +1672 @@
 [AC_REQUIRE_CPP()dnl
 cat > conftest.$ac_ext <<EOF
+#include <sys/types.h>
 [#]line __oline__ "configure"
 #include "confdefs.h"
@@ -2096 +2109 @@
 # Run this file to recreate the current configuration.
 # This directory was configured as follows,
+EOF
+echo ': ${CONFIG_SHELL='"${CONFIG_SHELL-sh.exe}"'}' >> $CONFIG_STATUS
+cat >> $CONFIG_STATUS <<EOF
 dnl hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 dnl so uname gets run too.
@@ -2126 +2142 @@
 ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL"
 ])dnl
+PATHIFS="$PATH_IFS"
 
 changequote(<<, >>)dnl
@@ -2173 +2190 @@
 changequote([, ])dnl
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012\015' '  '`
 rm -f conftest.defs
 ])
@@ -2192 +2209 @@
 $ac_vpsub
 dnl Shell code in configure.in might set extrasub.
+dnl bird - May 1 2003 3:07pm:
+dnl     This replacement isn't safe. '/bin/sh' might be just a part of a path.
+dnl     The best example is on non-unix platforms where it might be a part of
+dnl     an already localized shell reference. Consider g:/unixroot/bin/sh.exe.
+dnl     It will cause two problems if CONFIG_SHELL is used. Both double .exe
+dnl     and a double path.
+dnl     So, in short, don't do this replacement if there not separate shell
+dnl     word. However, my skills as a SED scripter is limited so this fix is
+dnl     not the right one, but it solves my problems.
+dnl     old script: [s,/bin/sh,${CONFIG_SHELL-/bin/sh},g]
 $extrasub
+[s,\([^a-zA-Z0-9:]\)/bin/sh\(.exe\),\1${CONFIG_SHELL-/bin/sh}\2,g]
 dnl Insert the sed substitutions of variables.
 undivert(AC_DIVERSION_SED)
@@ -2268 +2296 @@
       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-zA-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"
@@ -2277 +2308 @@
 [  case "$ac_given_INSTALL" in
 changequote(, )dnl
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;;
 changequote([, ])dnl
   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
@@ -2292 +2323 @@
   esac
 
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%$PATHIFS% $ac_given_srcdir/%g"`
   sed -e "$ac_comsub
 s%@configure_input@%$configure_input%g
@@ -2360 +2391 @@
 
   rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+# kso the other way around might work better with drive letters and such.
+#  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%" `
   cat $ac_file_inputs > conftest.in
 
@@ -2484 +2517 @@
   case "$srcdir" in
 changequote(, )dnl
-  [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
+  [/$\\]* | [A-Za-z]:*) ac_rel_source="$srcdir/$ac_source" ;;
 changequote([, ])dnl
   *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
@@ -2491 +2524 @@
   # Make a symlink if possible; otherwise try a hard link.
   if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
-    ln $srcdir/$ac_source $ac_dest; then :
+    ln $srcdir/$ac_source $ac_dest 2>/dev/null ||
+    cp $srcdir/$ac_source $ac_dest; then :
   else
     AC_MSG_ERROR(can not link $ac_dest to $srcdir/$ac_source)
@@ -2559 +2593 @@
     .) # No --srcdir option.  We are building in place.
       ac_sub_srcdir=$srcdir ;;
-    /*) # Absolute path.
+changequote(, )dnl
+    [/\\]* | [a-zA-Z]:*) # Absolute path.
+changequote([, ])dnl
       ac_sub_srcdir=$srcdir/$ac_config_dir ;;
     *) # Relative path.
@@ -2569 +2605 @@
       ac_sub_configure=$ac_sub_srcdir/configure
     elif test -f $ac_sub_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
+      ac_current_dir=`pwd`
+      cd $ac_sub_srcdir
+      autoconf
+      cd $ac_current_dir
+      ac_sub_configure=$ac_sub_srcdir/configure
     else
       AC_MSG_WARN(no configuration information is in $ac_config_dir)
@@ -2580 +2620 @@
       # Make the cache file name correct relative to the subdirectory.
       case "$cache_file" in
-      /*) ac_sub_cache_file=$cache_file ;;
+changequote(, )dnl
+      [/\\]* | [a-zA-Z]:*) ac_sub_cache_file=$cache_file ;;
+changequote([, ])dnl
       *) # Relative path.
         ac_sub_cache_file="$ac_dots$cache_file" ;;
@@ -2587 +2629 @@
       [  case "$ac_given_INSTALL" in
 changequote(, )dnl
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+        [/$\\]* | [A-Za-z]:*) INSTALL="$ac_given_INSTALL" ;;
 changequote([, ])dnl
         *) INSTALL="$ac_dots$ac_given_INSTALL" ;;

trunk/essentials/sys-devel/autoconf-2.13/acspecific.m4

@@ -606 +606 @@
 if test -z "$INSTALL"; then
 AC_CACHE_VAL(ac_cv_path_install,
-[  IFS="${IFS=  }"; ac_save_IFS="$IFS"; IFS=":"
+[  IFS="${IFS=  }"; ac_save_IFS="$IFS"; IFS="$PATH_IFS"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
     case "$ac_dir/" in
     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    # We reject the install program from OS/2 or W3.1
+    */OS2|*/OS2/*|*/WINDOWS|*/WINDOWS/*) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -616 +618 @@
       # by default.
       for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
+        if test -f $ac_dir/$ac_prog$ac_exeext; then
           if test $ac_prog = install &&
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
@@ -622 +624 @@
             :
           else
-            ac_cv_path_install="$ac_dir/$ac_prog -c"
+            ac_cv_path_install="$ac_dir/$ac_prog$ac_exeext -c"
             break 2
           fi
@@ -667 +669 @@
   ac_cv_prog_LN_S="ln -s"
 else
-  ac_cv_prog_LN_S=ln
-fi])dnl
+  echo A > conftestdata;
+  if ln conftestdata conftestdata2 2>/dev/null; then
+    ac_cv_prog_LN_S=ln
+  else
+    ac_cv_prog_LN_S=cp
+  fi
+fi
+rm -f conftestdata*])dnl
 LN_S="$ac_cv_prog_LN_S"
 if test "$ac_cv_prog_LN_S" = "ln -s"; then
@@ -2181 +2189 @@
       arg=`echo $arg | sed -e 's%^P,%%'`
       SAVE_IFS=$IFS
-      IFS=:
+      IFS="$PATH_IFS"
       list=
       for elt in $arg; do
@@ -2350 +2358 @@
   cat > Imakefile <<'EOF'
 acfindx:
-        @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+        @sh -c 'echo \'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${DESTDIR}${USRLIBDIR}"; ac_im_libdir="${DESTDIR}${LIBDIR}"\''
 EOF
   if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
@@ -2357 +2365 @@
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
     for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-        test -f $ac_im_libdir/libX11.$ac_extension; then
+      if test ! -f $ac_im_usrlibdir/${ac_cv_libpre}X11.$ac_extension &&
+        test -f $ac_im_libdir/${ac_cv_libpre}X11.$ac_extension; then
         ac_im_usrlibdir=$ac_im_libdir; break
       fi
@@ -2491 +2499 @@
 dnl Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
+    if test -r $ac_dir/${ac_cv_libpre}${x_direct_test_library}.$ac_extension; then
       ac_x_libraries=$ac_dir
       break 2
@@ -2511 +2519 @@
     X_CFLAGS="$X_CFLAGS -I$x_includes"
   fi
+  test -n "$x_includes" && CPPFLAGS="$CPPFLAGS -I$x_includes"
 
   # It would also be nice to do this for all -L options, not just this one.
@@ -2591 +2600 @@
       AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")
     fi
+    # XFree86/OS2
+    if test $ac_cv_func_shmat = no; then
+      AC_CHECK_LIB(shm, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lshm")
+    fi
   fi
 
@@ -2642 +2655 @@
 test "$ac_cv_mingw32" = yes && MINGW32=yes])
 
+dnl Check for EMX/OS2.  This is another way to set the right value for
+dnl EXEEXT.
+AC_DEFUN(AC_EMXOS2,
+[AC_CACHE_CHECK(for EMX/OS2 environment, ac_cv_emxos2,
+[: ${CC=gcc.exe}
+AC_TRY_COMPILE(,[return __EMX__;],
+ac_cv_emxos2=yes, ac_cv_emxos2=no)
+rm -f conftest*])
+AC_CACHE_VAL(ac_cv_libpre,
+if test "$ac_cv_emxos2" = yes ; then
+  ac_cv_libpre=
+else
+  ac_cv_libpre=lib
+fi
+)
+EMXOS2=
+test "$ac_cv_emxos2" = yes && EMXOS2=yes])
+
 dnl Check for the extension used for executables.  This knows that we
 dnl add .exe for Cygwin or mingw32.  Otherwise, it compiles a test
@@ -2649 +2680 @@
 [AC_REQUIRE([AC_CYGWIN])
 AC_REQUIRE([AC_MINGW32])
+AC_REQUIRE([AC_EMXOS2])
 AC_MSG_CHECKING([for executable suffix])
 AC_CACHE_VAL(ac_cv_exeext,
-[if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+[if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then
   ac_cv_exeext=.exe
 else
@@ -2678 +2710 @@
 
 
+dnl set PATH_IFS
+AC_DEFUN(AC_PATHIFS,
+[AC_MSG_CHECKING([for path separator])
+# Filter path to get backslahes into forwardslashes
+case "`uname -s 2> /dev/null`" in
+OS/2)
+  PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'`
+  PATH_IFS=';'
+  ;;
+*)
+  PATH_IFS=':'
+  ;;
+esac
+AC_MSG_RESULT(${PATH_IFS})
+AC_SUBST(PATH_IFS)])
+
+dnl Reformat a explicit path, so that it only shows '/'
+dnl Care is needed: it cannot be used in a '...' expression.
+define([AC_FORMAT_PATH],[`echo -E "$1" | sed 's+\\\\+/+g'`])
+
+
 dnl ### Checks for UNIX variants
 dnl These are kludges which should be replaced by a single POSIX check.

trunk/essentials/sys-devel/autoconf-2.13/autoconf.sh

@@ -36 +36 @@
 if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
-: ${AC_MACRODIR=@datadir@}
+if test -z "${AC_MACRODIR}"; then
+    if test -d "${UNIXROOT}@datadir@"; then
+        AC_MACRODIR=${UNIXROOT}@datadir@
+    else
+        AC_MACRODIR=@datadir@
+    fi        
+fi
 : ${M4=@M4@}
 : ${AWK=@AWK@}
 case "${M4}" in
-/*) # Handle the case that m4 has moved since we were configured.
+[/\\]*|[a-zA-Z]:*) # Handle the case that m4 has moved since we were configured.
     # It may have been found originally in a build directory.
     test -f "${M4}" || M4=m4 ;;
@@ -122 +128 @@
 esac
 
-$M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
+$M4 -I$AC_MACRODIR -DAC_MACRODIR=$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
   { rm -f $tmpin $tmpout; exit 2; }
 
@@ -142 +148 @@
 
 if test $# -eq 0; then
-  exec 4> configure; chmod +x configure
+  exec 4> configure; chmod +x configure 2> /dev/null
 else
   exec 4>&1
@@ -153 +159 @@
 ' $tmpout | sed '
 /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
-' >&4
+' | sed 's/IFS="${IFS}:"/IFS="${PATH_IFS}"/' >&4
 
 rm -f $tmpout

trunk/essentials/sys-devel/autoconf-2.13/autoheader.sh

@@ -38 +38 @@
 if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
-test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@
+if test -z "${AC_MACRODIR}"; then
+    if test -d "${UNIXROOT}@datadir@"; then
+        AC_MACRODIR=${UNIXROOT}@datadir@
+    else
+        AC_MACRODIR=@datadir@
+    fi
+fi
 test -z "${M4}" && M4=@M4@
 case "${M4}" in
-/*) # Handle the case that m4 has moved since we were configured.
+[/\\]*|[a-zA-Z]:*) # Handle the case that m4 has moved since we were configured.
     # It may have been found originally in a build directory.
     test -f "${M4}" || M4=m4 ;;
@@ -266 +272 @@
 
 if test $# -eq 0; then
+  # bird: OS/2 hack here for missing link counting.
+  exec 2>&1
   if test $status -eq 0; then
     if test -f ${config_h_in} && cmp -s $tmpout ${config_h_in}; then
       rm -f $tmpout # File didn't change, so don't update its mod time.
     else
-      mv -f $tmpout ${config_h_in}
+      # bird: Do a copy just to be on the safe side.
+      cp -f $tmpout ${config_h_in}
+      rm -f $tmpout
     fi
   else

trunk/essentials/sys-devel/autoconf-2.13/autoreconf.sh

@@ -30 +30 @@
 automake_deps=
 
-test -z "$AC_MACRODIR" && AC_MACRODIR=@datadir@
+if test -z "${AC_MACRODIR}"; then
+    if test -d "${UNIXROOT}@datadir@"; then
+        AC_MACRODIR=${UNIXROOT}@datadir@
+    else
+        AC_MACRODIR=@datadir@
+    fi        
+fi
 
 while test $# -gt 0; do
@@ -100 +106 @@
 
   case "$0" in
-  /*)  autoconf=$top_autoconf; autoheader=$top_autoheader ;;
-  */*) autoconf=$dots$top_autoconf; autoheader=$dots$top_autoheader ;;
+  [/\\]*|[a-zA-Z]:*)  autoconf=$top_autoconf; autoheader=$top_autoheader ;;
+  *[/\\]*) autoconf=$dots$top_autoconf; autoheader=$dots$top_autoheader ;;
   *)   autoconf=$top_autoconf; autoheader=$top_autoheader ;;
   esac
 
   case "$AC_MACRODIR" in
-  /*)  macrodir_opt="--macrodir=$AC_MACRODIR" ;;
+  [/\\]*|[a-zA-Z]:*)  macrodir_opt="--macrodir=$AC_MACRODIR" ;;
   *)   macrodir_opt="--macrodir=$dots$AC_MACRODIR" ;;
   esac
@@ -113 +119 @@
   "")  localdir_opt=
        aclocal=aclocal.m4 ;;
-  /*)  localdir_opt="--localdir=$localdir"
+  [/\\]*|[a-zA-Z]:*)  localdir_opt="--localdir=$localdir"
        aclocal=$localdir/aclocal.m4 ;;
   *)   localdir_opt="--localdir=$dots$localdir"

trunk/essentials/sys-devel/autoconf-2.13/autoupdate.sh

@@ -31 +31 @@
 #sedtmp=/tmp/acups
 show_version=no
-test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@
+if test -z "${AC_MACRODIR}"; then
+    if test -d "${UNIXROOT}@datadir@"; then
+        AC_MACRODIR=${UNIXROOT}@datadir@
+    else
+        AC_MACRODIR=@datadir@
+    fi        
+fi
 
 while test $# -gt 0 ; do

trunk/essentials/sys-devel/autoconf-2.13/ifnames.sh

@@ -28 +28 @@
 show_version=no
 
-: ${AC_MACRODIR=@datadir@}
+# OS/2 additions 
+if test -z "${AC_MACRODIR}"; then
+    if test -d "${UNIXROOT}@datadir@"; then
+        AC_MACRODIR=${UNIXROOT}@datadir@
+    else
+        AC_MACRODIR=@datadir@
+    fi        
+fi
 
 while test $# -gt 0; do