summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-02-23 08:04:35 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-02-23 08:04:35 +0000
commitec5cf628d00b891615052783b29805ff900044e7 (patch)
tree4f4d6daeb93a11715ced1c1d1dae68227f70800e
parentee82a4f6ac5a1f746d8280be6d2c89013887a07a (diff)
Ecore: some fixes
* use AC_COMPILE_IFELSE after AC_PROG_CC has been called * use EFL_CHECK_TESTS after pkg-config has been checked * enable ecore_evas_extn only if its dependencies are found SVN revision: 68312
-rw-r--r--legacy/ecore/configure.ac72
1 files changed, 44 insertions, 28 deletions
diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac
index 2fcf89e465..cfad06fbb6 100644
--- a/legacy/ecore/configure.ac
+++ b/legacy/ecore/configure.ac
@@ -275,30 +275,6 @@ requirements_ecore_imf_xim=""
275requirements_ecore_imf_scim="" 275requirements_ecore_imf_scim=""
276requirements_ecore_wayland="" 276requirements_ecore_wayland=""
277 277
278AC_CHECK_DECL([MAXHOSTNAMELEN],[FOUND_MAXHOSTNAMELEN=yes])
279
280if test x$FOUND_MAXHOSTNAMELEN != xyes ; then
281 AC_MSG_CHECKING([for header that defines MAXHOSTNAMELEN])
282
283 FOUND_MAXHOSTNAMELEN='not found'
284
285 AC_COMPILE_IFELSE(
286 AC_LANG_PROGRAM([#include <sys/param.h>],
287 [int h = MAXHOSTNAMELEN;]),
288 [FOUND_MAXHOSTNAMELEN='sys/param.h'
289 AC_DEFINE(NEED_SYS_PARAM_H,1,
290 [Define to 1 if you need <sys/param.h> to define MAXHOSTNAMELEN])])
291
292 AC_COMPILE_IFELSE(
293 AC_LANG_PROGRAM([#include <netdb.h>],
294 [int h = MAXHOSTNAMELEN;]),
295 [FOUND_MAXHOSTNAMELEN='netdb.h'
296 AC_DEFINE(NEED_NETDB_H,1,
297 [Define to 1 if you need <netdb.h> to define MAXHOSTNAMELEN])])
298
299 AC_MSG_RESULT([$FOUND_MAXHOSTNAMELEN])
300fi
301
302### Additional options to configure 278### Additional options to configure
303 279
304want_glib_integration_always=no 280want_glib_integration_always=no
@@ -379,10 +355,6 @@ if test "x${want_xim}" = "xyes" ; then
379 AC_DEFINE([ENABLE_XIM], [1], [Enable X Input Method]) 355 AC_DEFINE([ENABLE_XIM], [1], [Enable X Input Method])
380fi 356fi
381 357
382# Unit tests
383
384EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
385
386### Checks for programs 358### Checks for programs
387 359
388m4_ifdef([AC_PROG_OBJC], 360m4_ifdef([AC_PROG_OBJC],
@@ -639,6 +611,45 @@ PKG_CHECK_MODULES([DIRECTFB],
639 611
640# Xlib and XCB (ecore_x) 612# Xlib and XCB (ecore_x)
641 613
614AC_CHECK_DECL([MAXHOSTNAMELEN], [FOUND_MAXHOSTNAMELEN=yes])
615
616if test "x${FOUND_MAXHOSTNAMELEN}" != "xyes" ; then
617 AC_MSG_CHECKING([for header that defines MAXHOSTNAMELEN])
618 FOUND_MAXHOSTNAMELEN="not found"
619
620 AC_COMPILE_IFELSE(
621 [
622 AC_LANG_PROGRAM(
623 [[
624#include <sys/param.h>
625 ]],
626 [[
627int h = MAXHOSTNAMELEN;
628 ]])
629 ],
630 [
631 FOUND_MAXHOSTNAMELEN="sys/param.h"
632 AC_DEFINE([NEED_SYS_PARAM_H], [1], [Define to 1 if you need <sys/param.h> to define MAXHOSTNAMELEN])
633 ])
634
635 AC_COMPILE_IFELSE(
636 [
637 AC_LANG_PROGRAM(
638 [[
639#include <netdb.h>
640 ]],
641 [[
642int h = MAXHOSTNAMELEN;
643 ]])
644 ],
645 [
646 FOUND_MAXHOSTNAMELEN="netdb.h"
647 AC_DEFINE([NEED_NETDB_H], [1], [Define to 1 if you need <netdb.h> to define MAXHOSTNAMELEN])
648 ])
649
650 AC_MSG_RESULT([$FOUND_MAXHOSTNAMELEN])
651fi
652
642have_x="no" 653have_x="no"
643have_ecore_x="no" 654have_ecore_x="no"
644have_ecore_x_xlib="no" 655have_ecore_x_xlib="no"
@@ -1875,6 +1886,7 @@ fi
1875dnl THIS IS SPECIAL - dont use normal ECORE_EVAS_CHECK_MODULE 1886dnl THIS IS SPECIAL - dont use normal ECORE_EVAS_CHECK_MODULE
1876have_ecore_evas_extn="no" 1887have_ecore_evas_extn="no"
1877if test "x${want_ecore_evas_extn}" = "xyes" && \ 1888if test "x${want_ecore_evas_extn}" = "xyes" && \
1889 test "x${have_extn}" = "xyes" && \
1878 test "x${have_ecore_evas}" = "xyes"; then 1890 test "x${have_ecore_evas}" = "xyes"; then
1879 AC_DEFINE([BUILD_ECORE_EVAS_EXTN], [1], [Support for Extn Engine in Ecore_Evas]) 1891 AC_DEFINE([BUILD_ECORE_EVAS_EXTN], [1], [Support for Extn Engine in Ecore_Evas])
1880 have_ecore_evas_extn="yes" 1892 have_ecore_evas_extn="yes"
@@ -1921,6 +1933,10 @@ ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl], [wayland-egl],
1921 fi 1933 fi
1922 ]) 1934 ])
1923 1935
1936### Unit tests
1937
1938EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
1939
1924### install and build examples 1940### install and build examples
1925 1941
1926EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"]) 1942EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"])