Package upload

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

diff --git a/configure.ac b/configure.ac
index e5dc838..4e8d0cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 # get rid of that stupid cache mechanism
 rm -f config.cache
 
-AC_INIT([expedite], [0.7.2], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([expedite], [1.2.0]-beta, [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_HEADERS([config.h])
@@ -34,10 +34,16 @@ EXPEDITE_CHECK_ENGINE([software-x11], [Software X11], "yes")
 
 if test "x${have_software_x11}" = "xyes" ; then
    have_software_xlib=`${PKG_CONFIG} --variable=Xlib evas-software-x11`
+   if test "x${have_software_xlib}" = "xstatic" ; then
+      have_software_xlib="yes"
+   fi
    if test "x${have_software_xlib}" = "xyes" ; then
       AC_DEFINE(HAVE_EVAS_SOFTWARE_XLIB, 1, [Evas Software Xlib Engine Support])
    fi
    have_software_xcb=`${PKG_CONFIG} --variable=XCB evas-software-x11`
+   if test "x${have_software_xcb}" = "xstatic" ; then
+      have_software_xcb="yes"
+   fi
    if test "x${have_software_xcb}" = "xyes" ; then
       AC_DEFINE(HAVE_EVAS_SOFTWARE_XCB, 1, [Evas Software XCB Engine Support])
    fi
@@ -67,8 +73,8 @@ AC_SUBST(ddraw_libs)
 EXPEDITE_CHECK_ENGINE([direct3d], [Direct3D], "yes", [d3d_libs="-ld3d9 -ld3dx9d -lgdi32"])
 AC_SUBST(d3d_libs)
 
-# Software SDL
-EXPEDITE_CHECK_ENGINE([software-sdl], [Software SDL], "yes")
+# PSL1GHT
+EXPEDITE_CHECK_ENGINE([psl1ght], [PSL1GHT], "yes")
 
 # GL SDL
 EXPEDITE_CHECK_ENGINE([opengl-sdl], [OpenGL SDL], "yes")
@@ -79,6 +85,10 @@ EXPEDITE_CHECK_ENGINE([fb], [Framebuffer], "yes")
 # DIRECTFB
 EXPEDITE_CHECK_ENGINE([directfb], [DirectFB], "yes")
 
+# GL Cocoa
+EXPEDITE_CHECK_ENGINE([opengl-cocoa], [OpenGL Cocoa], "yes", [gl_cocoa_libs="-framework Cocoa"])
+AC_SUBST(gl_cocoa_libs)
+
 # Software 16bit X11
 EXPEDITE_CHECK_ENGINE([software-16-x11], [Software 16 bits X11], "yes")
 
@@ -110,24 +120,25 @@ AC_PROG_CC
 LT_PROG_RC
 
 
+
 ### Checks for libraries
 
 # Evil library for compilation on Windows
 
 case "$host_os" in
-   mingw32ce*)
-      PKG_CHECK_MODULES([EVIL], [evil])
+   mingw32*)
+      PKG_CHECK_MODULES([EVIL], [evil >= 1.0.0])
       AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed])
       ;;
 esac
 
 # Eina
 
-PKG_CHECK_MODULES([EINA], eina >= 1.0.0)
+PKG_CHECK_MODULES([EINA], eina >= 1.2.0)
 
 # Evas
 
-PKG_CHECK_MODULES([EVAS], evas >= 1.0.0 eet >= 1.4.0)
+PKG_CHECK_MODULES([EVAS], evas >= 1.2.0 eet >= 1.6.0)
 
 # Xlib
 
@@ -137,11 +148,11 @@ if test "x$have_software_xlib" = "xyes" -o "x$have_software_16_x11" = "xyes" -o
       [have_xlib="yes"],
       [have_xlib="no"])
    if test "x$want_evas_simple_x11" = "xyes"; then
-      x_libs="${x_libs} -lX11 -lXext -lXrender"
+      x_libs="${x_libs} -lX11"
    else
       x_dir=${x_dir:-/usr/X11R6}
       x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
+      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11"
    fi
 fi
 AM_CONDITIONAL(BUILD_X11, [test "x$have_xlib" = "xyes"])
@@ -161,10 +172,14 @@ fi
 
 # SDL
 
-if test "x$have_software_sdl" = "xyes" -o "x$have_gl_sdl" = "xyes"; then
-   PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no"])
-fi
+PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no"])
 AM_CONDITIONAL(BUILD_SDL, test "x$have_sdl" = "xyes")
+if test "x$have_sdl" = "xyes"; then
+   AC_DEFINE(BUILD_SDL, 1, [build sdl support])
+fi
+
+# PSL1GHT
+AM_CONDITIONAL(BUILD_PSL1GHT, test "x$have_psl1ght" = "xyes")
 
 # DirectFB
 
@@ -230,6 +245,8 @@ AC_SUBST(lt_enable_auto_import)
 
 ### Checks for library functions
 
+AC_CHECK_FUNCS([sync])
+
 
 AC_OUTPUT([
 Makefile
@@ -251,8 +268,10 @@ echo "    Software DirectDraw..........: ${have_software_ddraw}"
 echo "    Direct3D.....................: ${have_direct3d}"
 echo "    Software SDL.................: ${have_software_sdl}"
 echo "    Open GL SDL..................: ${have_opengl_sdl}"
+echo "    Open GL Cocoa................: ${have_opengl_cocoa}"
 echo "    FB...........................: ${have_fb}"
 echo "    DirectFB.....................: ${have_directfb}"
+echo "    PSL1GHT......................: ${have_psl1ght}"
 echo "    Software X11 16 bits.........: ${have_software_16_x11}"
 echo "    Software DirectDraw 16 bits..: ${have_software_16_ddraw}"
 echo "    Software WinCE 16 bits.......: ${have_software_16_wince}"