Commit eb916ad8fa14f554825ba7c1ddae62bf710060bd
1 parent
8c0818a8
Put back setting of LD_LIBRARY_PATH for non Darwin configurations
Showing
1 changed file
with
16 additions
and
0 deletions
src/ctools-setup.in
| @@ -140,6 +140,22 @@ varlist="$varlist PYTHONPATH PKG_CONFIG_PATH MANPATH" | @@ -140,6 +140,22 @@ varlist="$varlist PYTHONPATH PKG_CONFIG_PATH MANPATH" | ||
| 140 | varlist="$varlist PFILES PFCLOBBER CALDB" | 140 | varlist="$varlist PFILES PFCLOBBER CALDB" |
| 141 | 141 | ||
| 142 | # | 142 | # |
| 143 | +# Set LD_LIBRARY_PATH | ||
| 144 | +# =================== | ||
| 145 | +case $uname_system in | ||
| 146 | + Darwin*) | ||
| 147 | + ;; | ||
| 148 | + *) | ||
| 149 | + if [ -z "${LD_LIBRARY_PATH}" ]; then | ||
| 150 | + LD_LIBRARY_PATH=$ctools_lib | ||
| 151 | + else | ||
| 152 | + LD_LIBRARY_PATH=$ctools_lib:$LD_LIBRARY_PATH | ||
| 153 | + fi | ||
| 154 | + varlist="$varlist LD_LIBRARY_PATH" | ||
| 155 | + ;; | ||
| 156 | +esac | ||
| 157 | + | ||
| 158 | +# | ||
| 143 | # Save values in output initialization shell scripts | 159 | # Save values in output initialization shell scripts |
| 144 | # ================================================== | 160 | # ================================================== |
| 145 | # Name of temporary config script | 161 | # Name of temporary config script |