Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
configure.in
Log Message:
Better grouping of ecore_libs, have all the nasty evas stuff at the end.
Remove bogus iconv tests.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/configure.in,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -3 -r1.227 -r1.228
--- configure.in 5 Nov 2007 19:12:59 -0000 1.227
+++ configure.in 5 Nov 2007 19:21:16 -0000 1.228
@@ -136,6 +136,27 @@
AC_SUBST(create_shared_lib)
AC_SUBST(ecore_file_win32_lib)
+dnl ecore_job
+ECORE_CHECK_MODULE([Job], [yes])
+
+dnl ecore_con
+ECORE_CHECK_MODULE([Con], [yes])
+
+dnl ecore_ipc
+ECORE_CHECK_MODULE([Ipc], [yes], [$have_ecore_con])
+
+dnl ecore_config
+PKG_CHECK_MODULES(EET, [eet >= 0.9.10],
+ [ have_eet="yes" ],
+ [ have_eet="no" ]
+)
+ecore_config_deps="no"
+if test "x$have_eet" = "xyes" -a "x$have_ecore_ipc" = "xyes" ; then
+ ecore_config_deps="yes"
+fi
+ECORE_CHECK_MODULE([Config], [yes], [$ecore_config_deps],
+ [requirements_ecore_config="$requirements_ecore_config ecore-ipc eet"])
+
dnl ecore_txt
iconv_cflags=""
iconv_libs=""
@@ -149,9 +170,8 @@
)
if test "x$have_iconv" = "xno" ; then
- AC_CHECK_LIB(iconv, libiconv,
+ AC_CHECK_LIB(c, iconv,
[
- iconv_libs="-liconv"
have_iconv="yes"
]
)
@@ -164,22 +184,6 @@
]
)
fi
-
- if test "x$have_iconv" != "xyes"; then
- AC_CHECK_LIB(c, libiconv,
- [
- have_iconv="yes"
- ]
- )
- fi
-
- if test "x$have_iconv" != "xyes"; then
- AC_CHECK_LIB(c, iconv,
- [
- have_iconv="yes"
- ]
- )
- fi
fi
AC_MSG_CHECKING(for explicit iconv link options)
AC_MSG_RESULT($iconv_libs)
@@ -401,8 +405,6 @@
AC_DEFINE(BUILD_ECORE_EVAS_DIRECT3D, 1, [Support for Direct3D Engine in
Ecore_Evas])
fi
-ECORE_CHECK_MODULE([Job], [yes])
-
PKG_CHECK_MODULES(DIRECTFB, directfb >= 0.9.16,
[ have_directfb="yes" ],
[ have_directfb="no" ]
@@ -684,23 +686,6 @@
]
)
fi
-
-ECORE_CHECK_MODULE([Con], [yes])
-
-ECORE_CHECK_MODULE([Ipc], [yes], [$have_ecore_con])
-
-PKG_CHECK_MODULES(EET, [eet >= 0.9.10],
- [ have_eet="yes" ],
- [ have_eet="no" ]
-)
-
-ecore_config_deps="no"
-if test "x$have_eet" = "xyes" -a "x$have_ecore_ipc" = "xyes" ; then
- ecore_config_deps="yes"
-fi
-ECORE_CHECK_MODULE([Config], [yes], [$ecore_config_deps],
- [requirements_ecore_config="$requirements_ecore_config ecore-ipc eet"])
-
dnl ecore_file
ECORE_CHECK_MODULE([File], [yes])
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
