Log:
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
Author: caro
Date: 2012-02-23 00:04:35 -0800 (Thu, 23 Feb 2012)
New Revision: 68312
Trac: http://trac.enlightenment.org/e/changeset/68312
Modified:
trunk/ecore/configure.ac
Modified: trunk/ecore/configure.ac
===================================================================
--- trunk/ecore/configure.ac 2012-02-23 07:47:59 UTC (rev 68311)
+++ trunk/ecore/configure.ac 2012-02-23 08:04:35 UTC (rev 68312)
@@ -275,30 +275,6 @@
requirements_ecore_imf_scim=""
requirements_ecore_wayland=""
-AC_CHECK_DECL([MAXHOSTNAMELEN],[FOUND_MAXHOSTNAMELEN=yes])
-
-if test x$FOUND_MAXHOSTNAMELEN != xyes ; then
- AC_MSG_CHECKING([for header that defines MAXHOSTNAMELEN])
-
- FOUND_MAXHOSTNAMELEN='not found'
-
- AC_COMPILE_IFELSE(
- AC_LANG_PROGRAM([#include <sys/param.h>],
- [int h = MAXHOSTNAMELEN;]),
- [FOUND_MAXHOSTNAMELEN='sys/param.h'
- AC_DEFINE(NEED_SYS_PARAM_H,1,
- [Define to 1 if you need <sys/param.h> to define MAXHOSTNAMELEN])])
-
- AC_COMPILE_IFELSE(
- AC_LANG_PROGRAM([#include <netdb.h>],
- [int h = MAXHOSTNAMELEN;]),
- [FOUND_MAXHOSTNAMELEN='netdb.h'
- AC_DEFINE(NEED_NETDB_H,1,
- [Define to 1 if you need <netdb.h> to define MAXHOSTNAMELEN])])
-
- AC_MSG_RESULT([$FOUND_MAXHOSTNAMELEN])
-fi
-
### Additional options to configure
want_glib_integration_always=no
@@ -379,10 +355,6 @@
AC_DEFINE([ENABLE_XIM], [1], [Enable X Input Method])
fi
-# Unit tests
-
-EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
-
### Checks for programs
m4_ifdef([AC_PROG_OBJC],
@@ -639,6 +611,45 @@
# Xlib and XCB (ecore_x)
+AC_CHECK_DECL([MAXHOSTNAMELEN], [FOUND_MAXHOSTNAMELEN=yes])
+
+if test "x${FOUND_MAXHOSTNAMELEN}" != "xyes" ; then
+ AC_MSG_CHECKING([for header that defines MAXHOSTNAMELEN])
+ FOUND_MAXHOSTNAMELEN="not found"
+
+ AC_COMPILE_IFELSE(
+ [
+ AC_LANG_PROGRAM(
+ [[
+#include <sys/param.h>
+ ]],
+ [[
+int h = MAXHOSTNAMELEN;
+ ]])
+ ],
+ [
+ FOUND_MAXHOSTNAMELEN="sys/param.h"
+ AC_DEFINE([NEED_SYS_PARAM_H], [1], [Define to 1 if you need <sys/param.h> to define MAXHOSTNAMELEN])
+ ])
+
+ AC_COMPILE_IFELSE(
+ [
+ AC_LANG_PROGRAM(
+ [[
+#include <netdb.h>
+ ]],
+ [[
+int h = MAXHOSTNAMELEN;
+ ]])
+ ],
+ [
+ FOUND_MAXHOSTNAMELEN="netdb.h"
+ AC_DEFINE([NEED_NETDB_H], [1], [Define to 1 if you need <netdb.h> to define MAXHOSTNAMELEN])
+ ])
+
+ AC_MSG_RESULT([$FOUND_MAXHOSTNAMELEN])
+fi
+
have_x="no"
have_ecore_x="no"
have_ecore_x_xlib="no"
@@ -1875,6 +1886,7 @@
dnl THIS IS SPECIAL - dont use normal ECORE_EVAS_CHECK_MODULE
have_ecore_evas_extn="no"
if test "x${want_ecore_evas_extn}" = "xyes" && \
+ test "x${have_extn}" = "xyes" && \
test "x${have_ecore_evas}" = "xyes"; then
AC_DEFINE([BUILD_ECORE_EVAS_EXTN], [1], [Support for Extn Engine in Ecore_Evas])
have_ecore_evas_extn="yes"
@@ -1921,6 +1933,10 @@
fi
])
+### Unit tests
+
+EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
+
### install and build examples
EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"])
|