[PPL-devel] [GIT] ppl/ppl(master): Prepend to old content of shared library path var, instead of overwriting.

[Abramo Bagnara]

Module: ppl/ppl
Branch: master
Commit: b74a88168b9467502abe2cf1ea3919291ebdc387
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b74a88168b9467502abe2cf1ea3919291ebdc387

Author: Abramo Bagnara <abramo.bagnara at gmail.com>
Date:   Thu Aug 11 12:49:13 2011 +0200

Prepend to old content of shared library path var, instead of overwriting.

---

 m4/ac_check_gmp.m4 |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/m4/ac_check_gmp.m4 b/m4/ac_check_gmp.m4
index ffe9eef..42db027 100644
--- a/m4/ac_check_gmp.m4
+++ b/m4/ac_check_gmp.m4
@@ -61,7 +61,7 @@ AC_ARG_WITH(gmp-build,
   || test -n "$with_gmp_include" || test -n "$with_gmp_lib"
   then
     gmp_include_options="-I$gmp_build_dir -I$gmp_build_dir/tune"
-    gmp_library_paths="$gmp_build_dir:$gmp_build_dir/.libs:$gmp_build_dir/tune"
+    gmp_library_paths="$gmp_build_dir$PATH_SEPARATOR$gmp_build_dir/.libs:$gmp_build_dir/tune"
     gmp_library_options="-L$gmp_build_dir -L$gmp_build_dir/.libs"
     gmp_library_options="$gmp_library_options -L$gmp_build_dir/tune"
   else
@@ -74,8 +74,8 @@ ac_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $gmp_include_options"
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $gmp_library_options"
-eval ac_save_shared_library_path_env_var="\$$shared_library_path_env_var"
-eval $shared_library_path_env_var=\"$gmp_library_paths\"
+eval ac_save_shared_library_path="\$$shared_library_path_env_var"
+eval $shared_library_path_env_var=\"$gmp_library_paths:$ac_save_shared_library_path\"
 export $shared_library_path_env_var
 
 AC_LANG_PUSH(C++)
@@ -217,7 +217,7 @@ AC_DEFINE_UNQUOTED(PPL_GMP_SUPPORTS_EXCEPTIONS, $value,
 fi
 
 AC_LANG_POP(C++)
-eval $shared_library_path_env_var=\"$ac_save_shared_library_path_env_var\"
+eval $shared_library_path_env_var=\"$ac_save_shared_library_path\"
 LIBS="$ac_save_LIBS"
 CPPFLAGS="$ac_save_CPPFLAGS"
 ])