Menu
▾
▴
SF.net SVN: openvrml:[3864] trunk
|
From: <br...@us...> - 2009-03-24 04:40:56
|
Revision: 3864
http://openvrml.svn.sourceforge.net/openvrml/?rev=3864&view=rev
Author: braden
Date: 2009-03-24 04:40:50 +0000 (Tue, 24 Mar 2009)
Log Message:
-----------
Moved configuration for the Mozilla plug-in into the top-level configure.ac.
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.ac
trunk/mozilla-plugin/Makefile.am
trunk/mozilla-plugin/src/Makefile.am
trunk/mozilla-plugin/src/openvrml.cpp
Removed Paths:
-------------
trunk/mozilla-plugin/configure.ac
Property Changed:
----------------
trunk/mozilla-plugin/
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-23 23:42:22 UTC (rev 3863)
+++ trunk/ChangeLog 2009-03-24 04:40:50 UTC (rev 3864)
@@ -1,3 +1,19 @@
+2009-03-24 Braden McDaniel <br...@en...>
+
+ Moved configuration for the Mozilla plug-in into the top-level
+ configure.ac.
+
+ * configure.ac: Added checks for Mozilla plug-in dependencies.
+ * mozilla-plugin/Makefile.am (ACLOCAL_AMFLAGS): Removed.
+ * mozilla-plugin/configure.ac: Removed.
+ * mozilla-plugin/src/Makefile.am
+ (AM_CPPFLAGS): Define MOZ_X11.
+ (browser-host-server-glue.h): Adjusted path for browser-host.xml.
+ (browser-factory-client-glue.h): Adjusted path for
+ browser-factory.xml.
+ (browser-client-glue.h): Adjusted path for browser.xml.
+ * mozilla-plugin/src/openvrml.cpp: Include <config.h>.
+
2009-03-23 Braden McDaniel <br...@en...>
Make use of pkg-config's Requires.private and Libs.private.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-03-23 23:42:22 UTC (rev 3863)
+++ trunk/configure.ac 2009-03-24 04:40:50 UTC (rev 3864)
@@ -16,6 +16,8 @@
[src/script/java/vrml/Makefile]
[src/script/java/vrml/field/Makefile]
[src/script/java/vrml/node/Makefile]
+ [mozilla-plugin/Makefile]
+ [mozilla-plugin/src/Makefile]
[data/Makefile]
[examples/Makefile]
[tests/Makefile]
@@ -181,6 +183,16 @@
PKG_CHECK_MODULES([GNOMEUI], [libgnomeui-2.0 libgnome-2.0 >= 2.14], ,
[have_gnomeui=no])
PKG_CHECK_MODULES([CURL], [libcurl], , [have_libcurl=no])
+PKG_CHECK_MODULES([MOZILLA_PLUGIN], [xulrunner-plugin],
+ [mozilla_plugin_pkg=xulrunner-plugin],
+ [PKG_CHECK_MODULES([MOZILLA_PLUGIN], [firefox-plugin],
+ [mozilla_plugin_pkg=firefox-plugin],
+ [PKG_CHECK_MODULES([MOZILLA_PLUGIN], [seamonkey-plugin],
+ [mozilla_plugin_pkg=seamonkey-plugin],
+ [PKG_CHECK_MODULES([MOZILLA_PLUGIN], [mozilla-plugin >= 1.6],
+ [mozilla_plugin_pkg=mozilla-plugin],
+ [have_mozilla_plugin=no])])])])
+
AC_PATH_XTRA
AX_CHECK_GLU
@@ -400,7 +412,13 @@
[do not build the Mozilla plug-in])])
AS_IF([test X$enable_mozilla_plugin != Xno],
[AS_IF([test X$enable_xembed = Xno],
- [AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the XEmbed control])])])
+ [AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the XEmbed control])])
+ AS_IF([test "X$have_mozilla_plugin" = "Xno"],
+ [AC_MSG_FAILURE([Mozilla plug-in development headers are required to build the Mozilla plug-in.])])
+ AS_IF([test "X$have_dbus_glib" = "Xno"],
+ [AC_MSG_FAILURE([The D-Bus GLib binding is required to build the Mozilla plug-in])])])
+AM_CONDITIONAL([ENABLE_MOZILLA_PLUGIN],
+ [test "X$enable_mozilla_plugin" != "Xno" -a "X$have_dbus_glib" != "Xno"])
#
# build examples
@@ -440,8 +458,6 @@
])
AC_SUBST([OPENVRML_JAVASCRIPT_RPATH])
-AC_CONFIG_SUBDIRS([mozilla-plugin])
-
AC_CONFIG_TESTDIR([tests])
AC_OUTPUT
Property changes on: trunk/mozilla-plugin
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.guess
config.sub
configure
depcomp
install-sh
ltmain.sh
missing
+ Makefile
Makefile.in
Modified: trunk/mozilla-plugin/Makefile.am
===================================================================
--- trunk/mozilla-plugin/Makefile.am 2009-03-23 23:42:22 UTC (rev 3863)
+++ trunk/mozilla-plugin/Makefile.am 2009-03-24 04:40:50 UTC (rev 3864)
@@ -1,3 +1 @@
SUBDIRS = src
-
-ACLOCAL_AMFLAGS = -I ../m4
Deleted: trunk/mozilla-plugin/configure.ac
===================================================================
--- trunk/mozilla-plugin/configure.ac 2009-03-23 23:42:22 UTC (rev 3863)
+++ trunk/mozilla-plugin/configure.ac 2009-03-24 04:40:50 UTC (rev 3864)
@@ -1,43 +0,0 @@
-AC_PREREQ([2.53])
-AC_INIT([OpenVRML Mozilla Plugin], [0.17.99],
- [ope...@li...])
-AC_COPYRIGHT([Portions copyright 2004, 2005, 2006, 2007, 2008 Braden McDaniel])
-AC_CONFIG_FILES([Makefile]
- [src/Makefile])
-AM_INIT_AUTOMAKE([1.7 foreign])
-
-AC_PROG_CXX
-
-AC_DISABLE_STATIC
-AC_ENABLE_SHARED
-enable_shared=yes
-AC_PROG_LIBTOOL
-
-ACX_PTHREAD(, [AC_MSG_FAILURE([pthread support not found])])
-
-AC_PATH_X
-if test X$no_x != Xyes; then
- AC_DEFINE([MOZ_X11], [1], [Build an X11 plug-in])
-fi
-
-PKG_CHECK_MODULES([MOZILLA_PLUGIN], [xulrunner-plugin],
- [mozilla_plugin_pkg=xulrunner-plugin],
- [PKG_CHECK_MODULES([MOZILLA_PLUGIN], [firefox-plugin],
- [mozilla_plugin_pkg=firefox-plugin],
- [PKG_CHECK_MODULES([MOZILLA_PLUGIN], [seamonkey-plugin],
- [mozilla_plugin_pkg=seamonkey-plugin],
- [PKG_CHECK_MODULES([MOZILLA_PLUGIN], [mozilla-plugin >= 1.6],
- [mozilla_plugin_pkg=mozilla-plugin],
- [have_mozilla_plugin=no])])])])
-PKG_CHECK_MODULES([DBUS_G], [dbus-glib-1], , [have_dbus_glib=no])
-AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool])
-
-AS_IF([test "X$enable_mozilla_plugin" != "Xno"],
- [AS_IF([test "X$have_mozilla_plugin" = "Xno"],
- [AC_MSG_FAILURE([Mozilla plug-in development headers are required to build the Mozilla plug-in.])])
- AS_IF([test "X$have_dbus_glib" = "Xno"],
- [AC_MSG_FAILURE([The D-Bus GLib binding is required to build the Mozilla plug-in])])])
-AM_CONDITIONAL([ENABLE_MOZILLA_PLUGIN],
- [test "X$enable_mozilla_plugin" != "Xno" -a "X$have_dbus_glib" != "Xno"])
-
-AC_OUTPUT
Modified: trunk/mozilla-plugin/src/Makefile.am
===================================================================
--- trunk/mozilla-plugin/src/Makefile.am 2009-03-23 23:42:22 UTC (rev 3863)
+++ trunk/mozilla-plugin/src/Makefile.am 2009-03-24 04:40:50 UTC (rev 3864)
@@ -1,4 +1,5 @@
AM_CPPFLAGS = \
+ -DMOZ_X11 \
-DGTK_DISABLE_DEPRECATED \
-DOPENVRML_LIBEXECDIR_=\"$(libexecdir)\"
AM_CXXFLAGS = $(MOZILLA_PLUGIN_CFLAGS) $(DBUS_G_CFLAGS)
@@ -19,20 +20,20 @@
$(MOZILLA_PLUGIN_LIBS) \
$(DBUS_G_LIBS)
-browser-host-server-glue.h: $(top_srcdir)/../src/openvrml-xembed/browser-host.xml
+browser-host-server-glue.h: $(srcdir)/../../src/openvrml-xembed/browser-host.xml
$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
--prefix=openvrml_np_browser_host \
--mode=glib-server \
--output=$@ \
$?
-browser-factory-client-glue.h: $(top_srcdir)/../src/openvrml-xembed/browser-factory.xml
+browser-factory-client-glue.h: $(srcdir)/../../src/openvrml-xembed/browser-factory.xml
$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
--mode=glib-client \
--output=$@ \
$?
-browser-client-glue.h: $(top_srcdir)/../src/openvrml-xembed/browser.xml
+browser-client-glue.h: $(srcdir)/../../src/openvrml-xembed/browser.xml
$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
--mode=glib-client \
--output=$@ \
Modified: trunk/mozilla-plugin/src/openvrml.cpp
===================================================================
--- trunk/mozilla-plugin/src/openvrml.cpp 2009-03-23 23:42:22 UTC (rev 3863)
+++ trunk/mozilla-plugin/src/openvrml.cpp 2009-03-24 04:40:50 UTC (rev 3864)
@@ -38,6 +38,8 @@
# error Unsupported toolkit.
# endif
+# include <config.h>
+
# define OPENVRML_NP_TYPE_BROWSER_HOST (openvrml_np_browser_host_get_type())
# define OPENVRML_NP_BROWSER_HOST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), OPENVRML_NP_TYPE_BROWSER_HOST, OpenvrmlNpBrowserHost))
# define OPENVRML_NP_BROWSER_HOST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), OPENVRML_NP_TYPE_BROWSER_HOST, OpenvrmlNpBrowserHostClass))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
