anjuta r4060 - in trunk: . plugins/project-wizard/templates/anjuta-plugin plugins/project-wizard/templates/cpp plugins/project-wizard/templates/gcj plugins/project-wizard/templates/java plugins/project-wizard/templates/minimal plugins/project-wizard/templates/python plugins/project-wizard/templates/terminal plugins/project-wizard/templates/wxwin plugins/project-wizard/templates/xlib

[jhs svn gnome org]

Author: jhs
Date: Sun Jul  6 13:25:36 2008
New Revision: 4060
URL: http://svn.gnome.org/viewvc/anjuta?rev=4060&view=rev

Log:
2008-07-06  Johannes Schmid  <jhs idefix>

	* configure.in:
	* plugins/project-wizard/templates/anjuta-plugin/configure.ac.tpl:
	* plugins/project-wizard/templates/cpp/configure.ac.tpl:
	* plugins/project-wizard/templates/gcj/configure.ac.tpl:
	* plugins/project-wizard/templates/java/configure.ac.tpl:
	* plugins/project-wizard/templates/minimal/configure.ac.tpl:
	* plugins/project-wizard/templates/python/configure.ac.tpl:
	* plugins/project-wizard/templates/wxwin/configure.ac.tpl:
	* plugins/project-wizard/templates/xlib/configure.ac.tpl:
	
	#475244 â AC_SUBST() not needed after PKG_CHECK_MODULES()



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plugins/project-wizard/templates/anjuta-plugin/configure.ac.tpl
   trunk/plugins/project-wizard/templates/cpp/configure.ac.tpl
   trunk/plugins/project-wizard/templates/gcj/configure.ac.tpl
   trunk/plugins/project-wizard/templates/java/configure.ac.tpl
   trunk/plugins/project-wizard/templates/minimal/configure.ac.tpl
   trunk/plugins/project-wizard/templates/python/configure.ac.tpl
   trunk/plugins/project-wizard/templates/terminal/configure.ac.tpl
   trunk/plugins/project-wizard/templates/wxwin/configure.ac.tpl
   trunk/plugins/project-wizard/templates/xlib/configure.ac.tpl

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jul  6 13:25:36 2008
@@ -167,84 +167,44 @@
 dnl because different plugins have different requirements.
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
 
 PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >= $GOBJECT_REQUIRED)
-AC_SUBST(GOBJECT_CFLAGS)
-AC_SUBST(GOBJECT_LIBS)
 
 PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GMODULE_REQUIRED)
-AC_SUBST(GMODULE_CFLAGS)
-AC_SUBST(GMODULE_LIBS)
 
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GTHREAD_REQUIRED)
-AC_SUBST(GTHREAD_CFLAGS)
-AC_SUBST(GTHREAD_LIBS)
 
 PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED)
-AC_SUBST(GIO_CFLAGS)
-AC_SUBST(GIO_LIBS)
 
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
 
 PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED)
-AC_SUBST(GDK_PIXBUF_CFLAGS)
-AC_SUBST(GDK_PIXBUF_LIBS)
 
 PKG_CHECK_MODULES(ORBIT, ORBit-2.0 >= $ORBIT_REQUIRED)
-AC_SUBST(ORBIT_CFLAGS)
-AC_SUBST(ORBIT_LIBS)
 
 PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $LIBGLADE_REQUIRED)
-AC_SUBST(GLADE_CFLAGS)
-AC_SUBST(GLADE_LIBS)
 
 PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= $GNOME_REQUIRED)
-AC_SUBST(GNOME_CFLAGS)
-AC_SUBST(GNOME_LIBS)
 
 PKG_CHECK_MODULES(GNOME_CANVAS, libgnomecanvas-2.0 >= $GNOME_CANVAS_REQUIRED)
-AC_SUBST(GNOME_CANVAS_CFLAGS)
-AC_SUBST(GNOME_CANVAS_LIBS)
 
 PKG_CHECK_MODULES(GNOME_UI, libgnomeui-2.0 >= $GNOME_UI_REQUIRED)
-AC_SUBST(GNOME_UI_CFLAGS)
-AC_SUBST(GNOME_UI_LIBS)
 
 PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED)
-AC_SUBST(GNOME_VFS_CFLAGS)
-AC_SUBST(GNOME_VFS_LIBS)
 
 PKG_CHECK_MODULES(GNOME_VFS_MODULE, gnome-vfs-module-2.0 >= $GNOME_VFS_REQUIRED)
-AC_SUBST(GNOME_VFS_MODULE_CFLAGS)
-AC_SUBST(GNOME_VFS_MODULE_LIBS)
 
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
 
 PKG_CHECK_MODULES(VTE, vte >= $VTE_REQUIRED)
-AC_SUBST(VTE_CFLAGS)
-AC_SUBST(VTE_LIBS)
 
 PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED)
-AC_SUBST(LIBXML_CFLAGS)
-AC_SUBST(LIBXML_LIBS)
 
 PKG_CHECK_MODULES(PANGO, pango >= $PANGO_REQUIRED)
-AC_SUBST(PANGO_CFLAGS)
-AC_SUBST(PANGO_LIBS)
 
 PKG_CHECK_MODULES(GDL, gdl-1.0 >= $GDL_REQUIRED gdl-gnome-1.0 >= $GDL_REQUIRED)
-AC_SUBST(GDL_CFLAGS)
-AC_SUBST(GDL_LIBS)
 
 PKG_CHECK_MODULES(LIBXSLT, libxslt)
-AC_SUBST(LIBXSLT_CFLAGS)
-AC_SUBST(LIBXSLT_LIBS)
 
 dnl Check for autogen
 dnl -----------------
@@ -286,8 +246,6 @@
 	      AC_DEFINE(HAVE_OLD_DEVHELP, 1, [If old devhelp (>= 0.9 < 0.11) is installed])
 		fi
 	fi
-	AC_SUBST(PLUGIN_DEVHELP_CFLAGS)
-	AC_SUBST(PLUGIN_DEVHELP_LIBS)
 fi
 
 if test x$devhelp_enabled = xyes; then
@@ -300,18 +258,10 @@
 
 AM_CONDITIONAL(HAVE_PLUGIN_DEVHELP, [test x$devhelp_enabled = xyes])
 
-dnl Check for GTodo
-dnl -----------------
-dnl PKG_CHECK_MODULES(PLUGIN_GTODO, libgtodo-1.0 >= $LIBGTODO_REQUIRED)
-dnl AC_SUBST(PLUGIN_GTODO_CFLAGS)
-dnl AC_SUBST(PLUGIN_GTODO_LIBS)
-
 dnl Check for Gnome Build
 dnl ---------------------
 
 PKG_CHECK_MODULES(PLUGIN_GNOMEBUILD, gnome-build-1.0 >= $GNOMEBUILD_REQUIRED)
-AC_SUBST(PLUGIN_GNOMEBUILD_CFLAGS)
-AC_SUBST(PLUGIN_GNOMEBUILD_LIBS)
 
 dnl Check for Glade3
 dnl ---------------------
@@ -349,8 +299,6 @@
 	fi
 	AC_DEFINE_UNQUOTED(GLADEUI_VERSION, [$gladeui_version], [GLADEUI version])
 	AC_SUBST(GLADEUI_VERSION)
-	AC_SUBST(PLUGIN_GLADE_CFLAGS)
-	AC_SUBST(PLUGIN_GLADE_LIBS)
 fi
 
 AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$libgladeui_found = xyes])
@@ -397,8 +345,6 @@
 		[libgvc >= $LIBGRAPHVIZ_REQUIRED libgraph >= $LIBGRAPHVIZ_REQUIRED], 
 		[libgraphviz_found="yes"],
 		[libgraphviz_found="no"])
-	AC_SUBST(GRAPHVIZ_CFLAGS)
-	AC_SUBST(GRAPHVIZ_LIBS)
 	
 	dnl Restore pkgconfig path
 	PKG_CONFIG_PATH="${ANJUTA_PKG_CONFIG_PATH_SAVE}"
@@ -436,8 +382,6 @@
 		gtksourceview-2.0 >= $GTKSOURCEVIEW_REQUIRED],
 		[sourceview="yes"],
 		[sourceview="no"])
-	AC_SUBST(PLUGIN_SOURCEVIEW_CFLAGS)
-	AC_SUBST(PLUGIN_SOURCEVIEW_LIBS)
 fi
 
 AM_CONDITIONAL(HAVE_PLUGIN_SOURCEVIEW, [test x$sourceview = xyes])
@@ -462,8 +406,6 @@
 		 libgnomeprintui-2.2 >= $GNOME_PRINT_UI_REQUIRED],
 		[scintilla="yes"],
 		[scintilla="no"])
-	AC_SUBST(PLUGIN_SCINTILLA_CFLAGS)
-	AC_SUBST(PLUGIN_SCINTILLA_LIBS)
 fi
 AM_CONDITIONAL(HAVE_PLUGIN_SCINTILLA, [test x$scintilla = xyes])
 
@@ -488,8 +430,6 @@
 		[libgda-4.0 >= $GDA_REQUIRED],
 		[symboldb="yes"],
 		[symboldb="no"])
-	AC_SUBST(PLUGIN_SYMBOL_DB_CFLAGS)
-	AC_SUBST(PLUGIN_SYMBOL_DB_LIBS)
 fi
 
 AM_CONDITIONAL(HAVE_PLUGIN_SYMBOL_DB, [test x$symboldb = xyes])

Modified: trunk/plugins/project-wizard/templates/anjuta-plugin/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/anjuta-plugin/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/anjuta-plugin/configure.ac.tpl	Sun Jul  6 13:25:36 2008
@@ -34,8 +34,6 @@
 [+ENDIF+]
 
 PKG_CHECK_MODULES(LIBANJUTA, [libanjuta-1.0])
-AC_SUBST(LIBANJUTA_CFLAGS)
-AC_SUBST(LIBANJUTA_LIBS)
 
 [+IF (=(get "HavePackage") "1")+]
 PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+] [+PackageModule3+] [+PackageModule4+] [+PackageModule5+]])

Modified: trunk/plugins/project-wizard/templates/cpp/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/cpp/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/cpp/configure.ac.tpl	Sun Jul  6 13:25:36 2008
@@ -35,8 +35,6 @@
 
 [+IF (=(get "HavePackage") "1")+]
 PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+] [+PackageModule3+] [+PackageModule4+] [+PackageModule5+]])
-AC_SUBST([+NameCUpper+]_CFLAGS)
-AC_SUBST([+NameCUpper+]_LIBS)
 [+ENDIF+]
 
 [+IF (=(get "HaveGtkDoc") "1")+]

Modified: trunk/plugins/project-wizard/templates/gcj/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/gcj/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/gcj/configure.ac.tpl	Sun Jul  6 13:25:36 2008
@@ -24,8 +24,6 @@
 
 [+IF (=(get "HavePackage") "1")+]
 PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+] [+PackageModule3+] [+PackageModule4+] [+PackageModule5+]])
-AC_SUBST([+NameCUpper+]_CFLAGS)
-AC_SUBST([+NameCUpper+]_LIBS)
 [+ENDIF+]
 
 AC_OUTPUT([

Modified: trunk/plugins/project-wizard/templates/java/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/java/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/java/configure.ac.tpl	Sun Jul  6 13:25:36 2008
@@ -21,8 +21,6 @@
 
 [+IF (=(get "HavePackage") "1")+]
 PKG_CHECK_MODULES(PACKAGE, [[+PackageModule1+] [+PackageModule2+] [+PackageModule3+] [+PackageModule4+] [+PackageModule5+]])
-AC_SUBST(PACKAGE_CFLAGS)
-AC_SUBST(PACKAGE_LIBS)
 [+ENDIF+]
 
 [+IF (=(get "HaveGtkDoc") "1")+]

Modified: trunk/plugins/project-wizard/templates/minimal/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/minimal/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/minimal/configure.ac.tpl	Sun Jul  6 13:25:36 2008
@@ -24,8 +24,6 @@
 
 [+IF (=(get "HavePackage") "1")+]
 PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+] [+PackageModule3+] [+PackageModule4+] [+PackageModule5+]])
-AC_SUBST([+NameCUpper+]_CFLAGS)
-AC_SUBST([+NameCUpper+]_LIBS)
 [+ENDIF+]
 
 AC_OUTPUT([

Modified: trunk/plugins/project-wizard/templates/python/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/python/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/python/configure.ac.tpl	Sun Jul  6 13:25:36 2008
@@ -23,8 +23,6 @@
 
 [+IF (=(get "HavePackage") "1")+]
 PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+] [+PackageModule3+] [+PackageModule4+] [+PackageModule5+]])
-AC_SUBST([+NameCUpper+]_CFLAGS)
-AC_SUBST([+NameCUpper+]_LIBS)
 [+ENDIF+]
 
 [+IF (=(get "HaveGtkDoc") "1")+]

Modified: trunk/plugins/project-wizard/templates/terminal/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/terminal/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/terminal/configure.ac.tpl	Sun Jul  6 13:25:36 2008
@@ -35,8 +35,6 @@
 
 [+IF (=(get "HavePackage") "1")+]
 PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+] [+PackageModule3+] [+PackageModule4+] [+PackageModule5+]])
-AC_SUBST([+NameCUpper+]_CFLAGS)
-AC_SUBST([+NameCUpper+]_LIBS)
 [+ENDIF+]
 
 [+IF (=(get "HaveGtkDoc") "1")+]

Modified: trunk/plugins/project-wizard/templates/wxwin/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/wxwin/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/wxwin/configure.ac.tpl	Sun Jul  6 13:25:36 2008
@@ -59,8 +59,6 @@
 
 [+IF (=(get "HavePackage") "1")+]
 PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+] [+PackageModule3+] [+PackageModule4+] [+PackageModule5+]])
-AC_SUBST([+NameCUpper+]_CFLAGS)
-AC_SUBST([+NameCUpper+]_LIBS)
 [+ENDIF+]
 
 AC_OUTPUT([

Modified: trunk/plugins/project-wizard/templates/xlib/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/xlib/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/xlib/configure.ac.tpl	Sun Jul  6 13:25:36 2008
@@ -36,8 +36,6 @@
 
 [+IF (=(get "HavePackage") "1")+]
 PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+] [+PackageModule3+] [+PackageModule4+] [+PackageModule5+]])
-AC_SUBST([+NameCUpper+]_CFLAGS)
-AC_SUBST([+NameCUpper+]_LIBS)
 [+ENDIF+]
 
 AC_OUTPUT([