* ltmain.in: Fix typo introduced in dllsearchpath backport.

<cwrappersource>: Undo line breaks in macro arguments.
Reported by Charles Wilson <cygwin@cwilson.fastmail.fm>.

diff --git a/ChangeLog b/ChangeLog
index dca95f6d657b332dc7b6e1dd11017a6163cb712b..fa2575a8e1b6cd6efe051ab6272faf14f77c68af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-28  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * ltmain.in: Fix typo introduced in dllsearchpath backport.
+       <cwrappersource>: Undo line breaks in macro arguments.
+       Reported by Charles Wilson <cygwin@cwilson.fastmail.fm>.
+
 2005-11-26  Peter O'Gorman  <peter@pogma.com>
 
        * ltmain.in (link mode): Add missing $LTCFLAGS for a $LTCC. 

diff --git a/ltmain.in b/ltmain.in
index 4929a7ce6d68ac7fe1967132dd80fa453abd9afa..63ecec623f9fc9c38ab5f90279c06e15a8756dc3 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -4303,7 +4303,7 @@ EOF
        fi
        case $host in
        *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-         testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+         testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
          case :$dllsearchpath: in
          *":$libdir:"*) ;;
          *) dllsearchpath="$dllsearchpath:$libdir";;
@@ -4941,8 +4941,7 @@ check_executable(const char * path)
 {
   struct stat st;
 
-  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"
-);
+  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
   if ((!path) || (!*path))
     return 0;
 
@@ -4975,8 +4974,7 @@ find_executable (const char* wrapper)
   int tmp_len;
   char* concat_name;
 
-  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") :
- "NULL!");
+  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
 
   if ((wrapper == NULL) || (*wrapper == '\0'))
     return NULL;