[anjuta] Remove gnome library from new gnome applet project

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 6e10e963a3e221df1f6be819b2dd9ececef55499
Author: Sébastien Granjoux <seb sfo free fr>
Date:   Sun Jul 12 18:45:30 2009 +0200

    Remove gnome library from new gnome applet project

 plugins/project-wizard/templates/gnome-applet.wiz  |    4 ++--
 .../templates/gnome-applet/configure.ac.tpl        |   15 +++++++--------
 plugins/project-wizard/templates/m4/Makefile.am    |    3 ++-
 .../project-wizard/templates/m4/ac-define-dir.m4   |   12 ++++++++++++
 4 files changed, 23 insertions(+), 11 deletions(-)
---
diff --git a/plugins/project-wizard/templates/gnome-applet.wiz b/plugins/project-wizard/templates/gnome-applet.wiz
index 7286952..9315921 100644
--- a/plugins/project-wizard/templates/gnome-applet.wiz
+++ b/plugins/project-wizard/templates/gnome-applet.wiz
@@ -6,7 +6,6 @@
 	<required-program>automake</required-program>
 	<required-program>autoconf</required-program>
 	<required-program>make</required-program>
-	<required-package>libgnome-2.0 >= 2.14</required-package>
 	<required-package>libpanelapplet-2.0 >= 2.14</required-package>	
 </project-wizard>
 
@@ -34,7 +33,7 @@
 	<property type="icon" name="Icon" _label="Icon File:" _description="Icon file for the plugin" summary="yes" mandatory="yes"/>
 	<property type="string" name="Title" _label="Applet Title:" _description="Display title of the applet" default="GNOME Applet" summary="yes" mandatory="yes"/>
 	<property type="string" name="Description" _label="Description:" _description="Display description of the applet" default="A sample demonstration GNOME applet created by Anjuta" summary="yes" mandatory="yes"/>
-	<property type="hidden" name="PackageModule1" default="libgnome-2.0 >= 2.14 libpanelapplet-2.0 >= 2.14"/>
+	<property type="hidden" name="PackageModule1" default="libpanelapplet-2.0 >= 2.14"/>
 	<property type="boolean" name="HaveLangCPP" _label="Add C++ support:" _description="Adds C++ support to the project so that C++ source files can be built" default="0"/>
 	<property type="boolean" name="HaveI18n" _label="Add internationalization:" _description="Adds support for internationalization so that your project can have translations in different languages" default="1"/>
 	<property type="boolean" name="HavePackageExtra" _label="Configure external packages:" _description="Use pkg-config to add library support from other packages" default="0"/>
@@ -72,6 +71,7 @@
 	<directory source="." destination="[+Destination+]">
 		<directory source="m4">
 			<file source="as-ac-expand.m4"/>
+			<file source="ac-define-dir.m4"/>
 		</directory>
 	</directory>
 	<directory source="gnome-applet" destination="[+Destination+]">
diff --git a/plugins/project-wizard/templates/gnome-applet/configure.ac.tpl b/plugins/project-wizard/templates/gnome-applet/configure.ac.tpl
index d1053e1..dcbf100 100644
--- a/plugins/project-wizard/templates/gnome-applet/configure.ac.tpl
+++ b/plugins/project-wizard/templates/gnome-applet/configure.ac.tpl
@@ -20,6 +20,13 @@ AC_PROG_CPP
 AC_PROG_CXX
 [+ENDIF+]
 
+[+IF (=(get "HavePackage") "1")+]
+PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+] [+PackageModule3+] [+PackageModule4+] [+PackageModule5+]])
+[+ENDIF+]
+
+AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
+AC_SUBST(LIBEXECDIR)
+
 [+IF (=(get "HaveI18n") "1")+]
 dnl ***************************************************************************
 dnl Internatinalization
@@ -32,14 +39,6 @@ AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
 [+ENDIF+]
 
-PKG_CHECK_MODULES(GNOME_APPLETS, libpanelapplet-2.0) 
-[+IF (=(get "HavePackage") "1")+]
-PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+] [+PackageModule3+] [+PackageModule4+] [+PackageModule5+]])
-[+ENDIF+]
-
-AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
-AC_SUBST(LIBEXECDIR)
-
 AC_OUTPUT([
 Makefile
 src/Makefile
diff --git a/plugins/project-wizard/templates/m4/Makefile.am b/plugins/project-wizard/templates/m4/Makefile.am
index 3b31d24..f86221f 100644
--- a/plugins/project-wizard/templates/m4/Makefile.am
+++ b/plugins/project-wizard/templates/m4/Makefile.am
@@ -1,7 +1,8 @@
 wizard_filesdir = $(anjuta_data_dir)/project/m4
 
 wizard_files_DATA = \
-	as-ac-expand.m4
+	as-ac-expand.m4 \
+	ac-define-dir.m4
 
 EXTRA_DIST = $(wizard_files_DATA)
 
diff --git a/plugins/project-wizard/templates/m4/ac-define-dir.m4 b/plugins/project-wizard/templates/m4/ac-define-dir.m4
new file mode 100644
index 0000000..a8969e1
--- /dev/null
+++ b/plugins/project-wizard/templates/m4/ac-define-dir.m4
@@ -0,0 +1,12 @@
+dnl from ac-archives
+AC_DEFUN([AC_DEFINE_DIR], [
+  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+  ac_define_dir=`eval echo [$]$2`
+  ac_define_dir=`eval echo [$]ac_define_dir`
+  $1="$ac_define_dir"
+  AC_SUBST($1)
+  ifelse($3, ,
+    AC_DEFINE_UNQUOTED($1, "$ac_define_dir"),
+    AC_DEFINE_UNQUOTED($1, "$ac_define_dir", $3))
+])