Update of /cvsroot/openvrml/openvrml/mozilla-plugin
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15715/mozilla-plugin
Modified Files:
Tag: OpenVRML-0_16-BRANCH
configure.ac
Log Message:
Accommodate building against Firefox development headers.
Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/configure.ac,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -C2 -d -r1.14.2.2 -r1.14.2.3
*** configure.ac 9 Oct 2006 03:09:02 -0000 1.14.2.2
--- configure.ac 25 Oct 2006 19:15:17 -0000 1.14.2.3
***************
*** 16,24 ****
ACX_PTHREAD(, [AC_MSG_FAILURE([pthread support not found])])
! PKG_CHECK_MODULES([MOZILLA_PLUGIN], [mozilla-plugin >= 1.6],
! , [have_mozilla_plugin=no])
! mozversion=`$PKG_CONFIG --modversion mozilla-plugin`
! mozprefix=`$PKG_CONFIG --variable=prefix mozilla-plugin`
! mozlibdir=`$PKG_CONFIG --variable=libdir mozilla-plugin`
AC_SUBST([mozlibdir])
PKG_CHECK_MODULES([GTK], [gtk+-2.0], , [have_gtk=no])
--- 16,29 ----
ACX_PTHREAD(, [AC_MSG_FAILURE([pthread support not found])])
! PKG_CHECK_MODULES([MOZILLA_PLUGIN],
! [firefox-plugin],
! [mozilla_plugin_pkg=firefox-plugin],
! [PKG_CHECK_MODULES([MOZILLA_PLUGIN],
! [mozilla-plugin >= 1.6],
! [mozilla_plugin_pkg=mozilla-plugin],
! [have_mozilla_plugin=no])])
! mozversion=`$PKG_CONFIG --modversion $mozilla_plugin_pkg`
! mozprefix=`$PKG_CONFIG --variable=prefix $mozilla_plugin_pkg`
! mozlibdir=`$PKG_CONFIG --variable=libdir $mozilla_plugin_pkg`
AC_SUBST([mozlibdir])
PKG_CHECK_MODULES([GTK], [gtk+-2.0], , [have_gtk=no])
|
