[Groonga-commit] groonga/groonga [master] Add sys_lib_search_path_spec for system library paths

Back to archive index

null+****@clear***** null+****@clear*****
2012年 7月 19日 (木) 11:27:57 JST


Kouhei Sutou	2012-07-19 11:27:57 +0900 (Thu, 19 Jul 2012)

  New Revision: 4d93a77e535a24f18e1c391855d768c0b4ba476b
  https://github.com/groonga/groonga/commit/4d93a77e535a24f18e1c391855d768c0b4ba476b

  Log:
    Add sys_lib_search_path_spec for system library paths

  Modified files:
    vendor/nginx/configure

  Modified: vendor/nginx/configure (+7 -12)
===================================================================
--- vendor/nginx/configure    2012-07-19 10:23:43 +0900 (9c46782)
+++ vendor/nginx/configure    2012-07-19 11:27:57 +0900 (ffa2b60)
@@ -7,22 +7,17 @@ nginx_version=1.2.1
 export GROONGA_HTTPD_IN_TREE=yes
 . "../../groonga-httpd-conf.sh"
 
+eval "`../../libtool --config | grep sys_lib_search_path_spec=`"
 eval "`../../libtool --config | grep sys_lib_dlsearch_path_spec=`"
-found_libdir_in_dlsearch_path="no"
-for dlsearch_path in $sys_lib_dlsearch_path_spec; do
-  if [ "$dlsearch_path" = "$libdir" ]; then
-    found_libdir_in_dlsearch_path="yes"
+found_libdir_in_search_path="no"
+for search_path in $sys_lib_search_path_spec $sys_lib_dlsearch_path_spec; do
+  if [ "$search_path" = "$libdir" ]; then
+    found_libdir_in_search_path="yes"
     break
   fi
 done
-if [ "$found_libdir_in_dlsearch_path" = "no" ]; then
-  case "$libdir" in
-    /usr/lib|/usr/lib64)
-      ;;
-    *)
-      export GROONGA_HTTPD_RPATH="${libdir}"
-      ;;
-  esac
+if [ "$found_libdir_in_search_path" = "no" ]; then
+  export GROONGA_HTTPD_RPATH="${libdir}"
 fi
 
 source_directory="`dirname \"$0\"`"
-------------- next part --------------
HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...
Download 



Groonga-commit メーリングリストの案内
Back to archive index