r14557 - gnucash/branches/2.0 - Re-use existing GUILE_LOAD_PATH variable in order not to override existing search paths.

Derek Atkins warlord at cvs.gnucash.org
Tue Jul 25 18:22:32 EDT 2006


Author: warlord
Date: 2006-07-25 18:22:31 -0400 (Tue, 25 Jul 2006)
New Revision: 14557
Trac: http://svn.gnucash.org/trac/changeset/14557

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/configure.in
Log:
Re-use existing GUILE_LOAD_PATH variable in order not to override existing search paths.

Merge r14540 from trunk.



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:12876
   + d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:12926

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2006-07-25 20:34:57 UTC (rev 14556)
+++ gnucash/branches/2.0/ChangeLog	2006-07-25 22:22:31 UTC (rev 14557)
@@ -10,6 +10,12 @@
 	doubts the fiscal correctness of this account chart for small
 	businesses.
 
+2006-07-18  Christian Stimming <stimming at tuhh.de>
+
+	* configure.in:
+	  Re-use existing GUILE_LOAD_PATH variable in order not to override
+	  existing search paths.
+
 2006-07-16  Derek Atkins  <derek at ihtfp.com>
 
 	* configure.in:

Modified: gnucash/branches/2.0/configure.in
===================================================================
--- gnucash/branches/2.0/configure.in	2006-07-25 20:34:57 UTC (rev 14556)
+++ gnucash/branches/2.0/configure.in	2006-07-25 22:22:31 UTC (rev 14557)
@@ -314,8 +314,8 @@
 AS_SCRUB_INCLUDE(CFLAGS)
 
 AC_MSG_CHECKING([for (g-wrap) guile module])
-if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
-  GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
+if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
+  GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
         ${GUILE} -c "(use-modules (g-wrap))" > /dev/null 2>&1
 then
   AC_MSG_RESULT(yes)
@@ -330,8 +330,8 @@
 fi
 
 AC_MSG_CHECKING([for (g-wrap gw-glib-spec) guile module])
-if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
-  GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
+if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
+  GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
         ${GUILE} -c "(use-modules (g-wrap gw-glib-spec))" > /dev/null 2>&1
 then
   AC_MSG_RESULT(yes)
@@ -346,16 +346,16 @@
 fi
 
 AC_MSG_CHECKING([for (g-wrap gw-standard) guile module])
-if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
-  GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
+if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
+  GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
         ${GUILE} -c "(use-modules (g-wrap gw-standard))" > /dev/null 2>&1
 then
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
   AC_MSG_CHECKING([for (g-wrap gw standard) guile module])
-  if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
-    GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
+  if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
+    GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
         ${GUILE} -c "(use-modules (g-wrap gw standard))" > /dev/null 2>&1
   then
     AC_MSG_RESULT(yes)



More information about the gnucash-changes mailing list