SF.net SVN: openvrml:[4011] trunk

[<br...@us...>]

Revision: 4011
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4011&view=rev
Author:   braden
Date:     2009-10-24 06:54:03 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Clean up legacy cruft in handling of GRE_PATH.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-22 22:04:00 UTC (rev 4010)
+++ trunk/ChangeLog	2009-10-24 06:54:03 UTC (rev 4011)
@@ -1,3 +1,7 @@
+2009-10-24 Braden McDaniel  <br...@en...>
+
+	* configure.ac: Clean up legacy cruft in handling of GRE_PATH.
+
 2009-10-22 Braden McDaniel  <br...@en...>
 
 	Set development version to 0.18.99.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-22 22:04:00 UTC (rev 4010)
+++ trunk/configure.ac	2009-10-24 06:54:03 UTC (rev 4011)
@@ -23,7 +23,7 @@
                 [openvrml.pc])
 
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([1.10.1 foreign subdir-objects check-news tar-pax])
+AM_INIT_AUTOMAKE([1.10.1 gnits subdir-objects check-news tar-pax])
 AM_CONFIG_HEADER([config.h])
 
 #
@@ -497,15 +497,15 @@
 # Determine whether to apply the -rpath for the Gecko runtime libraries.
 #
 AS_IF([test "X$enable_gecko_rpath" = Xyes],
-[AS_IF([test -z "$GRE_PATH"],
+[AS_IF([test $GRE_PATH],
        [GRE_PATH=`echo $JS_LIBS | sed -e 's/^-L\([[^ ]]*\).*/\1/'`
         AS_IF([test "X$GRE_PATH" = "X$JS_LIBS"],
               [GRE_PATH=""
-               AC_MSG_ERROR([GRE_PATH could not be derived from JS_LIBS.  Set GRE_PATH if executables linking with libopenvrml should be built with an -rpath for the Gecko runtime libraries.])])])
+               AC_MSG_ERROR([GRE_PATH could not be derived from JS_LIBS.  Set GRE_PATH if an -rpath is needed to locate the Gecko runtime libraries at runtime.])])])
 AS_IF([test -n "${openvrml_js_run_path}" -a -n "${GRE_PATH}"],
       [openvrml_js_run_path=":${openvrml_js_run_path}"])
 openvrml_js_run_path="${GRE_PATH}${openvrml_js_run_path}"
-OPENVRML_JAVASCRIPT_RPATH="-Wl,-rpath -Wl,${openvrml_js_run_path}"
+OPENVRML_JAVASCRIPT_RPATH="-Wl,-rpath -Wl,${GRE_PATH}"
 ])
 AC_SUBST([OPENVRML_JAVASCRIPT_RPATH])
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.