[gjs] Send LD_LIBRARY_PATH to the scanner, avoids a build error on Ubuntu Lucid



commit ed52398ca5bdd9dbb707a8c6b9f2ef9eb513b8dd
Author: Johan Dahlin <johan gnome org>
Date:   Thu Dec 2 20:56:41 2010 -0200

    Send LD_LIBRARY_PATH to the scanner, avoids a build error on Ubuntu Lucid

 Makefile-test.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/Makefile-test.am b/Makefile-test.am
index 1e05841..85eed13 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -77,7 +77,7 @@ libgimarshallingtests_la_LDFLAGS = -avoid-version $(GJS_LIBS)
 
 # g-i doesn't ship these as shared libraries anymore; we build them here
 Regress-1.0.gir: libregress.la Makefile
-	$(AM_V_GEN) g-ir-scanner --include=cairo-1.0 --include=Gio-2.0 \
+	$(AM_V_GEN) LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(FIREFOX_JS_LIBDIR)" g-ir-scanner --include=cairo-1.0 --include=Gio-2.0 \
 	--namespace=Regress --nsversion=1.0 \
 	--warn-all --warn-error \
 	--library=libregress.la \
@@ -90,7 +90,7 @@ Regress-1.0.typelib: Regress-1.0.gir Makefile
 CLEANFILES += Regress-1.0.gir Regress-1.0.typelib
 
 GIMarshallingTests-1.0.gir: libgimarshallingtests.la Makefile
-	$(AM_V_GEN) g-ir-scanner --include=Gio-2.0 \
+	$(AM_V_GEN) LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(FIREFOX_JS_LIBDIR)" g-ir-scanner --include=Gio-2.0 \
 	--namespace=GIMarshallingTests --nsversion=1.0 --symbol-prefix=gi_marshalling_tests \
 	--warn-all --warn-error \
 	--library=libgimarshallingtests.la \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]