From 8c4a57b73443c9095fe80274f16c119a23b204aa Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Fri, 22 Oct 2021 00:10:33 +0200
Subject: Use the same gettext setup

This puts AM_PO_SUBDIRS before AM_GNU_GETTEXT to fix the

    error: `po-directories' is already registered with AC_CONFIG_COMMANDS.

and puts the -DLOCALEDIR definition close to the gettext
setup.
---
 configure.ac                 | 6 +++---
 libgphoto2_port/configure.ac | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 352229a74..54501e5fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,6 +274,9 @@ AM_GNU_GETTEXT([external])
 AM_ICONV()
 GP_GETTEXT_FLAGS()
 
+AC_SUBST([localedir],["\$(datadir)/locale"])
+AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\""
+
 dnl FIXME: We have to make sure this works first
 dnl AC_CHECK_FUNC(gettext, gettext_without_libintl=true)
 # same trick as with libdl:
@@ -284,9 +287,6 @@ dnl if test "x$gettext_without_libintl" != xtrue && test "x$USE_NLS" = xyes; the
 dnl        AC_CHECK_LIB([intl], [gettext], [INTLLIBS="$INTLLIBS -lintl"])
 dnl fi
 
-AC_SUBST([localedir],["\$(datadir)/locale"])
-AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\""
-
 AC_SYS_LARGEFILE
 
 GP_ASM_SYMVER_SUPPORT
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
index ab83dafe9..3327cb53b 100644
--- a/libgphoto2_port/configure.ac
+++ b/libgphoto2_port/configure.ac
@@ -136,14 +136,14 @@ dnl AC_SUBST(BUILD_INCLUDED_LIBINTL)
 dnl USE_INCLUDED_LIBINTL=no
 dnl AC_SUBST(USE_INCLUDED_LIBINTL)
 
+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"
 GP_GETTEXT_HACK([GETTEXT_PACKAGE_LIBGPHOTO2_PORT],
                 [${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],
                 [Lutz Mueller and others],
                 [${MAIL_GPHOTO_TRANSLATION}])
-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_PO_SUBDIRS()
 AM_GNU_GETTEXT_VERSION([0.14.1])
 AM_GNU_GETTEXT([external])
-AM_PO_SUBDIRS()
 AM_ICONV()
 GP_GETTEXT_FLAGS()
 
-- 
cgit v1.2.1