[openvrml-commit] openvrml configure.ac, 1.97, 1.98 openvrml.spec.in, 1.55, 1.56

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15753

Modified Files:
	configure.ac openvrml.spec.in 
Log Message:
Accommodate building against Firefox development headers.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** configure.ac	9 Oct 2006 18:43:09 -0000	1.97
--- configure.ac	25 Oct 2006 19:15:31 -0000	1.98
***************
*** 37,40 ****
--- 37,41 ----
  #
  REQUIRE_FONTCONFIG="fontconfig"
+ REQUIRE_FIREFOX_JS="firefox-js"
  REQUIRE_MOZILLA_JS="mozilla-js >= 1.2.1"
  
***************
*** 106,110 ****
  
  
! PKG_CHECK_MODULES([JS], [$REQUIRE_MOZILLA_JS], , [have_js=no])
  PKG_CHECK_MODULES([GTK], [gtk+-2.0], , [have_gtk=no])
  AC_PATH_XTRA
--- 107,115 ----
  
  
! PKG_CHECK_MODULES([JS], [$REQUIRE_FIREFOX_JS],
!                   [mozilla_js_pkg=$REQUIRE_FIREFOX_JS],
!                   [PKG_CHECK_MODULES([JS], [$REQUIRE_MOZILLA_JS],
!                                      [mozilla_js_pkg=$REQUIRE_MOZILLA_JS],
!                                      [have_js=no])])
  PKG_CHECK_MODULES([GTK], [gtk+-2.0], , [have_gtk=no])
  AC_PATH_XTRA
***************
*** 226,233 ****
      OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES},"
    fi
!   OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES} ${REQUIRE_MOZILLA_JS}"
    AC_DEFINE([OPENVRML_ENABLE_SCRIPT_NODE_JAVASCRIPT], [1],
              [Defined if Script node JavaScript support is enabled.])
!   GRE_PATH=`$PKG_CONFIG --libs-only-L mozilla-js | sed -e 's/^-L//' -e 's/ *$//'`
    if test -n "${openvrml_run_path}" -a -n "${GRE_PATH}"; then
      openvrml_run_path=":${openvrml_run_path}"
--- 231,238 ----
      OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES},"
    fi
!   OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES} ${mozilla_js_pkg}"
    AC_DEFINE([OPENVRML_ENABLE_SCRIPT_NODE_JAVASCRIPT], [1],
              [Defined if Script node JavaScript support is enabled.])
!   GRE_PATH=`$PKG_CONFIG --libs-only-L ${mozilla_js_pkg%% *} | sed -e 's/^-L//' -e 's/ *$//'`
    if test -n "${openvrml_run_path}" -a -n "${GRE_PATH}"; then
      openvrml_run_path=":${openvrml_run_path}"

Index: openvrml.spec.in
===================================================================
RCS file: /cvsroot/openvrml/openvrml/openvrml.spec.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** openvrml.spec.in	5 Oct 2006 05:14:14 -0000	1.55
--- openvrml.spec.in	25 Oct 2006 19:15:31 -0000	1.56
***************
*** 17,21 ****
  BuildRequires:  fontconfig-devel >= 2.0
  BuildRequires:  freetype-devel >= 2.1.2
! BuildRequires:  mozilla-devel >= 1.6
  BuildRequires:  mesa-libGLU-devel
  BuildRequires:  libXmu-devel
--- 17,21 ----
  BuildRequires:  fontconfig-devel >= 2.0
  BuildRequires:  freetype-devel >= 2.1.2
! BuildRequires:  firefox-devel
  BuildRequires:  mesa-libGLU-devel
  BuildRequires:  libXmu-devel
***************
*** 26,30 ****
  Requires:       fontconfig >= 2.0
  Requires:       freetype >= 2.1.2
! Requires:       mozilla >= 1.6
  
  %description
--- 26,30 ----
  Requires:       fontconfig >= 2.0
  Requires:       freetype >= 2.1.2
! Requires:       firefox
  
  %description
***************
*** 74,78 ****
  License:        GPL
  Requires:       %{name}-gtkplug = %{version}
! Requires:       mozilla >= 1.6
  %description mozilla-plugin
  VRML browser plug-in for Mozilla-based browsers.
--- 74,78 ----
  License:        GPL
  Requires:       %{name}-gtkplug = %{version}
! Requires:       firefox
  %description mozilla-plugin
  VRML browser plug-in for Mozilla-based browsers.
***************
*** 134,137 ****
--- 134,140 ----
  
  %changelog
+ * Wed Oct 25 2006  Braden McDaniel  <br...@en...>
+ - Require firefox instead of mozilla.
+ 
  * Thu Oct 05 2006  Braden McDaniel  <br...@en...>
  - Added openvrml-gtkplug info.