[libgdata] [build] Remove intltool scripts, introspection.m4, and rename COPYING.LIB



commit 9a386001d802eca9075253c868696dac5b67ef22
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Jan 3 13:17:30 2010 +0000

    [build] Remove intltool scripts, introspection.m4, and rename COPYING.LIB
    
    Remove mention of the intltool scripts from the Makefile, since
    intltool >= 0.40.0 doesn't require them to be in-tree. Rename COPYING.LIB to
    COPYING to be more standardised, and remove introspection.m4 from the tree
    since it too can be installed system-wide.

 COPYING.LIB => COPYING |    0
 Makefile.am            |    9 -----
 autogen.sh             |    1 +
 configure.ac           |    4 +-
 introspection.m4       |   94 ------------------------------------------------
 5 files changed, 3 insertions(+), 105 deletions(-)
---
diff --git a/COPYING.LIB b/COPYING
similarity index 100%
rename from COPYING.LIB
rename to COPYING
diff --git a/Makefile.am b/Makefile.am
index 62900b6..9410ebb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -428,13 +428,7 @@ endif
 
 # Cleaning
 EXTRA_DIST += \
-	COPYING.LIB		\
 	autogen.sh		\
-	intltool-extract.in	\
-	intltool-merge.in	\
-	intltool-update.in	\
-	AUTHORS 		\
-	NEWS			\
 	HACKING			\
 	gtk-doc.make		\
 	libgdata.doap
@@ -443,9 +437,6 @@ CLEANFILES += \
 	`find "$(srcdir)" -type f -name .dirstamp -print`
 
 DISTCLEANFILES = \
-	intltool-extract	\
-	intltool-merge		\
-	intltool-update		\
 	gnome-doc-utils.make	\
 	gtk-doc.make
 
diff --git a/autogen.sh b/autogen.sh
index 4b2db91..57734c1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="gdata"
+REQUIRED_M4MACROS=introspection.m4
 
 (test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
diff --git a/configure.ac b/configure.ac
index 5240ca9..4631a97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ GETTEXT_PACKAGE=gdata
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
 AC_SUBST(GETTEXT_PACKAGE)
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.0])
 
 AC_PROG_CXX
 AM_PROG_CC_C_O
@@ -107,7 +107,7 @@ GNOME_COMPILE_WARNINGS([maximum])
 GNOME_CXX_WARNINGS
 GNOME_MAINTAINER_MODE_DEFINES
 
-GOBJECT_INTROSPECTION_CHECK([0.6.3])
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([AM_CFLAGS])



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]