diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-10-22 00:10:33 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-11-07 22:27:49 +0100 |
| commit | 8c4a57b73443c9095fe80274f16c119a23b204aa (patch) | |
| tree | e3ab9988753af4506ff6e652078fc8c31ec556e4 /configure.ac | |
| parent | ae171a9c1bec28e6ac4daf30d11c67230d108cae (diff) | |
| download | libgphoto2-8c4a57b73443c9095fe80274f16c119a23b204aa.tar.gz | |
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.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 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 |