eet now has an eet_version you can runtime check:

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

diff --git a/configure.ac b/configure.ac
index dbc0ad5..624062e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,24 @@ VMAJ=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $1);}'`
 VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
 VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
 SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
+
+VREV="0"
+SVNVERSION=`which svnversion`
+if test -n "$SVNVERSION"; then
+  VREV=`$SVNVERSION . | awk -F : '{printf("%s\n", $1);}' | tr 'A-z' ' '`
+fi
+# When released uncomment the following
+##VREV="0"
+
+AC_SUBST(VREV)
+
+AC_DEFINE_UNQUOTED(VMAJ, $VMAJ, [Major version])
+AC_DEFINE_UNQUOTED(VMIN, $VMIN, [Minor version])
+AC_DEFINE_UNQUOTED(VMIC, $VMIC, [Micro version])
+AC_DEFINE_UNQUOTED(VREV, $VREV, [Revison])
 version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
-#release="ver-pre-svn-00"
-#release_info="-release $release"
+##release="ver-pre-svn-00"
+##release_info="-release $release"
 release_info=""
 AC_SUBST(version_info)
 AC_SUBST(release_info)
@@ -32,7 +47,7 @@ AC_SUBST(release_info)
 ### Default options with respect to host
 
 case "$host_os" in
-   mingw* | cegcc*)
+   mingw*)
       want_gnutls="no"
       want_openssl="no"
       want_cipher="no"
@@ -151,6 +166,34 @@ AC_ARG_ENABLE([assert],
    [prefer_assert=$enableval]
 )
 
+# Examples
+
+AC_ARG_ENABLE([install-examples],
+   [AC_HELP_STRING([--disable-install-examples],
+       [disable installing examples (compiled or just source). @<:@default==enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       install_examples="yes"
+    else
+       install_examples="no"
+    fi
+   ],
+   [install_examples="yes"])
+AM_CONDITIONAL([INSTALL_EXAMPLES], [test "x${install_examples}" = "xyes"])
+
+AC_ARG_ENABLE([build-examples],
+   [AC_HELP_STRING([--enable-build-examples],
+       [enable building examples. @<:@default==disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       build_examples="yes"
+    else
+       build_examples="no"
+    fi
+   ],
+   [build_examples="no"])
+AM_CONDITIONAL([BUILD_EXAMPLES], [test "x${build_examples}" = "xyes"])
+
 # Unit tests, coverage and benchmarking
 
 EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
@@ -190,7 +233,7 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
 
 EFL_EET_BUILD=""
 case "$host_os" in
-   mingw* | cegcc*)
+   mingw*)
       PKG_CHECK_MODULES([EVIL], [evil])
       AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed])
       requirement_eet="evil ${requirement_eet}"
@@ -204,9 +247,6 @@ case "$host_os" in
    mingw32ce*)
       EET_LIBS="-lws2"
       ;;
-   cegcc*)
-      EET_LIBS="-lws2"
-      ;;
    mingw*)
       EET_LIBS="-lws2_32"
       ;;
@@ -337,12 +377,8 @@ case "$host_os" in
    mingw32ce*)
       EET_CPPFLAGS="-D_WIN32_WCE=0x0420"
       ;;
-   cegcc*)
-      EET_CPPFLAGS="-D_WIN32_WCE=0x0420"
-      EET_CFLAGS="-mwin32"
-      ;;
    mingw*)
-      EET_CPPFLAGS="-D_WIN32_WINNT=0x0500"
+      EET_CPPFLAGS="-D_WIN32_WINNT=0x0501"
       ;;
 esac
 AC_SUBST(EET_CPPFLAGS)
@@ -355,7 +391,7 @@ AC_SUBST(EET_CFLAGS)
 
 lt_enable_auto_import=""
 case "$host_os" in
-   mingw* | cegcc*)
+   mingw*)
       lt_enable_auto_import="-Wl,--enable-auto-import"
       ;;
 esac
@@ -395,6 +431,7 @@ src/Makefile
 src/lib/Makefile
 src/bin/Makefile
 src/tests/Makefile
+src/examples/Makefile
 README
 eet.spec
 ])
@@ -427,6 +464,13 @@ echo
 echo "  Build eet............: $have_eet"
 echo
 echo "  Documentation........: ${build_doc}"
+if test "x${build_doc}" = "xyes" ; then
+   echo "    Building...........: make doc"
+fi
+echo "  Examples.............: ${build_examples}"
+if test "x${build_examples}" = "xyes" ; then
+   echo "    Install............: ${install_examples}"
+fi
 echo
 echo "Compilation............: make (or gmake)"
 echo "  CPPFLAGS.............: $CPPFLAGS"