SF.net SVN: openvrml:[4032] trunk

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

Revision: 4032
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4032&view=rev
Author:   braden
Date:     2009-10-31 09:46:21 +0000 (Sat, 31 Oct 2009)

Log Message:
-----------
Since all of the optional features now appear in dynamically loaded modules, we no longer need the machinery to propagate the resulting dependencies to the pkg-config metadata.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-31 06:28:47 UTC (rev 4031)
+++ trunk/ChangeLog	2009-10-31 09:46:21 UTC (rev 4032)
@@ -1,5 +1,11 @@
 2009-10-31 Braden McDaniel  <br...@en...>
 
+	* configure.ac: Since all of the optional features now appear in
+	dynamically loaded modules, we no longer need the machinery to
+	propagate the resulting dependencies to the pkg-config metadata.
+
+2009-10-31 Braden McDaniel  <br...@en...>
+
 	* configure.ac: Fixed checks for unset shell variables.
 
 2009-10-31 Braden McDaniel  <br...@en...>

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-31 06:28:47 UTC (rev 4031)
+++ trunk/configure.ac	2009-10-31 09:46:21 UTC (rev 4032)
@@ -27,18 +27,6 @@
 AM_CONFIG_HEADER([config.h])
 
 #
-# These strings are used with PKG_CHECK_MODULES.  If the corresponding
-# features are enabled, they also propagate to the pkg-config metadata files
-# output by configure.
-#
-REQUIRE_FONTCONFIG="fontconfig"
-REQUIRE_FREETYPE="freetype2"
-require_xulrunner_js="xulrunner-js"
-require_firefox_js="firefox-js"
-require_seamonkey_js="seamonkey-js"
-require_mozilla_js="mozilla-js >= 1.2.1"
-
-#
 # Checks for programs.
 #
 AC_LIBTOOL_DLOPEN
@@ -138,8 +126,8 @@
       [AC_MSG_FAILURE([libxml not found])])
 
 PKG_CHECK_MODULES([PNG], [libpng], , [have_libpng=no])
-PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no])
-PKG_CHECK_MODULES([FREETYPE], [$REQUIRE_FREETYPE], , [have_freetype=no])
+PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], , [have_fontconfig=no])
+PKG_CHECK_MODULES([FREETYPE], [freetype2], , [have_freetype=no])
 #
 # FreeType >= 2.2 uses const in callback function signatures.  This
 # doesn't cause an error in C; but it does in C++.
@@ -165,14 +153,10 @@
 ])
 
 have_libmozjs=yes
-PKG_CHECK_MODULES([JS], [$require_xulrunner_js],
-                  [mozilla_js_pkg=$require_xulrunner_js],
-                  [PKG_CHECK_MODULES([JS], [$require_firefox_js],
-                                     [mozilla_js_pkg=$require_firefox_js],
-                                     [PKG_CHECK_MODULES([JS], [$require_seamonkey_js],
-                                                        [mozilla_js_pkg=$require_seamonkey_js],
-                                                        [PKG_CHECK_MODULES([JS], [$require_mozilla_js],
-                                                                           [mozilla_js_pkg=$require_mozilla_js],
+PKG_CHECK_MODULES([JS], [xulrunner-js], ,
+                  [PKG_CHECK_MODULES([JS], [firefox-js], ,
+                                     [PKG_CHECK_MODULES([JS], [seamonkey-js], ,
+                                                        [PKG_CHECK_MODULES([JS], [mozilla-js >= 1.2.1], ,
                                                                            [have_libmozjs=no])])])])
 AC_CHECK_LIB([js], [JS_Init], [have_libjs=yes], [have_libjs=no])
 #


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