From: Charles Wilson <cwilson@ece.gatech.edu>
Date: Tue, 22 Oct 2002 19:29:28 +0000 (+0000)
Subject: Apply Cygwin patches from Charles Wilson.
X-Git-Tag: release-1-5~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d0f9dce09e9aeda863162798b668b80b005518c;p=thirdparty%2Flibtool.git

Apply Cygwin patches from Charles Wilson.
---

diff --git a/ChangeLog b/ChangeLog
index 23686b359..4ea577739 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
-2002-10-15 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+2002-10-15  Charles Wilson  <cwilson@ece.gatech.edu>
+
+        * libtool.m4 (AC_LIBTOOL_SYS_MAX_CMD_LEN): avoid long delay on 
+         cygwin/Win9x when computing commandline length.
+        (AC_LIBTOOL_SYS_DYNAMIC_LINKER): fix postinstall_cmds when
+        sources are in a subdirectory
+        * ltdl.m4 (AC_LTDL_SYSSEARCHPATH): use $PATH_SEPARATOR, not
+        $ac_path_separator
+        * configure.ac: move depdemo-specific stuff.  You must configure
+        libtool before you can try './libtool --features'.
+        * mdemo-inst.test: set $PATH to include the directory in which
+        the modules are installed (on cygwin, DLL search path is the
+        $PATH)
+
+2002-10-15  Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
 
         * ltmain.in: MinGW works identically to Cygwin.
 
@@ -6,7 +20,7 @@
         *  Model MinGW configuration after Cygwin configuration.
            Some portions share implementation.
 
-2002-10-11 Elizabeth Barham <soggytrousers@yahoo.com>
+2002-10-11  Elizabeth Barham <soggytrousers@yahoo.com>
 
         * libtool.m4: Pattern MinGW library naming after that
         used by Cygwin except use 'lib' prefix rather than 'cyg'.
diff --git a/depdemo/configure.ac b/depdemo/configure.ac
index b9c11e0b3..d39f8cc0f 100644
--- a/depdemo/configure.ac
+++ b/depdemo/configure.ac
@@ -26,17 +26,6 @@ AC_INIT([depdemo], [0.1], [bug-libtool@gnu.org])
 AC_CONFIG_SRCDIR([main.c])
 
 
-## ------------------------------- ##
-## depdemo specific configuration. ##
-## ------------------------------- ##
-if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
-  STATIC=-static
-else
-  STATIC=
-fi
-AC_SUBST([STATIC])
-
-
 ## ------------------------ ##
 ## Automake Initialisation. ##
 ## ------------------------ ##
@@ -56,6 +45,15 @@ AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_SUBST([LIBTOOL_DEPS])
 
+## ------------------------------- ##
+## depdemo specific configuration. ##
+## ------------------------------- ##
+if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
+  STATIC=-static
+else
+  STATIC=
+fi
+AC_SUBST([STATIC])
 
 ## ---------------------------- ##
 ## C headers required by cdemo. ##
diff --git a/libtool.m4 b/libtool.m4
index a414a667d..9bb36bddb 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -620,11 +620,14 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=-1;
     ;;
 
-  
-  mingw*)
-    # On msys 1.0 and win98, the maximum length was something like
-    # 200,000 and took around 45 minutes to get there... ouch!
-    # libtool calculates a length of 8192 for NT-based systems (including XP)
+  cygwin* | mingw*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
@@ -1132,10 +1135,11 @@ cygwin* | mingw* | pw32*)
   yes,cygwin* | yes,mingw*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='dlpath=`$SHELL 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog .libs/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
diff --git a/ltdl.m4 b/ltdl.m4
index fe414194e..53f99e6c3 100644
--- a/ltdl.m4
+++ b/ltdl.m4
@@ -243,7 +243,7 @@ if test -n "$libltdl_cv_sys_search_path"; then
     if test -z "$sys_search_path"; then
       sys_search_path="$dir"
     else
-      sys_search_path="$sys_search_path$ac_path_separator$dir"
+      sys_search_path="$sys_search_path$PATH_SEPARATOR$dir"
     fi
   done
   AC_DEFINE_UNQUOTED(LTDL_SYSSEARCHPATH, "$sys_search_path",
diff --git a/tests/mdemo-inst.test b/tests/mdemo-inst.test
index d7f944d89..7c9ea38c7 100755
--- a/tests/mdemo-inst.test
+++ b/tests/mdemo-inst.test
@@ -24,6 +24,8 @@ echo "= Running $make install in ../mdemo"
 $make install || exit 1
 
 echo "= Executing installed programs"
+path_old=$PATH
+PATH=$prefix/lib:$PATH
 
 status=0
 if $prefix/bin/mdemo_static $prefix/lib/foo1.la $prefix/lib/libfoo2.la; then :
@@ -44,4 +46,5 @@ else
   status=1
 fi
 
+PATH=$path_old
 exit $status