# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT([expedite], [0.6.0], [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])
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE(1.6 dist-bzip2)
-AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([1.6 dist-bzip2])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
PKG_PROG_PKG_CONFIG
)
# Software X11
+have_software_xlib="no"
+have_software_xcb="no"
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
+fi
+
+AM_CONDITIONAL([BUILD_SOFTWARE_XLIB], [test "x${have_software_xlib}" = "xyes"])
+AM_CONDITIONAL([BUILD_SOFTWARE_XCB], [test "x${have_software_xcb}" = "xyes"])
+
# XRender X11
EXPEDITE_CHECK_ENGINE([xrender-x11], [XRender X11], "yes")
# OpenGL X11
EXPEDITE_CHECK_ENGINE([opengl-x11], [OpenGL X11], "yes")
-# Software XCB
-EXPEDITE_CHECK_ENGINE([software-xcb], [Software XCB], "yes")
-
# XRender XCB
EXPEDITE_CHECK_ENGINE([xrender-xcb], [XRender XCB], "yes")
EXPEDITE_CHECK_ENGINE([direct3d], [Direct3D], "yes", [d3d_libs="-ld3d9 -ld3dx9d -lgdi32"])
AC_SUBST(d3d_libs)
-# OpenGL GLEW
-EXPEDITE_CHECK_ENGINE([opengl-glew], [OpenGL Glew], "yes", [glew_libs="-lglew32 -lgdi32"])
-AC_SUBST(glew_libs)
+# PSL1GHT
+EXPEDITE_CHECK_ENGINE([psl1ght], [PSL1GHT], "yes")
-# Software SDL
-EXPEDITE_CHECK_ENGINE([software-sdl], [Software SDL], "yes")
+# GL SDL
+EXPEDITE_CHECK_ENGINE([opengl-sdl], [OpenGL SDL], "yes")
# FB
EXPEDITE_CHECK_ENGINE([fb], [Framebuffer], "yes")
# DIRECTFB
EXPEDITE_CHECK_ENGINE([directfb], [DirectFB], "yes")
-# Quartz
-EXPEDITE_CHECK_ENGINE([quartz], [Quartz], "yes", [quartz_libs="-framework Cocoa -framework ApplicationServices"])
-AC_SUBST(quartz_libs)
-
-AM_CONDITIONAL(BUILD_QUARTZ, test "x$have_quartz" = "xyes")
+# 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")
AC_PROG_CXX
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.2.0)
+
# Evas
-PKG_CHECK_MODULES([EVAS], evas)
+PKG_CHECK_MODULES([EVAS], evas >= 1.2.0 eet >= 1.6.0)
# Xlib
-if test "x$have_software_x11" = "xyes" -o "x$have_software_16_x11" = "xyes" -o "x$have_xrender_x11" = "xyes" -o "x$have_opengl_x11" = "xyes"; then
+if test "x$have_software_xlib" = "xyes" -o "x$have_software_16_x11" = "xyes" -o "x$have_xrender_x11" = "xyes" -o "x$have_opengl_x11" = "xyes"; then
AC_PATH_XTRA
AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h],
- [have_x11="yes"],
- [have_x11="no"])
+ [have_xlib="yes"],
+ [have_xlib="no"])
if test "x$want_evas_simple_x11" = "xyes"; then
- x_libs="${x_libs} -lX11 -lXext"
+ 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"
+ x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11"
fi
fi
-AM_CONDITIONAL(BUILD_X11, test "x$have_x11" = "xyes")
+AM_CONDITIONAL(BUILD_X11, [test "x$have_xlib" = "xyes"])
AC_SUBST(x_cflags)
AC_SUBST(x_libs)
# XCB
if test "x$have_software_xcb" = "xyes"; then
- PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], [have_software_xcb="yes"], [have_software_xcb="no"])
+ PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], [have_xcb="yes"], [have_xcb="no"])
fi
AM_CONDITIONAL(BUILD_XCB, test "x$have_xcb" = "xyes")
if test "x$have_xcb" = "xyes"; then
# SDL
-if test "x$have_software_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
AC_HEADER_STDC
AC_C_CONST
AM_PROG_CC_C_O
+AC_C___ATTRIBUTE__
WIN32_CFLAGS=""
case "$host_os" in
esac
AC_SUBST(WIN32_CFLAGS)
+EXPEDITE_CXXFLAGS=""
+AC_LANG_PUSH([C++])
+CXXFLAGS_save="${CXXFLAGS}"
+CXXFLAGS="${CXXFLAGS} -fno-rtti -fno-exceptions"
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[]])],
+ [have_cxx_flags="yes"],
+ [have_cxx_flags="no"])
+AC_MSG_CHECKING([whether the compiler supports -fno-rtti -fno-exceptions])
+AC_MSG_RESULT([${have_cxx_flags}])
+CXXFLAGS="${CXXFLAGS_save}"
+if test "x${have_cxx_flags}" = "xyes" ; then
+ EXPEDITE_CXXFLAGS="-fno-rtti -fno-exceptions"
+fi
+AC_LANG_POP([C++])
+AC_SUBST(EXPEDITE_CXXFLAGS)
+
### Checks for linker characteristics
### Checks for library functions
+AC_CHECK_FUNCS([sync])
+
AC_OUTPUT([
Makefile
echo " $PACKAGE $VERSION"
echo
echo " Engines:"
-echo " Software X11.................: ${have_software_x11}"
+echo " Software X11.................: ${have_software_x11} (Xlib: ${have_software_xlib}) (XCB: ${have_software_xcb})"
echo " X Render X11.................: ${have_xrender_x11}"
echo " Open GL X11..................: ${have_opengl_x11}"
-echo " Software XCB.................: ${have_software_xcb}"
echo " X Render XCB.................: ${have_xrender_xcb}"
echo " Software GDI.................: ${have_software_gdi}"
echo " Software DirectDraw..........: ${have_software_ddraw}"
echo " Direct3D.....................: ${have_direct3d}"
-echo " Open GL Glew.................: ${have_opengl_glew}"
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 " Quartz.......................: ${have_quartz}"
+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}"