elementary: Fixed svn detection for svn1.7

[framework/uifw/elementary.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9b59a5f..7a496a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
-=-------##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [0])
 m4_define([v_min], [8])
 m4_define([v_mic], [0])
-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_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || 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
 dnl m4_undefine([v_rev])
@@ -219,12 +219,38 @@ PKG_CHECK_MODULES([ELEMENTARY],
     ecore >= 1.0.999
     ecore-evas >= 1.0.999
     ecore-file >= 1.0.999
-    ecore-imf >= 1.0.999
-    ecore-con >= 1.0.999
     edje >= 1.0.999
    ]
 )
 
+requirement_elm="edje >= 1.0.0 ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_elm}"
+
+PKG_CHECK_MODULES([ELEMENTARY_ECORE_IMF],
+   [ecore-imf >= 1.0.999],
+   [
+    ELEMENTARY_ECORE_IMF_INC="#include <Ecore_IMF.h>"
+    AC_DEFINE(HAVE_ELEMENTARY_ECORE_IMF, 1, [Have Ecore_IMF support])
+    have_ecore_imf="yes"
+    requirement_elm="ecore-imf >= 1.0.999 ${requirement_elm}"
+   ],
+   [have_ecore_imf="no"])
+AC_SUBST(ELEMENTARY_ECORE_IMF_INC)
+
+AM_CONDITIONAL([HAVE_ECORE_IMF], [test "x${have_ecore_imf}" = "xyes"])
+
+PKG_CHECK_MODULES([ELEMENTARY_ECORE_CON],
+   [ecore-con >= 1.0.999],
+   [
+    ELEMENTARY_ECORE_CON_INC="#include <Ecore_Con.h>"
+    AC_DEFINE(HAVE_ELEMENTARY_ECORE_CON, 1, [Have Ecore_Con support])
+    have_ecore_con="yes"
+    requirement_elm="ecore-con >= 1.0.999 ${requirement_elm}"
+   ],
+   [have_ecore_con="no"])
+AC_SUBST(ELEMENTARY_ECORE_CON_INC)
+
+AM_CONDITIONAL([HAVE_ECORE_CON], [test "x${have_ecore_con}" = "xyes"])
+
 PKG_CHECK_MODULES([EIO],
         [eio],
         [
@@ -255,8 +281,6 @@ fi
 
 AM_CONDITIONAL([HAVE_EMOTION], [test "x${have_emotion}" = "xyes"])
 
-requirement_elm="edje >= 1.0.0 ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_elm}"
-
 have_elementary_x="no"
 want_elementary_x="auto"
 AC_ARG_ENABLE([ecore-x],
@@ -304,6 +328,29 @@ if test "x$want_elementary_fb" = "xyes" -a "x$have_elementary_fb" = "xno"; then
     AC_MSG_ERROR([ecore-fb support requested, but not found by pkg-config.])
 fi
 
+have_elementary_psl1ght="no"
+want_elementary_psl1ght="auto"
+AC_ARG_ENABLE([ecore-psl1ght],
+   [AC_HELP_STRING([--disable-ecore-psl1ght], [disable ecore-psl1ght support. @<:@default=detect@:>@])],
+   [want_elementary_psl1ght=$enableval], [])
+
+if test "x$want_elementary_psl1ght" != "xno"; then
+   PKG_CHECK_MODULES([ELEMENTARY_PSL1GHT],
+      [ecore-psl1ght >= 1.0.0],
+      [
+       AC_DEFINE(HAVE_ELEMENTARY_PSL1GHT, 1, [PSL1GHT support for Elementary])
+       have_elementary_psl1ght="yes"
+       requirement_elm="ecore-psl1ght >= 1.0.0 ${requirement_elm}"
+      ],
+      [have_elementary_psl1ght="no"]
+   )
+else
+    have_elementary_psl1ght="no"
+fi
+if test "x$want_elementary_psl1ght" = "xyes" -a "x$have_elementary_psl1ght" = "xno"; then
+    AC_MSG_ERROR([ecore-psl1ght support requested, but not found by pkg-config.])
+fi
+
 have_elementary_sdl="no"
 want_elementary_sdl="auto"
 AC_ARG_ENABLE([ecore-sdl],
@@ -595,14 +642,14 @@ ELM_LIBINTL_H_DEF="#undef"
 AC_CHECK_HEADER(libintl.h, [ELM_LIBINTL_H_DEF="#define"])
 AC_SUBST(ELM_LIBINTL_H_DEF)
 
-EFL_CHECK_THREADS([
-  TH=1
-] , [
-  AC_MSG_ERROR(no thread support found. required.)
-  exit 1
-])
-AC_SUBST(EFL_PTHREAD_CFLAGS)
-AC_SUBST(EFL_PTHREAD_LIBS)
+ELM_DIRENT_H_DEF="#undef"
+AC_CHECK_HEADER(dirent.h, [ELM_DIRENT_H_DEF="#define"])
+AC_SUBST(ELM_DIRENT_H_DEF)
+
+AC_CHECK_HEADER(sys/mman.h, [have_mman="yes"], [have_mman="no"])
+if test "x${have_mman}" = "xyes"; then
+   AC_DEFINE(HAVE_MMAN_H, 1, [Have sys/mman.h header file])
+fi
 
 my_libs="-lm"
 AC_SUBST(my_libs)
@@ -688,12 +735,15 @@ echo
 echo "  Engines:"
 echo "    X11....................: ${have_elementary_x}"
 echo "    Framebuffer............: ${have_elementary_fb}"
+echo "    PSL1GHT................: ${have_elementary_psl1ght}"
 echo "    SDL....................: ${have_elementary_sdl}"
 echo "    Cocoa..................: ${have_elementary_cocoa}"
 echo "    Windows XP.............: ${have_elementary_win32}"
 echo "    Windows CE.............: ${have_elementary_wince}"
 echo
 echo "  Features:"
+echo "    Ecore_IMF..............: ${have_ecore_imf}"
+echo "    Ecore_Con..............: ${have_ecore_con}"
 echo "    EDBus..................: ${have_elementary_edbus}"
 echo "    EFreet.................: ${have_elementary_efreet}"
 echo "    EWeather...............: ${have_elementary_eweather}"