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 together with the gettext
setup.

configure.ac

@@ -218,12 +218,14 @@ dnl ---------------------------------------------------------------------------
 GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],
                 [The gPhoto Team],
                 [${MAIL_GPHOTO_TRANSLATION}])
-AM_PO_SUBDIRS()
 AM_GNU_GETTEXT_VERSION([0.18.3])
+AM_PO_SUBDIRS()
 AM_GNU_GETTEXT([external])
 AM_ICONV()
 GP_GETTEXT_FLAGS()
 
+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:
@@ -234,8 +236,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
 
-AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\""
-
 AC_SYS_LARGEFILE
 
 AC_MSG_CHECKING([for asm .symver support])

libgphoto2_port/configure.ac

@@ -131,8 +131,8 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],
                 [Lutz Mueller and others],
                 [${MAIL_GPHOTO_TRANSLATION}])
 AM_GNU_GETTEXT_VERSION([0.18.3])
-AM_GNU_GETTEXT([external])
 AM_PO_SUBDIRS()
+AM_GNU_GETTEXT([external])
 AM_ICONV()
 GP_GETTEXT_FLAGS()