summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2009-07-14 21:30:58 +0000
committerVincent Torri <vincent.torri@gmail.com>2009-07-14 21:30:58 +0000
commita1b88ea91165f3ce8d8fb4a0ffbdf5ab66ee3add (patch)
tree3c8289748edf721d08ceff3fe1d944f5590bc853 /configure.ac
parente79dfa71175e407bc0f8dd9e723bf5129ff7d166 (diff)
rename 'x11' to 'xlib' for software x11 based engines when it makes sense
SVN revision: 41335
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac30
1 files changed, 20 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 3992d6a..cb7fed2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,15 +29,26 @@ AC_ARG_ENABLE(simple-x11,
29# Software X11 29# Software X11
30EXPEDITE_CHECK_ENGINE([software-x11], [Software X11], "yes") 30EXPEDITE_CHECK_ENGINE([software-x11], [Software X11], "yes")
31 31
32if test "x${have_software_x11}" = "xyes" ; then
33 have_software_xlib=`${PKG_CONFIG} --variable=Xlib evas-software-x11`
34 if test "x${have_software_xlib}" = "xyes" ; then
35 AC_DEFINE(HAVE_EVAS_SOFTWARE_XLIB, 1, [Evas Software Xlib Engine Support])
36 fi
37 have_software_xcb=`${PKG_CONFIG} --variable=XCB evas-software-x11`
38 if test "x${have_software_xcb}" = "xyes" ; then
39 AC_DEFINE(HAVE_EVAS_SOFTWARE_XCB, 1, [Evas Software XCB Engine Support])
40 fi
41fi
42
43AM_CONDITIONAL([BUILD_SOFTWARE_XLIB], [test "x${have_software_xlib}" = "xyes"])
44AM_CONDITIONAL([BUILD_SOFTWARE_XCB], [test "x${have_software_xcb}" = "xyes"])
45
32# XRender X11 46# XRender X11
33EXPEDITE_CHECK_ENGINE([xrender-x11], [XRender X11], "yes") 47EXPEDITE_CHECK_ENGINE([xrender-x11], [XRender X11], "yes")
34 48
35# OpenGL X11 49# OpenGL X11
36EXPEDITE_CHECK_ENGINE([opengl-x11], [OpenGL X11], "yes") 50EXPEDITE_CHECK_ENGINE([opengl-x11], [OpenGL X11], "yes")
37 51
38# Software XCB
39EXPEDITE_CHECK_ENGINE([software-xcb], [Software XCB], "yes")
40
41# XRender XCB 52# XRender XCB
42EXPEDITE_CHECK_ENGINE([xrender-xcb], [XRender XCB], "yes") 53EXPEDITE_CHECK_ENGINE([xrender-xcb], [XRender XCB], "yes")
43 54
@@ -120,11 +131,11 @@ PKG_CHECK_MODULES([EVAS], evas)
120 131
121# Xlib 132# Xlib
122 133
123if 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 134if 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
124 AC_PATH_XTRA 135 AC_PATH_XTRA
125 AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h], 136 AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h],
126 [have_x11="yes"], 137 [have_xlib="yes"],
127 [have_x11="no"]) 138 [have_xlib="no"])
128 if test "x$want_evas_simple_x11" = "xyes"; then 139 if test "x$want_evas_simple_x11" = "xyes"; then
129 x_libs="${x_libs} -lX11 -lXext" 140 x_libs="${x_libs} -lX11 -lXext"
130 else 141 else
@@ -133,7 +144,7 @@ if test "x$have_software_x11" = "xyes" -o "x$have_software_16_x11" = "xyes" -o "
133 x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" 144 x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
134 fi 145 fi
135fi 146fi
136AM_CONDITIONAL(BUILD_X11, test "x$have_x11" = "xyes") 147AM_CONDITIONAL(BUILD_X11, [test "x$have_xlib" = "xyes"])
137 148
138AC_SUBST(x_cflags) 149AC_SUBST(x_cflags)
139AC_SUBST(x_libs) 150AC_SUBST(x_libs)
@@ -141,7 +152,7 @@ AC_SUBST(x_libs)
141# XCB 152# XCB
142 153
143if test "x$have_software_xcb" = "xyes"; then 154if test "x$have_software_xcb" = "xyes"; then
144 PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], [have_software_xcb="yes"], [have_software_xcb="no"]) 155 PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], [have_xcb="yes"], [have_xcb="no"])
145fi 156fi
146AM_CONDITIONAL(BUILD_XCB, test "x$have_xcb" = "xyes") 157AM_CONDITIONAL(BUILD_XCB, test "x$have_xcb" = "xyes")
147if test "x$have_xcb" = "xyes"; then 158if test "x$have_xcb" = "xyes"; then
@@ -213,10 +224,9 @@ echo
213echo " $PACKAGE $VERSION" 224echo " $PACKAGE $VERSION"
214echo 225echo
215echo " Engines:" 226echo " Engines:"
216echo " Software X11.................: ${have_software_x11}" 227echo " Software X11.................: ${have_software_xlib} (Xlib: ${have_software_xlib}) (XCB: ${have_software_xcb})"
217echo " X Render X11.................: ${have_xrender_x11}" 228echo " X Render X11.................: ${have_xrender_x11}"
218echo " Open GL X11..................: ${have_opengl_x11}" 229echo " Open GL X11..................: ${have_opengl_x11}"
219echo " Software XCB.................: ${have_software_xcb}"
220echo " X Render XCB.................: ${have_xrender_xcb}" 230echo " X Render XCB.................: ${have_xrender_xcb}"
221echo " Software GDI.................: ${have_software_gdi}" 231echo " Software GDI.................: ${have_software_gdi}"
222echo " Software DirectDraw..........: ${have_software_ddraw}" 232echo " Software DirectDraw..........: ${have_software_ddraw}"