49 lines
2.4 KiB
Diff
49 lines
2.4 KiB
Diff
|
From 31a5d2f7db18737aef08c34e8707b4f69f7e5156 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||
|
|
Date: Sun, 21 Oct 2012 17:59:20 +0200
|
||
|
|
Subject: [PATCH] configure.ac: remove AM_PO_SUBDIRS
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
together with oe autotools.bbclass this is done twice and causes:
|
||
|
|
|
||
|
|
| 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
|
||
|
|
| configure.ac:230: error: `po-directories' is already registered with AC_CONFIG_COMMANDS.
|
||
|
|
|
||
|
|
Upstream-Status: Inapropriate [configuration]
|
||
|
|
|
||
|
|
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||
|
|
---
|
||
|
|
configure.ac | 1 -
|
||
|
|
libgphoto2_port/configure.ac | 1 -
|
||
|
|
2 files changed, 0 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 2f8e1b8..2e90acf 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -209,7 +209,6 @@ ALL_LINGUAS="cs da de es eu fr hu it ja nl pl ru sv uk vi zh_CN"
|
||
|
|
GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}])
|
||
|
|
AM_GNU_GETTEXT_VERSION([0.14.1])
|
||
|
|
AM_GNU_GETTEXT([external])
|
||
|
|
-AM_PO_SUBDIRS()
|
||
|
|
AM_ICONV()
|
||
|
|
GP_GETTEXT_FLAGS()
|
||
|
|
|
||
|
|
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
|
||
|
|
index 0b66d58..df47357 100644
|
||
|
|
--- a/libgphoto2_port/configure.ac
|
||
|
|
+++ b/libgphoto2_port/configure.ac
|
||
|
|
@@ -124,7 +124,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],[Lutz Mueller and ot
|
||
|
|
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"
|
||
|
|
AM_GNU_GETTEXT_VERSION([0.14.1])
|
||
|
|
AM_GNU_GETTEXT([external])
|
||
|
|
-AM_PO_SUBDIRS()
|
||
|
|
AM_ICONV()
|
||
|
|
GP_GETTEXT_FLAGS()
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.4.4
|
||
|
|
|