From: Albert Cheng <acheng@ncsa.uiuc.edu>
Date: Tue, 28 Sep 1999 08:37:46 +0000 (+0000)
Subject: * ltmain.in (shlibpath_var): ensure the variable is non-empty before
X-Git-Tag: release-1-3-4~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9740c8dd4d69fc0a0d828bf2020c573c945ae4c0;p=thirdparty%2Flibtool.git

* ltmain.in (shlibpath_var): ensure the variable is non-empty before
exporting it.
---

diff --git a/ChangeLog b/ChangeLog
index 99e1f98fa..b71f8accd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-28  Albert Cheng  <acheng@ncsa.uiuc.edu>
+
+	* ltmain.in (shlibpath_var): ensure the variable is non-empty before
+	exporting it.
+
 1999-09-22  Gary V. Vaughan  <gary@oranda.demon.co.uk>
  
 	* ltconfig.in (whole-archive-flag-spec): test whether the
diff --git a/ltmain.in b/ltmain.in
index b617956ed..75e698c46 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -3677,8 +3677,10 @@ libdir='$install_libdir'\
     done
 
     if test -z "$run"; then
-      # Export the shlibpath_var.
-      eval "export $shlibpath_var"
+      if test -n "$shlibpath_var"; then
+        # Export the shlibpath_var.
+        eval "export $shlibpath_var"
+      fi
 
       # Restore saved enviroment variables
       if test "${save_LC_ALL+set}" = set; then
@@ -3694,9 +3696,11 @@ libdir='$install_libdir'\
       $echo "$modename: cannot exec \$cmd$args"
       exit 1
     else
-      # Display what would be done.
-      eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-      $echo "export $shlibpath_var"
+      if test -n "$shlibpath_var"; then
+        # Display what would be done.
+        eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+        $echo "export $shlibpath_var"
+      fi
       $echo "$cmd$args"
       exit 0
     fi