Changeset 3159 for trunk/essentials/sys-devel/autoconf-2.13/acspecific.m4

Timestamp:

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

Author:

bird

Message:

Applied OS/2 patches.

File:

• trunk/essentials/sys-devel/autoconf-2.13/acspecific.m4 (modified) (13 diffs)

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.