intltool r729 - trunk

[dobey svn gnome org]

Author: dobey
Date: Sat Apr 12 03:26:35 2008
New Revision: 729
URL: http://svn.gnome.org/viewvc/intltool?rev=729&view=rev

Log:
2008-04-11  Rodney Dawes  <dobey pwns gmail com>

	* configure.in:
	Up version to 0.39.99 to avoid conflicts with 0.3x.y versions
	
	* Makefile.am:
	Don't distribute the *.in scripts any longer
	Clean up the sed replacing
	We don't use *.in.in for scripts any longer, just *.in

	* intltool.m4:
	Update the version check to use intltool-update --version instead
	Check for the intltool scripts in PATH instead of local copies
	Remove the AC_CONFIG_COMMANDS to create the local script copies

	* intltool-*.in:
	* intltool-*.in.in:
	Rename all the *.in.in scripts to just *.in

	* intltoolize.in:
	Only copy Makefile.in.in to a project's distribution

	Fixes #490620



Added:
   trunk/intltool-extract.in
      - copied unchanged from r727, /trunk/intltool-extract.in.in
   trunk/intltool-merge.in
      - copied unchanged from r727, /trunk/intltool-merge.in.in
   trunk/intltool-update.in
      - copied unchanged from r727, /trunk/intltool-update.in.in
Removed:
   trunk/intltool-extract.in.in
   trunk/intltool-merge.in.in
   trunk/intltool-update.in.in
Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/intltool.m4
   trunk/intltoolize.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Apr 12 03:26:35 2008
@@ -19,36 +19,24 @@
 
 # These are required by intltoolize
 dist_pkgdata_DATA =	Makefile.in.in
-nodist_pkgdata_DATA =	$(distributed_scripts:=.in)
 
 # This macro file should be visible to Automake's aclocal.
 dist_aclocal_DATA = intltool.m4
 
 CLEANFILES =					\
 	$(bin_SCRIPTS)				\
-	$(EXTRA_SCRIPTS)			\
-	$(nodist_pkgdata_DATA)
+	$(EXTRA_SCRIPTS)
 
 EXTRA_DIST =					\
-	$(distributed_scripts:=.in.in)		\
+	$(distributed_scripts:=.in)		\
 	intltool-prepare.in			\
 	intltool-unicodify.in			\
 	intltool.spec
 
-edit_in_in = sed -e 's|[ ]PACKAGE@|$(PACKAGE)|g' \
-	    -e 's|[ ]VERSION@|$(VERSION)|g'
-
-edit = $(edit_in_in) -e "s|[ ]INTLTOOL_PERL@|$(PERL)|g" \
-	    -e "s|[ ]INTLTOOL_LIBDIR@|$(libdir)|g"
-
-intltool-extract.in: intltool-extract.in.in Makefile
-	$(edit_in_in) "$(srcdir)/intltool-extract.in.in" > $@
-
-intltool-merge.in: intltool-merge.in.in Makefile
-	$(edit_in_in) "$(srcdir)/intltool-merge.in.in" > $@
-
-intltool-update.in: intltool-update.in.in Makefile
-	$(edit_in_in) "$(srcdir)/intltool-update.in.in" > $@
+edit = sed -e 's|[ ]PACKAGE@|$(PACKAGE)|g' \
+	   -e 's|[ ]VERSION@|$(VERSION)|g' \
+	   -e "s|[ ]INTLTOOL_PERL@|$(PERL)|g" \
+	   -e "s|[ ]INTLTOOL_LIBDIR@|$(libdir)|g"
 
 %: %.in Makefile
 	$(edit) < $< > $@

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Apr 12 03:26:35 2008
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to create configure.
 AC_INIT(intltoolize.in)
-INTLTOOL_VERSION=0.37.0
+INTLTOOL_VERSION=0.39.99
 
 AM_INIT_AUTOMAKE(intltool, $INTLTOOL_VERSION)
 

Modified: trunk/intltool.m4
==============================================================================
--- trunk/intltool.m4	(original)
+++ trunk/intltool.m4	Sat Apr 12 03:26:35 2008
@@ -39,14 +39,21 @@
     AC_MSG_CHECKING([for intltool >= $1])
 
     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
     ]
     AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
 	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
 fi
 
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
+fi
+
   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
      INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
@@ -101,12 +108,7 @@
     AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
 fi
 
-# Use the tools built into the package, not the ones that are installed.
-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
+AC_PATH_PROG(INTLTOOL_PERL, [perl])
 if test -z "$INTLTOOL_PERL"; then
    AC_MSG_ERROR([perl not found; required for intltool])
 fi
@@ -152,42 +154,6 @@
 
 IT_PO_SUBDIR([po])
 
-dnl The following is very similar to
-dnl
-dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
-dnl
-dnl with the following slight differences:
-dnl  - the *.in files are in ac_aux_dir,
-dnl  - if the file haven't changed upon reconfigure, it's not touched,
-dnl  - the evaluation of the third parameter enables a hack which computes
-dnl    the actual value of $libdir,
-dnl  - the user sees "executing intltool commands", instead of
-dnl    "creating intltool-extract" and such.
-dnl
-dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
-dnl a reason for it.
-
-AC_CONFIG_COMMANDS([intltool], [
-
-for file in intltool-extract intltool-merge intltool-update; do
-  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
-	< ${ac_aux_dir}/${file}.in > ${file}.out
-  if cmp -s ${file} ${file}.out 2>/dev/null; then
-    rm -f ${file}.out
-  else
-    mv -f ${file}.out ${file}
-  fi
-  chmod ugo+x ${file}
-  chmod u+w ${file}
-done
-
-],
-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
-
 ])
 
 

Modified: trunk/intltoolize.in
==============================================================================
--- trunk/intltoolize.in	(original)
+++ trunk/intltoolize.in	Sat Apr 12 03:26:35 2008
@@ -152,7 +152,7 @@
 fi
 
 
-files='intltool-extract.in intltool-merge.in intltool-update.in po/Makefile.in.in'
+files='po/Makefile.in.in'
 
 auxdir=.
 auxdirline=`egrep '^AC_CONFIG_AUX_DIR' $configure 2>/dev/null`