Added GNOME_COMMON_INIT macro.

Removed configuration artifacts from 0.4.x.
Added minimum Bonobo version.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@83 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/acconfig.h b/glabels2/acconfig.h
index f1e1b98ed468bfe543abd61c145882ac533e9eac..5d5943a5c1d01853f3300fa8c2d4c8074b6769c5 100644 (file)
--- a/glabels2/acconfig.h
+++ b/glabels2/acconfig.h
@@ -6,7 +6,4 @@
 #undef PACKAGE
 #undef VERSION
 #undef HAVE_LIBSM
-#undef PACKAGE_LOCALE_DIR
-#undef PACKAGE_DATA_DIR
-#undef PACKAGE_SOURCE_DIR
 #undef GETTEXT_PACKAGE

diff --git a/glabels2/configure.in b/glabels2/configure.in
index 806b84be5a0a106aad00e734ed1baea82ed3a9c6..5ab70977479d8cff2175f0a946590f155e722232 100644 (file)
--- a/glabels2/configure.in
+++ b/glabels2/configure.in
@@ -12,6 +12,7 @@ AM_CONFIG_HEADER(config.h)
 AC_PROG_INTLTOOL([0.21])
 
 GNOME_PLATFORM_GNOME_2(yes, force)
+GNOME_COMMON_INIT
 
 AC_ISC_POSIX
 AC_PROG_CC
@@ -30,6 +31,7 @@ dnl *******************************************************************
 dnl Minimum versions of libraries
 GTK_REQUIRED=2.0.5
 LIBGNOMEUI_REQUIRED=2.0.1
+LIBBONOBO_REQUIRED=2.0.0
 LIBXML_REQUIRED=2.4.23
 LIBGNOMEPRINT_REQUIRED=1.115.0
 LIBGNOMEPRINTUI_REQUIRED=1.115.0
@@ -38,6 +40,7 @@ GDKPIXBUF_REQUIRED=2.0.5
                
 PKG_CHECK_MODULES(GLABELS, gtk+-2.0 >= $GTK_REQUIRED
                           libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+                          libbonobo-2.0 >= $LIBBONOBO_REQUIRED
                           libxml-2.0 >= $LIBXML_REQUIRED
                           libgnomeprint-2.0 >= $LIBGNOMEPRINT_REQUIRED
                           libgnomeprintui-2.0 >= $LIBGNOMEPRINTUI_REQUIRED
@@ -57,17 +60,6 @@ ALL_LINGUAS="fr de ja pt_BR es ru zh_TW.Big5 pl"
 AM_GLIB_GNU_GETTEXT
 
 
-dnl ****************************************
-dnl * Set PACKAGE_LOCALE_DIR in config.h.
-dnl ****************************************
-if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale")
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/${DATADIRNAME}")
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale")
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/${DATADIRNAME}")
-fi
-
 
 dnl ****************************************
 dnl * Configure barcode library