[Xfce4-commits] <parole:master> Check for --enable-parole-debug in configure so we can modify the browser plugin and test it without installing it, this is only for the libexec file, not the plugin installed in mozilla/plugin dir.

[Ali Abdallah]

Updating branch refs/heads/master
         to 9952d018343cf177cba4dbf06f40f70749004dcb (commit)
       from 808acb84055afbb9062ffb9fea74fd2445b64e02 (commit)

commit 9952d018343cf177cba4dbf06f40f70749004dcb
Author: Ali Abdallah <ali at ali-xfce.org>
Date:   Sun Nov 15 16:44:09 2009 +0100

    Check for --enable-parole-debug in configure so we can
    modify the browser plugin and test it without installing
    it, this is only for the libexec file, not the plugin
    installed in mozilla/plugin dir.

 browser-plugin/parole-plugin.cpp |    7 ++++-
 configure.ac.in                  |   39 ++++++++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/browser-plugin/parole-plugin.cpp b/browser-plugin/parole-plugin.cpp
index 4441380..d68f3f7 100644
--- a/browser-plugin/parole-plugin.cpp
+++ b/browser-plugin/parole-plugin.cpp
@@ -75,9 +75,12 @@ NPError ParolePlugin::NewStream (NPMIMEType type, NPStream *stream,
 	url = g_strdup (stream->url);
 	
 	socket = g_strdup_printf ("%ld", window);
-	
-	//app = g_build_filename (LIBEXECDIR, "parole-media-plugin", NULL);
+#ifdef PAROLE_ENABLE_DEBUG
 	app = g_strdup ("media-plugin/parole-media-plugin");
+#else
+	app = g_build_filename (LIBEXECDIR, "parole-media-plugin", NULL);
+#endif
+
 	command[0] = app;
 	command[1] = (gchar *)"--socket-id";
 	command[2] = socket;
diff --git a/configure.ac.in b/configure.ac.in
index fe02ad7..032188a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -130,23 +130,14 @@ if test "x${ac_cv_have_decl_XF86XK_AudioPlay}" != "xno"; then
 fi
 
 #=======================================================#
-#              Check plugins to build                   #
+#      	       TagLib support	          		#
 #=======================================================#
-
-# Stream Properties plugin.
-#--------------------------
-AC_ARG_ENABLE([properties-plugin], AC_HELP_STRING([--disable-properties-plugin], [Don't build parole stream properties plugin]),
-  [ac_properties_plugin=$enableval], [ac_properties_plugin=yes])
-AC_MSG_CHECKING([whether to build the Parole stream properties plugin])
-AM_CONDITIONAL([PAROLE_PROPERTIES_PLUGIN], [test x"$ac_properties_plugin" = x"yes"])
-AC_MSG_RESULT([$ac_properties_plugin])
 TAGLIB_FOUND="no"
-if test x"$ac_properties_plugin" = x"yes"; then
-    XDT_CHECK_OPTIONAL_PACKAGE([TAGLIB], 
+XDT_CHECK_OPTIONAL_PACKAGE([TAGLIB], 
     [taglib], [1.4],
     [taglib], 
     [tag lib], [yes])
-fi
+
 if test x"$TAGLIB_FOUND" = x"yes"; then
 TAGLIBC_LIBS=""
 TAGLIBC_CFLAGS=""
@@ -162,6 +153,18 @@ AC_SUBST([TAGLIBC_CFLAGS])
 AC_SUBST([TAGLIBC_LIBS])
 fi
 
+#=======================================================#
+#              Check plugins to build                   #
+#=======================================================#
+
+# Stream Properties plugin.
+#--------------------------
+AC_ARG_ENABLE([properties-plugin], AC_HELP_STRING([--disable-properties-plugin], [Don't build parole stream properties plugin]),
+  [ac_properties_plugin=$enableval], [ac_properties_plugin=yes])
+AC_MSG_CHECKING([whether to build the Parole stream properties plugin])
+AM_CONDITIONAL([PAROLE_PROPERTIES_PLUGIN], [test x"$ac_properties_plugin" = x"yes"])
+AC_MSG_RESULT([$ac_properties_plugin])
+
 # Tray plugin.
 #--------------------------
 AC_ARG_ENABLE([tray-plugin], AC_HELP_STRING([--disable-tray-plugin], [Don't build parole tray icon plugin]),
@@ -206,6 +209,18 @@ fi
 XDT_FEATURE_DEBUG()
 
 #=======================================================#
+#              Developement debugging                   #
+#=======================================================#
+AC_ARG_ENABLE([parole-debug], AC_HELP_STRING([--enable-parole-debug], [Maintainer debug mode]),
+  [ac_parole_debug=$enableval], [ac_parole_debug=no])
+AC_MSG_CHECKING([Maintainer debug mode])
+AM_CONDITIONAL([PAROLE_DEBUG], [test x"$ac_parole_debug" = x"yes"])
+AC_MSG_RESULT([$ac_parole_debug])
+if test x"$ac_parole_debug" = x"yes"; then
+    AC_DEFINE(PAROLE_ENABLE_DEBUG, 1, [wheter to enable maintainer debug mode])
+fi
+
+#=======================================================#
 #              Check for Gtk doc	                #
 #=======================================================#
 GTK_DOC_CHECK(1.9)