ecore: add @since .

[profile/ivi/ecore.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b44ecc3..e6eddd1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
 m4_define([v_min], [0])
-m4_define([v_mic], [0])
+m4_define([v_mic], [999])
 m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line
-m4_undefine([v_rev])
+dnl m4_undefine([v_rev])
 ##--   When doing snapshots - change soname. remove dnl on below line
 dnl m4_define([relname], [ver-pre-svn-07])
 dnl m4_define([v_rel], [-release relname])
@@ -18,16 +18,21 @@ m4_define([lt_age], v_min)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 
-AC_INIT([ecore], [v_ver-alpha], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([ecore], [v_ver], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AC_ISC_POSIX
+
+AC_CONFIG_HEADERS([config.h])
+AH_TOP([
+#ifndef EFL_CONFIG_H__
+#define EFL_CONFIG_H__
+])
+AH_BOTTOM([
+#endif /* EFL_CONFIG_H__ */
+])
 
 AM_INIT_AUTOMAKE([1.6 dist-bzip2])
-AM_CONFIG_HEADER([config.h])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_GNU_SOURCE
@@ -59,15 +64,12 @@ AM_GNU_GETTEXT_VERSION([0.12.1])
 
 m4_ifdef([AM_GNU_GETTEXT], [
 AM_GNU_GETTEXT([external])
-po_makefile_in=po/Makefile.in
 AM_CONDITIONAL([HAVE_PO], [true])
 ],[
 AM_CONDITIONAL([HAVE_PO], [false])
 ])
 AC_SUBST(LTLIBINTL)
 
-EFL_CHECK_PATH_MAX
-
 with_max_log_level="<unset>"
 AC_ARG_WITH(internal-maximum-log-level,
    [AC_HELP_STRING([--with-internal-maximum-log-level=NUMBER],
@@ -87,6 +89,9 @@ AC_ARG_WITH(internal-maximum-log-level,
 
 ### Default options with respect to host
 
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+
 # dependencies and options
 want_curl="no"
 want_abstract_sockets="no"
@@ -305,7 +310,6 @@ fi
 
 EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
 
-
 ### Checks for programs
 
 m4_ifdef([AC_PROG_OBJC],
@@ -404,30 +408,31 @@ case "$host_os" in
    mingw32ce* | cegcc*)
       WIN32_LIBS="-lws2"
       dlopen_libs="-ldl"
-      rt_libs="-lrt"
       ;;
    mingw*)
       WIN32_LIBS="-lws2_32"
       dlopen_libs="-ldl"
-      rt_libs="-lrt"
       ;;
    *)
-      AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
-      AC_CHECK_LIB(rt, clock_gettime, rt_libs=-lrt)
+      AC_CHECK_LIB([c], [dlopen],
+         [],
+         [AC_CHECK_LIB([dl], [dlopen],
+             [dlopen_libs=-ldl])
+         ])
+      AC_CHECK_LIB([c], [clock_gettime],
+         [AC_DEFINE(HAVE_CLOCK_GETTIME, [1], [Have clock_gettime()])],
+         [AC_CHECK_LIB([rt], [clock_gettime],
+             [
+              rt_libs=-lrt
+              AC_DEFINE(HAVE_CLOCK_GETTIME, [1], [Have clock_gettime()])
+             ])
+         ])
       ;;
 esac
 AC_SUBST(WIN32_LIBS)
 AC_SUBST(dlopen_libs)
 AC_SUBST(rt_libs)
 
-if test -n "$rt_libs"; then
-   _bkp_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $rt_libs"
-   AC_CHECK_FUNCS(clock_gettime)
-   LDFLAGS="$_bkp_LDFLAGS"
-   unset _bkp_LDFLAGS
-fi
-
 # Eina library
 
 PKG_CHECK_MODULES(EINA, [eina >= 1.0.0])
@@ -873,7 +878,10 @@ PKG_CHECK_MODULES([EVAS], [evas >= 1.0.0],
 
 ### Checks for header files
 
+EFL_CHECK_PATH_MAX
+
 AC_HEADER_SYS_WAIT
+AC_SYS_LARGEFILE
 
 have_addrinfo="no"
 case "$host_os" in
@@ -918,6 +926,7 @@ m4_ifdef([AC_PROG_OBJC], [
 ])
 AC_SUBST(cocoa_ldflags)
 
+want_epoll=yes
 AC_ARG_ENABLE(epoll,
   AC_HELP_STRING([--enable-epoll], [enable or disable epoll support]),
   [want_epoll=$enableval])
@@ -928,9 +937,21 @@ if test "x${want_epoll}" = "xyes" ; then
 fi
 
 
-# basic pthread support
+# thread support
 
-EFL_CHECK_PTHREAD([no], [have_pthread="yes"], [have_pthread="no"])
+EFL_CHECK_THREADS(
+   [
+    if test "x${_efl_have_posix_threads}" = "xyes" ; then
+       have_threads="POSIX"
+    else
+       if test "x${_efl_have_win32_threads}" = "xyes" ; then
+          have_threads="Win32"
+       else
+          have_threads="no"
+       fi
+    fi
+   ],
+   [have_threads="no"])
 
 ### Checks for types
 AC_CHECK_SIZEOF(int, 4)
@@ -978,6 +999,7 @@ esac
 AC_SUBST(lt_enable_auto_import)
 
 ### Checks for library functions
+AC_ISC_POSIX
 AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(gettimeofday strlcpy)
 
@@ -1348,8 +1370,6 @@ ECORE_EVAS_CHECK_MODULE([software-16-wince],
    [${have_ecore_wince}],
    [requirements_ecore_evas="ecore-wince >= 1.0.0 ${requirements_ecore_evas}"])
 
-
-
 ### requirements
 
 AC_SUBST(requirements_ecore)
@@ -1370,7 +1390,7 @@ AC_SUBST(requirements_ecore_x)
 AC_SUBST(requirements_ecore_win32)
 AC_SUBST(requirements_ecore_wince)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 ecore-con.pc
 ecore-config.pc
@@ -1416,9 +1436,12 @@ src/lib/ecore_x/xcb/Makefile
 src/tests/Makefile
 README
 ecore.spec
-$po_makefile_in
 ])
 
+m4_ifdef([AM_GNU_GETTEXT], [AC_CONFIG_FILES([po/Makefile.in])])
+
+AC_OUTPUT
+
 echo
 echo "$PACKAGE $VERSION"
 echo
@@ -1427,7 +1450,7 @@ echo
 echo " Core:"
 echo
 echo "  Ecore........................: always"
-echo "    Thread support.............: $have_pthread"
+echo "    Thread support.............: $have_threads"
 echo "    GLib support...............: $have_glib"
 echo "    Always integrate GLib......: $want_glib_integration_always"
 echo "    Use g_main_loop............: $want_g_main_loop"