Update of /cvsroot/openvrml/openvrml/mozilla-plugin
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25547/mozilla-plugin
Modified Files:
configure.ac
Log Message:
Added back mozincludedir substitution, which apparently got stomped on at some point. Its loss was disguised by mozilla-xpcom.pc adding flags for this directory; but as of firefox 1.5.0.10, mozilla-plugin.pc no longer depends on mozilla-xpcom.pc.
Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/configure.ac,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** configure.ac 30 Dec 2006 23:37:44 -0000 1.20
--- configure.ac 5 Mar 2007 08:21:20 -0000 1.21
***************
*** 2,6 ****
AC_INIT([OpenVRML Mozilla Plugin], [0.16.3],
[ope...@li...])
! AC_COPYRIGHT([Portions copyright 2004, 2005, 2006 Braden McDaniel])
AC_CONFIG_FILES([Makefile]
[src/Makefile])
--- 2,6 ----
AC_INIT([OpenVRML Mozilla Plugin], [0.16.3],
[ope...@li...])
! AC_COPYRIGHT([Portions copyright 2004, 2005, 2006, 2007 Braden McDaniel])
AC_CONFIG_FILES([Makefile]
[src/Makefile])
***************
*** 23,30 ****
[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])
--- 23,30 ----
[mozilla_plugin_pkg=mozilla-plugin],
[have_mozilla_plugin=no])])
mozlibdir=`$PKG_CONFIG --variable=libdir $mozilla_plugin_pkg`
AC_SUBST([mozlibdir])
+ mozincludedir=`$PKG_CONFIG --variable=includedir $mozilla_plugin_pkg`
+ AC_SUBST([mozincludedir])
PKG_CHECK_MODULES([GTK], [gtk+-2.0], , [have_gtk=no])
|
