summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2014-09-02 12:37:34 +0200
committerCedric BAIL <cedric@osg.samsung.com>2014-09-02 12:37:34 +0200
commit766685cb94f7af1a8a3e4ad6c0385bfc4e3b1cbf (patch)
tree7b1074b017124e4e9e85f2eed51f294d3aa0f5bb /configure.ac
parent4d9b5eccb8ae901bb53461369917d6ba1a4c96fe (diff)
autotools: require a less deprecated gettext and move stuff to be in a more coherent place.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac39
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"])
131AC_SUBST([ELM_UNIX_DEF]) 131AC_SUBST([ELM_UNIX_DEF])
132AC_SUBST([ELM_WIN32_DEF]) 132AC_SUBST([ELM_WIN32_DEF])
133 133
134
135### Checks for programs 134### Checks for programs
136 135
136# compilers
137AC_PROG_CC
138AC_PROG_CC_STDC
139AC_PROG_CXX
140
141EFL_CXX_COMPILE_STDCXX_11([ext])
142
143# pkg-config
144PKG_PROG_PKG_CONFIG
145
146# Check whether pkg-config supports Requires.private
147if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
148 pkgconfig_requires_private="Requires.private"
149else
150 pkgconfig_requires_private="Requires"
151fi
152AC_SUBST([pkgconfig_requires_private])
153
137# gettext 154# gettext
138m4_ifdef([AM_GNU_GETTEXT_VERSION], [ 155m4_ifdef([AM_GNU_GETTEXT_VERSION], [
139AM_GNU_GETTEXT_VERSION([0.17]) 156AM_GNU_GETTEXT_VERSION([0.18])
140]) 157])
141 158
142m4_ifdef([AM_GNU_GETTEXT], [ 159m4_ifdef([AM_GNU_GETTEXT], [
@@ -154,24 +171,6 @@ fi
154 171
155AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"]) 172AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
156 173
157# compilers
158AC_PROG_CC
159AC_PROG_CC_STDC
160AC_PROG_CXX
161
162EFL_CXX_COMPILE_STDCXX_11([ext])
163
164# pkg-config
165PKG_PROG_PKG_CONFIG
166
167# Check whether pkg-config supports Requires.private
168if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
169 pkgconfig_requires_private="Requires.private"
170else
171 pkgconfig_requires_private="Requires"
172fi
173AC_SUBST([pkgconfig_requires_private])
174
175# doxygen 174# doxygen
176EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) 175EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
177 176