terminal plugin build patch

[Jeroen Zwartepoorte <jeroen xs4all nl>]

Hi,

Here's a small patch which will cause anjuta2 to only build the terminal
plugin if libzvt is present (libzvt-devel to be precise). This patch is
a temporary fix until i can finish my vte patch (use vte instead of vte
for the terminal plugin).

This patch should fix the problem for people trying to build anjuta2 on
red hat 8.0.

OK to commit?

Jeroen


? anjuta2.schemas
? autom4te-2.53.cache
? terminal_build.patch
? libanjuta/anjuta-marshal.c
? libanjuta/anjuta-marshal.h
? libanjuta/libanjuta-1.0.pc
? plugins/terminal/Makefile
? plugins/terminal/Makefile.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/anjuta2/ChangeLog,v
retrieving revision 1.231
diff -u -r1.231 ChangeLog
--- ChangeLog	16 Oct 2002 10:43:15 -0000	1.231
+++ ChangeLog	24 Oct 2002 20:03:51 -0000
@@ -1,3 +1,11 @@
+2002-10-24  Jeroen Zwartepoorte  <jeroen xs4all nl>
+
+	* configure.in:
+	* plugins/Makefile.am:
+	* plugins/terminal/Makefile.am:
+
+	Only build the terminal plugin if libzvt is present.
+
 2002-10-16  Stanislav Brabec  <sbrabec suse cz>
 
 	* configure.in: Added cs to ALL_LINGUAS.
Index: configure.in
===================================================================
RCS file: /cvs/gnome/anjuta2/configure.in,v
retrieving revision 1.80
diff -u -r1.80 configure.in
--- configure.in	16 Oct 2002 10:43:15 -0000	1.80
+++ configure.in	24 Oct 2002 20:03:51 -0000
@@ -54,7 +54,9 @@
 
 PKG_CHECK_MODULES(ANJUTA, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gdl-1.0 >= $GDL_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED)
 
-PKG_CHECK_MODULES(COMPONENT, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gdl-1.0 >= $GDL_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED gnome-build-1.0 >= $GNOME_BUILD_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgtkhtml-2.0 >= $LIBGTKHTML2_REQUIRED libzvt-2.0 >= $LIBZVT_REQUIRED)
+PKG_CHECK_MODULES(COMPONENT, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gdl-1.0 >= $GDL_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED gnome-build-1.0 >= $GNOME_BUILD_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgtkhtml-2.0 >= $LIBGTKHTML2_REQUIRED)
+
+PKG_CHECK_MODULES(ZVT, libzvt-2.0 >= $LIBZVT_REQUIRED, ENABLE_ZVT="yes", ENABLE_ZVT="no")
 
 AC_SUBST(ANJUTA_CFLAGS)
 AC_SUBST(ANJUTA_LIBS)
@@ -62,6 +64,14 @@
 AC_SUBST(LIBANJUTA_LIBS)
 AC_SUBST(COMPONENT_CFLAGS)
 AC_SUBST(COMPONENT_LIBS)
+AC_SUBST(ZVT_CFLAGS)
+AC_SUBST(ZVT_LIBS)
+
+if test "x$ENABLE_ZVT" = "xno"; then
+	AC_MSG_WARN(not building terminal plugin)
+fi
+
+AM_CONDITIONAL(ENABLE_TERMINAL, test "x$ENABLE_ZVT" = "xyes")
 
 # Devhelp idl
 AC_MSG_CHECKING([for Devhelp IDL])
Index: plugins/Makefile.am
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/Makefile.am,v
retrieving revision 1.26
diff -u -r1.26 Makefile.am
--- plugins/Makefile.am	26 Jun 2002 16:25:28 -0000	1.26
+++ plugins/Makefile.am	24 Oct 2002 20:03:51 -0000
@@ -4,6 +4,12 @@
 DEVHELP=
 endif
 
+if ENABLE_TERMINAL
+TERMINAL=terminal
+else
+TERMINAL=
+endif
+
 #if ENABLE_EVOLUTION
 # Until a new evolution is released, this shouldn't be compiled.
 #MAIL=evo-mail
@@ -20,7 +26,7 @@
 	shell-output     \
 	symbol-browser   \
 	text		 \
-	terminal
+	$(TERMINAL)
 
 XXX = debugger asciitable \
 	calculator docstat files functions
Index: plugins/terminal/Makefile.am
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/terminal/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- plugins/terminal/Makefile.am	26 Jun 2002 16:25:28 -0000	1.1
+++ plugins/terminal/Makefile.am	24 Oct 2002 20:03:51 -0000
@@ -3,6 +3,7 @@
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
 	-DANJUTA_DATADIR=\""$(datadir)"\" 	\
 	$(COMPONENT_CFLAGS)			\
+	$(ZVT_CFLAGS)				\
 	$(WARN_FLAGS)
 
 anjuta2_plugindir = $(anjuta2_plugin_dir)
@@ -14,7 +15,8 @@
 	terminal-tool.c
 
 libanjuta_terminal_la_LIBADD = \
-	$(COMPONENT_LIBS)
+	$(COMPONENT_LIBS) \
+	$(ZVT_LIBS)
 
 
 server_in_files = anjuta-terminal.server.in