autotools: require a less deprecated gettext and move stuff to be in a more coherent place.

1 files changed, 19 insertions, 20 deletions

diff --git a/configure.ac b/configure.ac
index b40466cb1..03c8ad751 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,12 +131,29 @@ AM_CONDITIONAL([HAVE_FREEBSD], [test "x${have_freebsd}" = "xyes"])
 AC_SUBST([ELM_UNIX_DEF])
 AC_SUBST([ELM_WIN32_DEF])
 
-
 ### Checks for programs
 
+# compilers
+AC_PROG_CC
+AC_PROG_CC_STDC
+AC_PROG_CXX
+
+EFL_CXX_COMPILE_STDCXX_11([ext])
+
+# pkg-config
+PKG_PROG_PKG_CONFIG
+
+# Check whether pkg-config supports Requires.private
+if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
+   pkgconfig_requires_private="Requires.private"
+else
+   pkgconfig_requires_private="Requires"
+fi
+AC_SUBST([pkgconfig_requires_private])
+
 # gettext
 m4_ifdef([AM_GNU_GETTEXT_VERSION], [
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.18])
 ])
 
 m4_ifdef([AM_GNU_GETTEXT], [
@@ -154,24 +171,6 @@ fi
 
 AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
 
-# compilers
-AC_PROG_CC
-AC_PROG_CC_STDC
-AC_PROG_CXX
-
-EFL_CXX_COMPILE_STDCXX_11([ext])
-
-# pkg-config
-PKG_PROG_PKG_CONFIG
-
-# Check whether pkg-config supports Requires.private
-if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
-   pkgconfig_requires_private="Requires.private"
-else
-   pkgconfig_requires_private="Requires"
-fi
-AC_SUBST([pkgconfig_requires_private])
-
 # doxygen
 EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])