[et-mgmt-tools] [PATCH 2/5] Change --enable-plugin => --enable-oldplugin, and add a new --enable-plugin.

[Richard W.M. Jones]

Change --enable-plugin => --enable-oldplugin, and add a new --enable-plugin.
 - Ignore generated files in the (new) plugin/ directory.
 - -DPLUGIN=1 => -DOLDPLUGIN=1 in src/main.c.

-- 
Richard Jones, Emerging Technologies, Red Hat  http://et.redhat.com/~rjones
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://et.redhat.com/~rjones/virt-top
-------------- next part --------------
# HG changeset patch
# User "Richard W.M. Jones <rjones at redhat.com>"
# Date 1218190993 -3600
# Node ID 319f0a7da787989ab8a4304984b0970a3270c5f4
# Parent  e268ed66e658bc364dea15f3d3f2541b2e28039e
Change --enable-plugin => --enable-oldplugin, and add a new --enable-plugin.
 - Ignore generated files in the (new) plugin/ directory.
 - -DPLUGIN=1 => -DOLDPLUGIN=1 in src/main.c.

diff -r e268ed66e658 -r 319f0a7da787 .hgignore
--- a/.hgignore	Fri Aug 08 10:55:13 2008 +0100
+++ b/.hgignore	Fri Aug 08 11:23:13 2008 +0100
@@ -27,3 +27,10 @@
 ^oldplugin/virt-viewer-plugin\.la$
 ^oldplugin/virt-viewer-plugin\.so$
 ^oldplugin/virt_viewer_plugin_la-.*\.lo$
+^plugin/\.deps
+^plugin/.*\.o
+^plugin/Makefile$
+^plugin/\.libs
+^plugin/virt-viewer-plugin\.la$
+^plugin/virt-viewer-plugin\.so$
+^plugin/virt_viewer_plugin_la-.*\.lo$
diff -r e268ed66e658 -r 319f0a7da787 Makefile.am
--- a/Makefile.am	Fri Aug 08 10:55:13 2008 +0100
+++ b/Makefile.am	Fri Aug 08 11:23:13 2008 +0100
@@ -1,5 +1,5 @@
 
-SUBDIRS = src man oldplugin
+SUBDIRS = src man oldplugin plugin
 
 EXTRA_DIST = @PACKAGE at .spec
 
diff -r e268ed66e658 -r 319f0a7da787 configure.ac
--- a/configure.ac	Fri Aug 08 10:55:13 2008 +0100
+++ b/configure.ac	Fri Aug 08 11:23:13 2008 +0100
@@ -19,14 +19,17 @@
 PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.10.0)
 PKG_CHECK_MODULES(GTKVNC, gtk-vnc-1.0 >= 0.3.5)
 
-dnl --enable-plugin to enable the browser plugin.
+dnl --enable-oldplugin and --enable-plugin to enable the browser plugin(s).
 NSPR_REQUIRED=4.0.0
 FIREFOX_PLUGIN_REQUIRED=1.5.0
 MOZILLA_PLUGIN_REQUIRED=1.8
+AC_ARG_ENABLE(oldplugin,
+        [  --enable-oldplugin=[no/yes] enable old browser plugin [default=no]],,
+        enable_oldplugin=no)
 AC_ARG_ENABLE(plugin,
         [  --enable-plugin=[no/yes] enable browser plugin [default=no]],,
         enable_plugin=no)
-if test "x$enable_plugin" = "xyes"; then
+if test "x$enable_oldplugin" = "xyes" -o "x$enable_plugin" = "xyes"; then
     dnl Check for Netscape Portable Runtime development package.
     PKG_CHECK_MODULES(NSPR, nspr >= $NSPR_REQUIRED)
     dnl Check for Firefox plugin package (also includes NSPR cflags/libs).
@@ -40,10 +43,12 @@
     AC_SUBST(FIREFOX_PLUGIN_CFLAGS)
     AC_SUBST(FIREFOX_PLUGIN_LIBS)
 fi
+AM_CONDITIONAL(ENABLE_OLDPLUGIN, [test "x$enable_oldplugin" = "xyes"])
 AM_CONDITIONAL(ENABLE_PLUGIN, [test "x$enable_plugin" = "xyes"])
 
 AC_OUTPUT(Makefile
           src/Makefile
           man/Makefile
 	  oldplugin/Makefile
+	  plugin/Makefile
           virt-viewer.spec)
diff -r e268ed66e658 -r 319f0a7da787 oldplugin/Makefile.am
--- a/oldplugin/Makefile.am	Fri Aug 08 10:55:13 2008 +0100
+++ b/oldplugin/Makefile.am	Fri Aug 08 11:23:13 2008 +0100
@@ -1,4 +1,4 @@
-if ENABLE_PLUGIN
+if ENABLE_OLDPLUGIN
 
 plugindir       = $(libdir)/mozilla/plugins
 plugin_LTLIBRARIES = virt-viewer-plugin.la
@@ -13,7 +13,7 @@
 virt_viewer_plugin_la_LDFLAGS = \
 	-module -avoid-version
 virt_viewer_plugin_la_CFLAGS = \
-	-DPLUGIN=1 -DENABLE_DEBUG=1 -DDEBUG=1 \
+	-DOLDPLUGIN=1 -DENABLE_DEBUG=1 -DDEBUG=1 \
 	@FIREFOX_PLUGIN_CFLAGS@ \
 	@GTKVNC_CFLAGS@ @GTK2_CFLAGS@ @LIBXML2_CFLAGS@ @LIBVIRT_CFLAGS@ \
 	@WARN_CFLAGS@ \
diff -r e268ed66e658 -r 319f0a7da787 plugin/Makefile.am
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugin/Makefile.am	Fri Aug 08 11:23:13 2008 +0100
@@ -0,0 +1,4 @@
+if ENABLE_PLUGIN
+
+
+endif
diff -r e268ed66e658 -r 319f0a7da787 src/main.c
--- a/src/main.c	Fri Aug 08 10:55:13 2008 +0100
+++ b/src/main.c	Fri Aug 08 11:23:13 2008 +0100
@@ -871,7 +871,7 @@
 	return 0;
 }
 
-#ifndef PLUGIN
+#ifndef OLDPLUGIN
 /* Standalone program. */
 
 static GtkWidget *viewer_get_toplevel (void *data G_GNUC_UNUSED)
@@ -949,7 +949,7 @@
 
 	return 0;
 }
-#endif /* !PLUGIN */
+#endif /* !OLDPLUGIN */
 
 /*
  * Local variables: