1 files changed, 17 insertions, 14 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 7c99bbdbac..59c5bae8fa 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -166,21 +166,24 @@ autotools_do_configure() {
                else
                        CONFIGURE_AC=configure.ac
                fi
-                if ! echo ${EXTRA_OECONF} | grep -q "\-\-disable-nls"; then
+                if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-                        if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
+                        if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then
-                                if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then
+                                : do nothing -- we still have an old unmodified configure.ac
-                                        : do nothing -- we still have an old unmodified configure.ac
+                        else
-                                else
+                                bbnote Executing glib-gettextize --force --copy
-                                        bbnote Executing glib-gettextize --force --copy
+                                echo "no" | glib-gettextize --force --copy
-                                        echo "no" | glib-gettextize --force --copy
+                        fi
-                                fi
+                else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-                        else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
+                        # We'd call gettextize here if it wasn't so broken...
-                                # We'd call gettextize here if it wasn't so broken...
+                                cp ${STAGING_DATADIR}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
-                                        cp ${STAGING_DATADIR}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
+                                if [ -d ${S}/po/ ]; then
-                                        if [ -d ${S}/po/ -a ! -e ${S}/po/Makefile.in.in ]; then
+                                        cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
-                                                cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
-                                        fi
                                fi
+                                for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do
+                                        for j in `find ${S} -name $i | grep -v aclocal-copy`; do
+                                                rm $j
+                                        done
+                                done
                        fi
                fi
                mkdir -p m4

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 7c99bbdbac..59c5bae8fa 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass
@@ -166,21 +166,24 @@ autotools_do_configure() {
166	else	166	else
167	CONFIGURE_AC=configure.ac	167	CONFIGURE_AC=configure.ac
168	fi	168	fi
169	if ! echo ${EXTRA_OECONF} \| grep -q "\-\-disable-nls"; then	169	if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
170	if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then	170	if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then
171	if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then	171	: do nothing -- we still have an old unmodified configure.ac
172	: do nothing -- we still have an old unmodified configure.ac	172	else
173	else	173	bbnote Executing glib-gettextize --force --copy
174	bbnote Executing glib-gettextize --force --copy	174	echo "no" \| glib-gettextize --force --copy
175	echo "no" \| glib-gettextize --force --copy	175	fi
176	fi	176	else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
177	else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then	177	# We'd call gettextize here if it wasn't so broken...
178	# We'd call gettextize here if it wasn't so broken...	178	cp ${STAGING_DATADIR}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
179	cp ${STAGING_DATADIR}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/	179	if [ -d ${S}/po/ ]; then
180	if [ -d ${S}/po/ -a ! -e ${S}/po/Makefile.in.in ]; then	180	cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
181	cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
182	fi
183	fi	181	fi
		182	for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do
		183	for j in `find ${S} -name $i \| grep -v aclocal-copy`; do
		184	rm $j
		185	done
		186	done
184	fi	187	fi
185	fi	188	fi
186	mkdir -p m4	189	mkdir -p m4