| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 31a5d2f7db18737aef08c34e8707b4f69f7e5156 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
| 3 | Date: Sun, 21 Oct 2012 17:59:20 +0200 |
| 4 | Subject: [PATCH] configure.ac: remove AM_PO_SUBDIRS |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | together with oe autotools.bbclass this is done twice and causes: |
| 10 | |
| 11 | | autoreconf: running: aclocal --system-acdir=/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/aclocal-copy/ --automake-acdir=/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/share/aclocal-1.12 -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ --force -I auto-m4 -I m4m |
| 12 | | configure.ac:230: error: `po-directories' is already registered with AC_CONFIG_COMMANDS. |
| 13 | |
| 14 | Upstream-Status: Inapropriate [configuration] |
| 15 | |
| 16 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> |
| 17 | --- |
| 18 | configure.ac | 1 - |
| 19 | libgphoto2_port/configure.ac | 1 - |
| 20 | 2 files changed, 0 insertions(+), 2 deletions(-) |
| 21 | |
| 22 | diff --git a/configure.ac b/configure.ac |
| 23 | index 2f8e1b8..2e90acf 100644 |
| 24 | --- a/configure.ac |
| 25 | +++ b/configure.ac |
| 26 | @@ -209,7 +209,6 @@ ALL_LINGUAS="cs da de es eu fr hu it ja nl pl ru sv uk vi zh_CN" |
| 27 | GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}]) |
| 28 | AM_GNU_GETTEXT_VERSION([0.14.1]) |
| 29 | AM_GNU_GETTEXT([external]) |
| 30 | -AM_PO_SUBDIRS() |
| 31 | AM_ICONV() |
| 32 | GP_GETTEXT_FLAGS() |
| 33 | |
| 34 | diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac |
| 35 | index 0b66d58..df47357 100644 |
| 36 | --- a/libgphoto2_port/configure.ac |
| 37 | +++ b/libgphoto2_port/configure.ac |
| 38 | @@ -124,7 +124,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],[Lutz Mueller and ot |
| 39 | ALL_LINGUAS="cs da de es eu fi fr it ja nl pl pt_BR ru sk sr sv uk vi zh_CN zh_TW" |
| 40 | AM_GNU_GETTEXT_VERSION([0.14.1]) |
| 41 | AM_GNU_GETTEXT([external]) |
| 42 | -AM_PO_SUBDIRS() |
| 43 | AM_ICONV() |
| 44 | GP_GETTEXT_FLAGS() |
| 45 | |
| 46 | -- |
| 47 | 1.7.4.4 |
| 48 | |