1From 31a5d2f7db18737aef08c34e8707b4f69f7e5156 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Sun, 21 Oct 2012 17:59:20 +0200
4Subject: [PATCH] configure.ac: remove AM_PO_SUBDIRS
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9together 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
14Upstream-Status: Inappropriate [configuration]
15
16Signed-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--- a/configure.ac
23+++ b/configure.ac
24@@ -282,7 +282,6 @@ dnl ------------------------------------
25 GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2],
26                  [${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],
27                  [po])
28-AM_PO_SUBDIRS()
29 AM_GNU_GETTEXT_VERSION([0.19.1])
30 AM_GNU_GETTEXT([external])
31 AM_ICONV()
32--- a/libgphoto2_port/configure.ac
33+++ b/libgphoto2_port/configure.ac
34@@ -122,7 +122,6 @@ dnl ------------------------------------
35 GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2_PORT],
36                  [${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],
37                  [po])
38-AM_PO_SUBDIRS()
39 AM_GNU_GETTEXT_VERSION([0.19.1])
40 AM_GNU_GETTEXT([external])
41 AM_ICONV()
42