OSSP CVS Repository

ossp - Check-in [1706]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 1706
Date: 2002-Jan-30 14:06:09 (local)
2002-Jan-30 13:06:09 (UTC)
User:rse
Branch:
Comment: better support uninstalled source trees
Tickets:
Inspections:
Files:
ossp-pkg/pth/aclocal.m4      1.93 -> 1.94     6 inserted, 2 deleted

ossp-pkg/pth/aclocal.m4 1.93 -> 1.94

--- aclocal.m4   2002/01/30 12:54:21     1.93
+++ aclocal.m4   2002/01/30 13:06:09     1.94
@@ -1196,7 +1196,7 @@
             found=0
             #   via config script
             for dir in $with_$2/bin $with_$2; do
-                if test -f "$dir/$2-config"; then
+                if test -f "$dir/$2-config" && test ! -f "$dir/$2-config.in"; then
                     $2_version=`($dir/$2-config --version) 2>/dev/null`
                     if test ".$$2_version" != .; then
                         CPPFLAGS="$CPPFLAGS `$dir/$2-config --cflags`"
@@ -1218,7 +1218,11 @@
                     fi
                 done
                 for dir in $with_$2/lib/$2 $with_$2/lib $with_$2; do
-                    if test -f "$dir/lib$2.a" -o -f "$dir/lib$2.so"; then
+                    if test -f "$dir/lib$2.la" && test -d "$dir/.libs"; then
+                        LDFLAGS="$LDFLAGS -L$dir -L$dir/.libs"
+                        found=1
+                        break
+                    elif test -f "$dir/lib$2.a" -o -f "$dir/lib$2.so"; then
                         LDFLAGS="$LDFLAGS -L$dir"
                         found=1
                         break

CVSTrac 2.0.1