summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2008-09-20 02:06:00 +0000
committerCarsten Haitzler <raster@rasterman.com>2008-09-20 02:06:00 +0000
commit745377bbba649e20b0613d760da777d13ebfd09d (patch)
treec8a90dc97d531dda01b8d954a7bb75776bdd163f /configure.in
parente7dbbf1e4ec5a849b1cf90206d3524268bff3b9f (diff)
tim horton's expedite quartz engine patches
SVN revision: 36108
Diffstat (limited to '')
-rw-r--r--configure.in13
1 files changed, 13 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index 9a886d4..832e2b2 100644
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,12 @@ AM_INIT_AUTOMAKE(1.6 dist-bzip2)
13AM_CONFIG_HEADER(config.h) 13AM_CONFIG_HEADER(config.h)
14 14
15AC_ISC_POSIX 15AC_ISC_POSIX
16m4_ifdef([AC_PROG_OBJC],
17 [AC_PROG_OBJC],
18 [AC_CHECK_TOOL([OBJC], [gcc])
19 AC_SUBST([OBJC])
20 AC_SUBST([OBJCFLAGS])
21 ])
16AC_PROG_CXX 22AC_PROG_CXX
17AC_PROG_CC 23AC_PROG_CC
18AM_PROG_CC_STDC 24AM_PROG_CC_STDC
@@ -73,6 +79,9 @@ EXPEDITE_CHECK_ENGINE([fb], [Framebuffer], "yes")
73### DIRECTFB 79### DIRECTFB
74EXPEDITE_CHECK_ENGINE([directfb], [DirectFB], "yes") 80EXPEDITE_CHECK_ENGINE([directfb], [DirectFB], "yes")
75 81
82### Quartz
83EXPEDITE_CHECK_ENGINE([quartz], [Quartz], "yes", [quartz_libs="-framework Cocoa -framework ApplicationServices"])
84
76### Software 16bit X11 85### Software 16bit X11
77EXPEDITE_CHECK_ENGINE([software-16-x11], [Software 16 bits X11], "yes") 86EXPEDITE_CHECK_ENGINE([software-16-x11], [Software 16 bits X11], "yes")
78 87
@@ -123,6 +132,8 @@ if test "x$have_directfb" = "xyes"; then
123fi 132fi
124AM_CONDITIONAL(BUILD_DIRECTFB, test "x$have_directfb" = "xyes") 133AM_CONDITIONAL(BUILD_DIRECTFB, test "x$have_directfb" = "xyes")
125 134
135AM_CONDITIONAL(BUILD_QUARTZ, test "x$have_quartz" = "xyes")
136
126AC_SUBST(x_cflags) 137AC_SUBST(x_cflags)
127AC_SUBST(x_libs) 138AC_SUBST(x_libs)
128AC_SUBST(ddraw_libs) 139AC_SUBST(ddraw_libs)
@@ -130,6 +141,7 @@ AC_SUBST(ddraw_16_libs)
130AC_SUBST(d3d_libs) 141AC_SUBST(d3d_libs)
131AC_SUBST(wince_16_libs) 142AC_SUBST(wince_16_libs)
132AC_SUBST(glew_libs) 143AC_SUBST(glew_libs)
144AC_SUBST(quartz_libs)
133 145
134AC_OUTPUT([ 146AC_OUTPUT([
135Makefile 147Makefile
@@ -152,6 +164,7 @@ echo " Open GL Glew.................: ${have_opengl_glew}"
152echo " Software SDL.................: ${have_software_sdl}" 164echo " Software SDL.................: ${have_software_sdl}"
153echo " FB...........................: ${have_fb}" 165echo " FB...........................: ${have_fb}"
154echo " DirectFB.....................: ${have_directfb}" 166echo " DirectFB.....................: ${have_directfb}"
167echo " Quartz.......................: ${have_quartz}"
155echo " Software X11 16 bits.........: ${have_software_16_x11}" 168echo " Software X11 16 bits.........: ${have_software_16_x11}"
156echo " Software DirectDraw 16 bits..: ${have_software_16_ddraw}" 169echo " Software DirectDraw 16 bits..: ${have_software_16_ddraw}"
157echo " Software WinCE 16 bits.......: ${have_software_16_wince}" 170echo " Software WinCE 16 bits.......: ${have_software_16_wince}"