Mercurial > pidgin
diff autogen.sh @ 29107:339cb6c7f0fd
merge of '6aa03fdea8a7360d07b6a8c72cfd0796a2990753'
and 'c047500743d38f32ef46dd29915364cca00299a8'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Wed, 16 Sep 2009 15:44:34 +0000 |
| parents | a709dc0bb3f3 |
| children | 47c988cae716 |
line wrap: on
line diff
--- a/autogen.sh Wed Sep 16 15:44:26 2009 +0000 +++ b/autogen.sh Wed Sep 16 15:44:34 2009 +0000 @@ -129,6 +129,7 @@ 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 ${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"}