pidgin: 02c7d0ff: Add a sed line to our autogen.sh script ...

markdoliner at pidgin.im markdoliner at pidgin.im
Sat Sep 5 18:11:52 EDT 2009


-----------------------------------------------------------------
Revision: 02c7d0fff81a8bc2cee5c6bfa4bf3032c9b884c7
Ancestor: 95470d310d5d3a229c0b9fc4232da9bfeafaeb5b
Author: markdoliner at pidgin.im
Date: 2009-09-05T22:08:32
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/02c7d0fff81a8bc2cee5c6bfa4bf3032c9b884c7

Modified files:
        autogen.sh

ChangeLog: 

Add a sed line to our autogen.sh script to hopefully avoid ever creating
tarballs without working languages in the future.  Fixes #9520.

-------------- next part --------------
============================================================
--- autogen.sh	65c224111781a5cd026314dba7e4c976eded41bc
+++ autogen.sh	af752cae6b2e1c098fcd355ceb93b5df70d07179
@@ -129,6 +129,7 @@ check "intltoolize";		INTLTOOLIZE=${BIN}
 check "$libtoolize";		LIBTOOLIZE=${BIN};
 check "glib-gettextize";	GLIB_GETTEXTIZE=${BIN};
 check "intltoolize";		INTLTOOLIZE=${BIN};
+check "sed";				SED=${BIN};
 check "aclocal";		ACLOCAL=${BIN};
 check "autoheader";		AUTOHEADER=${BIN};
 check "automake";		AUTOMAKE=${BIN};
@@ -140,6 +141,9 @@ run_or_die ${INTLTOOLIZE} ${INTLTOOLIZE_
 run_or_die ${LIBTOOLIZE} ${LIBTOOLIZE_FLAGS:-"-c -f --automake"}
 run_or_die ${GLIB_GETTEXTIZE} ${GLIB_GETTEXTIZE_FLAGS:-"--force --copy"}
 run_or_die ${INTLTOOLIZE} ${INTLTOOLIZE_FLAGS:-"-c -f --automake"}
+# This call to sed is needed to work around an annoying bug in intltool 0.40.6
+# See http://developer.pidgin.im/ticket/9520 for details
+run_or_die ${SED} "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in
 run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS:-"-I m4macros"}
 run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS}
 run_or_die ${AUTOMAKE} ${AUTOMAKE_FLAGS:-"-a -c --gnu"}


More information about the Commits mailing list