← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
 
dnl $Id: configure.ac,v 1.147 2005/12/15 00:20:27 kem Exp $
 
1
dnl $Id$
2
2
dnl
3
3
dnl Copyright © 2003-2005 Keith Packard, Daniel Stone
4
4
dnl
24
24
 
25
25
AC_PREREQ(2.57)
26
26
dnl This is the not the Xorg version number, it's the server version number.
27
 
dnl Yes, that's weird.
28
 
AC_INIT([xorg-server], 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 
27
dnl Yes, that's weird.  Also, when you change this, be sure to change the
 
28
dnl DEFAULT_VERSION_* variables below.
 
29
AC_INIT([xorg-server], 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
29
30
AC_CONFIG_SRCDIR([Makefile.am])
30
31
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
31
32
AM_MAINTAINER_MODE
39
40
dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just
40
41
dnl dix/).
41
42
AC_CONFIG_HEADERS(include/dix-config.h)
 
43
dnl xgl-config.h covers the Xgl DDX.
 
44
AC_CONFIG_HEADERS(include/xgl-config.h)
42
45
dnl xorg-config.h covers the Xorg DDX.
43
46
AC_CONFIG_HEADERS(include/xorg-config.h)
44
47
dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs.
45
48
AC_CONFIG_HEADERS(include/xkb-config.h)
46
49
dnl xwin-config.h covers the XWin DDX.
47
50
AC_CONFIG_HEADERS(include/xwin-config.h)
 
51
dnl kdrive-config.h covers the kdrive DDX
 
52
AC_CONFIG_HEADERS(include/kdrive-config.h)
48
53
 
49
54
 
50
55
AC_PROG_CC
94
99
 
95
100
AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF = xno])
96
101
 
 
102
dnl Check for mmap support for Xvfb
 
103
AC_CHECK_FUNC([mmap], AC_DEFINE(HAS_MMAP, 1, [Have the `mmap' function.]))
 
104
 
97
105
dnl Find the math libary
98
106
AC_CHECK_LIB(m, sqrt)
99
107
 
104
112
AM_CONDITIONAL(AGP, [test "x$AGP" = xyes])
105
113
 
106
114
dnl APM header
107
 
AC_CHECK_HEADERS([linux/apm_bios.h])
 
115
AC_CHECK_HEADERS([linux/apm_bios.h], LNXAPM=yes)
 
116
AM_CONDITIONAL(LNXAPM, [test "x$LNXAPM" = xyes])
108
117
 
109
118
dnl fbdev header
110
119
AC_CHECK_HEADERS([linux/fb.h], FBDEV=yes)
111
120
AM_CONDITIONAL(FBDEVHW, [test "x$FBDEV" = xyes])
112
121
 
113
122
dnl MTRR header
114
 
AC_CHECK_HEADERS([asm/mtrr.h])
 
123
AC_CHECK_HEADERS([asm/mtrr.h], ac_cv_asm_mtrr_h=yes)
 
124
if test "x$ac_cv_asm_mtrr_h" = xyes; then
 
125
        HAVE_MTRR=yes
 
126
fi
115
127
 
116
128
dnl BSD MTRR header
117
129
AC_CHECK_HEADERS([sys/memrange.h], ac_cv_memrange_h=yes)
118
130
if test "x$ac_cv_memrange_h" = xyes; then
119
 
        AC_DEFINE(HAS_MTRR_SUPPORT, 1, [Define to 1 if BSD MTRR support is
120
 
                 available])
 
131
        HAVE_MTRR=yes
 
132
fi
 
133
 
 
134
if test "x$HAVE_MTRR" = xyes; then
 
135
        AC_DEFINE(HAS_MTRR_SUPPORT, 1, [MTRR support available])
121
136
fi
122
137
 
123
138
dnl A NetBSD MTRR header
124
 
AC_CHECK_HEADERS([machine/mtrr.h], ac_cv_mtrr_h=yes)
125
 
if test "x$ac_cv_mtrr_h" = xyes; then
 
139
AC_CHECK_HEADERS([machine/mtrr.h], ac_cv_machine_mtrr_h=yes)
 
140
if test "x$ac_cv_machine_mtrr_h" = xyes; then
126
141
        AC_DEFINE(HAS_MTRR_BUILTIN, 1, [Define to 1 if NetBSD built-in MTRR
127
142
                support is available])
128
143
fi
151
166
        AC_DEFINE(HAVE_SYSV_IPC, 1, [Define to 1 if SYSV IPC is available])
152
167
fi
153
168
 
 
169
dnl OpenBSD /dev/xf86 aperture driver 
 
170
if test -c /dev/xf86 ; then
 
171
        AC_DEFINE(HAS_APERTURE_DRV, 1, [System has /dev/xf86 aperture driver])
 
172
fi
 
173
 
154
174
dnl glibc backtrace support check (hw/xfree86/common/xf86Events.c)
155
175
AC_CHECK_HEADER([execinfo.h],[
156
176
    AC_CHECK_LIB(c, backtrace, [
164
184
dnl ---------------------------------------------------------------------------
165
185
DEFAULT_INT10="x86emu"
166
186
use_x86_asm="no"
167
 
build_xf8_32wid="yes"
168
187
 
169
188
dnl Override defaults as needed for specific platforms:
170
189
 
185
204
                *linux*)        DEFAULT_INT10=vm86 ;;
186
205
                *freebsd*)      AC_DEFINE(USE_DEV_IO) ;;
187
206
                *netbsd*)       AC_DEFINE(USE_I386_IOPL) ;;
188
 
                *openbsd*)      AC_DEFINE(USE_I386_IOPL) ;;
 
207
                *openbsd*)      AC_DEFINE(USE_I386_IOPL) 
 
208
                                SYS_LIBS=-li386
 
209
                                ;;
189
210
        esac
190
211
        ;;
191
212
  powerpc*)
195
216
        esac
196
217
        ;;
197
218
  sparc*)
198
 
        build_xf8_32wid="yes"   # used by sunffb driver
199
219
        xorg_loader_sparcmuldiv="yes"
200
220
        SPARC64_VIDEO=yes
201
221
        BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
206
226
        case $host_os in
207
227
                *freebsd*)      AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;
208
228
                *netbsd*)       AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl]) ;;
209
 
                *openbsd*)      AC_DEFINE(USE_AMD64_IOPL, 1, [BSD AMD64 iopl]) ;;
 
229
                *openbsd*)      AC_DEFINE(USE_AMD64_IOPL, 1, [BSD AMD64 iopl])
 
230
                                SYS_LIBS=-lamd64
 
231
                                ;;
210
232
        esac
211
233
        ;;
212
234
esac
213
235
 
214
 
AM_CONDITIONAL(BUILD_XF8_32WID, [test x$build_xf8_32wid = xyes])
215
 
 
216
236
dnl BSD *_video.c selection
217
237
AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
218
238
AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes])
221
241
AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes])
222
242
 
223
243
DRI=no
 
244
KDRIVE_HW=no
224
245
dnl it would be nice to autodetect these *CONS_SUPPORTs
225
246
case $host_os in
226
247
  *freebsd*)
238
259
        ;;
239
260
  *openbsd*)
240
261
        AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
241
 
        AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
 
262
        AC_DEFINE(PCVT_SUPPORT, 1, [System has PC console])
242
263
        AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
243
264
        ;;
244
265
  *linux*)
245
266
        DRI=yes
 
267
        KDRIVE_HW=yes
246
268
        ;;
247
269
esac
 
270
AM_CONDITIONAL(KDRIVE_HW, test "x$KDRIVE_HW" = xyes)
248
271
 
249
272
AC_MSG_CHECKING(for MMX capable platform)
250
273
if test "x$use_x86_asm" = xyes && test "x$GCC" = xyes ; then
265
288
DEFAULT_VENDOR_NAME="The X.Org Foundation"
266
289
DEFAULT_VENDOR_NAME_SHORT="X.Org"
267
290
DEFAULT_VERSION_MAJOR=7
268
 
DEFAULT_VERSION_MINOR=0
269
 
DEFAULT_VERSION_PATCH=0
 
291
DEFAULT_VERSION_MINOR=1
 
292
DEFAULT_VERSION_PATCH=1
270
293
DEFAULT_VERSION_SNAP=0
271
 
DEFAULT_RELEASE_DATE="21 December 2005"
 
294
DEFAULT_RELEASE_DATE="12 May 2006"
272
295
DEFAULT_VENDOR_WEB="http://wiki.x.org"
273
296
 
274
297
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
352
375
AC_ARG_WITH(rgb-path,         AS_HELP_STRING([--with-rgb-path=PATH], [Path to RGB database (default: ${datadir}/X11/rgb)]),
353
376
                                [ RGBPATH="$withval" ],
354
377
                                [ RGBPATH="${datadir}/X11/rgb" ])
 
378
AC_ARG_WITH(dri-driver-path,  AS_HELP_STRING([--with-dri-driver-path=PATH], [Path to DRI drivers (default: ${libdir}/dri)]),
 
379
                                [ DRI_DRIVER_PATH="$withval" ],
 
380
                                [ DRI_DRIVER_PATH="${libdir}/dri" ])
355
381
AC_ARG_ENABLE(builddocs,      AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),
356
382
                                [BUILDDOCS=$enableval],
357
383
                                [BUILDDOCS=no])
374
400
AC_ARG_ENABLE(xdmcp,          AS_HELP_STRING([--disable-xdmcp], [Build XDMCP extension (default: auto)]), [XDMCP=$enableval], [XDMCP=auto])
375
401
AC_ARG_ENABLE(xdm-auth-1,     AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto])
376
402
AC_ARG_ENABLE(glx,            AS_HELP_STRING([--disable-glx], [Build GLX extension (default: enabled)]), [GLX=$enableval], [GLX=yes])
 
403
AC_ARG_ENABLE(aiglx,          AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]), [AIGLX=$enableval], [AIGLX=yes])
 
404
AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with TLS support (default: disabled)]), [GLX_USE_TLS=$enableval], [GLX_USE_TLS=no])
377
405
AC_ARG_ENABLE(dri,            AS_HELP_STRING([--enable-dri], [Build DRI extension (default: auto)]), [DRI=$enableval])
378
406
AC_ARG_ENABLE(xinerama,       AS_HELP_STRING([--disable-xinerama], [Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval], [XINERAMA=yes])
379
407
AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: enabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=yes])
380
408
AC_ARG_ENABLE(xf86misc,       AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
381
409
AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=yes])
382
410
AC_ARG_ENABLE(xevie,          AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes])
383
 
AC_ARG_ENABLE(lbx,            AS_HELP_STRING([--disable-lbx], [Build LBX extension (default: enabled)]), [LBX=$enableval], [LBX=yes])
 
411
AC_ARG_ENABLE(lbx,            AS_HELP_STRING([--disable-lbx], [Build LBX extension (default: no)]), [LBX=$enableval], [LBX=no])
384
412
AC_ARG_ENABLE(appgroup,       AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=yes])
385
413
AC_ARG_ENABLE(cup,            AS_HELP_STRING([--disable-cup], [Build TOG-CUP extension (default: enabled)]), [CUP=$enableval], [CUP=yes])
386
414
AC_ARG_ENABLE(evi,            AS_HELP_STRING([--disable-evi], [Build Extended-Visual-Information extension (default: enabled)]), [EVI=$enableval], [EVI=yes])
387
415
AC_ARG_ENABLE(multibuffer,    AS_HELP_STRING([--enable-multibuffer], [Build Multibuffer extension (default: disabled)]), [MULTIBUFFER=$enableval], [MULTIBUFFER=no])
388
416
AC_ARG_ENABLE(fontcache,      AS_HELP_STRING([--enable-fontcache], [Build FontCache extension (default: disabled)]), [FONTCACHE=$enableval], [FONTCACHE=no])
389
417
AC_ARG_ENABLE(dbe,            AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])
 
418
AC_ARG_ENABLE(xf86bigfont,    AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes])
 
419
AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMS=$enableval], [DPMSExtension=yes])
 
420
AC_ARG_ENABLE(xinput,         AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
390
421
 
391
422
dnl DDXes.
392
423
AC_ARG_ENABLE(xorg,           AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
395
426
AC_ARG_ENABLE(xnest,          AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
396
427
AC_ARG_ENABLE(xwin,           AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
397
428
AC_ARG_ENABLE(xprint,         AS_HELP_STRING([--enable-xprint], [Build Xprint extension and server (default: auto)]), [XPRINT=$enableval], [XPRINT=auto])
 
429
AC_ARG_ENABLE(xgl,            AS_HELP_STRING([--enable-xgl], [Build Xgl server (default: no)]), [XGL=$enableval], [XGL=no])
 
430
AC_ARG_ENABLE(xglx,           AS_HELP_STRING([--enable-xglx], [Build Xglx xgl module (default: no)]), [XGLX=$enableval], [XGLX=no])
 
431
AC_ARG_ENABLE(xegl,           AS_HELP_STRING([--enable-xegl], [Build Xegl xgl module (default: no)]), [XEGL=$enableval], [XEGL=no])
 
432
dnl kdrive and its subsystems
 
433
AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
 
434
AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
 
435
AC_ARG_ENABLE(xsdl,           AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto])
 
436
dnl xprint
 
437
AC_ARG_ENABLE(freetype,       AS_HELP_STRING([ --enable-freetype], [Build Xprint FreeType backend (default: yes)]), [XP_USE_FREETYPE=$enableval],[XP_USE_FREETYPE=no])
 
438
AC_ARG_WITH(freetype-config,  AS_HELP_STRING([ --with-freetype-config=PROG], [Use FreeType configuration program PROG (default: auto)]), freetype_config=$withval, freetype_config=auto)
 
439
 
398
440
 
399
441
dnl chown/chmod to be setuid root as part of build
400
442
dnl Replaces InstallXserverSetUID in imake
462
504
XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
463
505
 
464
506
dnl Core modules for most extensions, et al.
465
 
REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto resourceproto fontsproto inputproto xf86dgaproto"
 
507
REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto"
466
508
REQUIRED_LIBS="xfont xau fontenc"
467
509
 
468
510
AM_CONDITIONAL(XV, [test "x$XV" = xyes])
470
512
        AC_DEFINE(XV, 1, [Support Xv extension])
471
513
        AC_DEFINE(XvExtension, 1, [Build Xv extension])
472
514
        REQUIRED_MODULES="$REQUIRED_MODULES videoproto"
473
 
        AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes])
474
 
        if test "x$XVMC" = xyes; then
475
 
                AC_DEFINE(XvMCExtension, 1, [Build XvMC extension])
476
 
        fi
 
515
else
 
516
        XVMC=no
 
517
fi
 
518
 
 
519
AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes])
 
520
if test "x$XVMC" = xyes; then
 
521
        AC_DEFINE(XvMCExtension, 1, [Build XvMC extension])
477
522
fi
478
523
 
479
524
AM_CONDITIONAL(DGA, [test "x$DGA" = xyes])
484
529
AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes])
485
530
if test "x$COMPOSITE" = xyes; then
486
531
        AC_DEFINE(COMPOSITE, 1, [Support Composite Extension])
487
 
        REQUIRED_MODULES="$REQUIRED_MODULES compositeproto"
 
532
        REQUIRED_MODULES="$REQUIRED_MODULES [compositeproto >= 0.3]"
488
533
        COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la'
489
534
        COMPOSITE_INC='-I$(top_srcdir)/composite'
490
535
fi
522
567
 
523
568
if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
524
569
        PKG_CHECK_MODULES([XLIB], [x11])
 
570
        PKG_CHECK_MODULES([GL], [glproto >= 1.4.6])
525
571
        AC_SUBST(XLIB_CFLAGS)
526
572
        AC_DEFINE(GLXEXT, 1, [Build GLX extension])
527
573
        GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
528
574
        test -d GL || mkdir GL
529
575
        $srcdir/GL/symlink-mesa.sh $MESA_SOURCE GL/
 
576
        if test $? -ne 0; then
 
577
                AC_MSG_ERROR([Failed to link Mesa source tree.  Please specify a proper path to Mesa sources, or disable GLX.])
 
578
        fi
530
579
else
531
580
        GLX=no
532
581
fi
533
582
AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
534
583
AC_SUBST([MESA_SOURCE])
535
584
 
 
585
if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then
 
586
        AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
 
587
else
 
588
        AIGLX=no
 
589
fi
 
590
AM_CONDITIONAL(AIGLX, test "x$AIGLX" = xyes)
 
591
 
 
592
if test "x$GLX_USE_TLS" = xyes -a "x$AIGLX" = xyes; then
 
593
        GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
 
594
        GLX_LIBS="$GLX_LIBS -lpthread"
 
595
fi
 
596
AC_SUBST([GLX_DEFINES])
 
597
 
 
598
PKG_CHECK_MODULES([LBXUTIL_TEST], [lbxutil], [have_lbxutil=yes], [have_lbxutil=no])
 
599
 
 
600
if test "x$LBX" = xauto; then
 
601
    if test "x$have_lbxutil" = "xyes"; then
 
602
        LBX="yes"
 
603
    else
 
604
        LBX="no"
 
605
    fi
 
606
fi
 
607
 
536
608
AM_CONDITIONAL(LBX, [test "x$LBX" = xyes])
537
609
if test "x$LBX" = xyes; then
538
610
        AC_DEFINE(LBX, 1, [Support LBX extension])
609
681
        DBE_LIB='$(top_builddir)/dbe/libdbe.la'
610
682
fi
611
683
 
 
684
AM_CONDITIONAL(XF86BIGFONT, [test "x$XF86BIGFONT" = xyes])
 
685
if test "x$XF86BIGFONT" = xyes; then
 
686
        AC_DEFINE(XF86BIGFONT, 1, [Support XF86 Big font extension])
 
687
fi
 
688
 
 
689
AM_CONDITIONAL(DPMSExtension, [test "x$DPMSExtension" = xyes])
 
690
if test "x$DPMSExtension" = xyes; then
 
691
        AC_DEFINE(DPMSExtension, 1, [Support DPMS extension])
 
692
fi
 
693
 
612
694
if test "x$XF86VIDMODE" = xyes; then
613
695
        AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension])
614
696
fi
648
730
fi
649
731
MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage'
650
732
 
651
 
AC_DEFINE(XINPUT, 1, [Support X Input extension])
652
 
XI_LIB='$(top_builddir)/Xi/libXi.la'
653
 
XI_INC='-I$(top_srcdir)/Xi'
 
733
AM_CONDITIONAL(XINPUT, [test "x$XINPUT" = xyes])
 
734
if test "x$XINPUT" = xyes; then
 
735
        AC_DEFINE(XINPUT, 1, [Support X Input extension])
 
736
        XI_LIB='$(top_builddir)/Xi/libXi.la'
 
737
        XI_INC='-I$(top_srcdir)/Xi'
 
738
fi
654
739
 
655
740
AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
656
741
 
661
746
XKB_LIB='$(top_builddir)/xkb/libxkb.la'
662
747
XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
663
748
 
 
749
AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
 
750
                                        [Do not have `strcasecmp'.]))
664
751
 
665
752
PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"])
666
753
if test "x$have_libxdmcp" = xyes; then
719
806
 
720
807
AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
721
808
AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
 
809
AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
722
810
AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
723
811
AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])
724
812
AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE_STRING"], [Vendor release])
761
849
FB_INC='-I$(top_srcdir)/fb'
762
850
MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow'
763
851
MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la'
764
 
MIEXT_LAYER_LIB='$(top_builddir)/miext/layer/liblayer.la'
765
852
XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.la'
766
853
CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
767
854
 
769
856
PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
770
857
 
771
858
XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS}"
772
 
XSERVER_LIBS="${XSERVERLIBS_LIBS} -lm -lz"
 
859
XSERVER_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} -lm -lz"
773
860
AC_SUBST([XSERVER_LIBS])
774
 
 
 
861
AC_SUBST([SYS_LIBS])
775
862
 
776
863
dnl Imake defines SVR4 on SVR4 systems, and many files check for it, so
777
864
dnl we need to replicate that here until those can all be fixed
812
899
                              modules not found.])
813
900
        fi
814
901
        DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
815
 
        XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $MIEXT_SHADOW_LIB $CWRAP_LIB $OS_LIB"
 
902
        XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $MIEXT_SHADOW_LIB $OS_LIB $CWRAP_LIB"
816
903
        AC_SUBST([XDMX_LIBS])
817
904
 
818
905
dnl USB sources in DMX require <linux/input.h>
851
938
AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
852
939
 
853
940
if test "x$XVFB" = xyes; then
854
 
        XVFB_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
 
941
        XVFB_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
855
942
        AC_SUBST([XVFB_LIBS])
856
943
fi
857
944
 
867
954
AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
868
955
 
869
956
if test "x$XNEST" = xyes; then
870
 
        XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
 
957
        XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
871
958
        AC_SUBST([XNEST_LIBS])
872
959
fi
873
960
 
884
971
fi
885
972
AC_MSG_RESULT([$XORG])
886
973
 
 
974
dnl Xgl DDX
 
975
 
 
976
AC_MSG_CHECKING([whether to build Xgl DDX])
 
977
if test "x$XGL" != xno; then
 
978
  PKG_CHECK_MODULES([XGLMODULES], [glitz-glx >= 0.4.3], [XGL=yes], [XGL=no])
 
979
  AC_SUBST(XGLMODULES_CFLAGS)
 
980
  AC_SUBST(XGLMODULES_LIBS)
 
981
fi
 
982
AC_MSG_RESULT([$XGL])
 
983
AM_CONDITIONAL(XGL, [test "x$XGL" = xyes])
 
984
 
 
985
if test "x$XGL" = xyes; then
 
986
        XGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
 
987
        AC_SUBST([XGL_LIBS])
 
988
        AC_DEFINE(XGL_MODULAR, 1, [Use loadable XGL modules])
 
989
 
 
990
        xglmoduledir="$moduledir/xgl"
 
991
        AC_SUBST([xglmoduledir])
 
992
        AC_DEFINE_DIR(XGL_MODULE_PATH, xglmoduledir, [Default XGL module search path])
 
993
fi
 
994
 
 
995
dnl Xegl DDX
 
996
 
 
997
AC_MSG_CHECKING([whether to build Xegl DDX])
 
998
if test "x$XEGL" != xno; then
 
999
  PKG_CHECK_MODULES([XGLMODULES], [glitz-glx >= 0.4.3], [XEGL=yes], [XEGL=no])
 
1000
  AC_SUBST(XEGLMODULES_CFLAGS)
 
1001
  AC_SUBST(XEGLMODULES_LIBS)
 
1002
fi
 
1003
AC_MSG_RESULT([$XEGL])
 
1004
AM_CONDITIONAL(XEGL, [test "x$XEGL" = xyes])
 
1005
 
 
1006
if test "x$XEGL" = xyes; then
 
1007
        XEGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
 
1008
        AC_SUBST([XEGL_LIBS])
 
1009
fi
 
1010
 
 
1011
dnl Xglx DDX
 
1012
 
 
1013
AC_MSG_CHECKING([whether to build Xglx DDX])
 
1014
if test "x$XGLX" != xno; then
 
1015
  PKG_CHECK_MODULES([XGLXMODULES], [glitz-glx >= 0.4.3 xrender], [XGLX=yes], [XGLX=no])
 
1016
  AC_SUBST(XGLXMODULES_CFLAGS)
 
1017
  AC_SUBST(XGLXMODULES_LIBS)
 
1018
fi
 
1019
AC_MSG_RESULT([$XGLX])
 
1020
AM_CONDITIONAL(XGLX, [test "x$XGLX" = xyes])
 
1021
 
 
1022
if test "x$XGLX" = xyes; then
 
1023
        XGLX_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
 
1024
        AC_SUBST([XGLX_LIBS])
 
1025
fi
 
1026
 
887
1027
# XORG_CORE_LIBS is needed even if you're not building the Xorg DDX
888
1028
XORG_CORE_LIBS="$DIX_LIB"
889
1029
AC_SUBST([XORG_CORE_LIBS])
896
1036
xorg_bus_sparcpci=no
897
1037
xorg_bus_sparc=no
898
1038
 
899
 
if test "x$XORG" = xyes; then
 
1039
if test "x$XORG" = xyes -o "x$XGL" = xyes; then
900
1040
        XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
901
1041
        XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
902
1042
        XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
903
1043
        XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
904
 
        XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
 
1044
        XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
905
1045
 
906
1046
        AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl")
907
1047
 
908
1048
        case $host_os in
909
1049
          linux*)
 
1050
                if test "x$LNXAPM" = xyes; then
 
1051
                        XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
 
1052
                fi
910
1053
                XORG_OS="linux"
911
1054
                XORG_OS_SUBDIR="linux"
912
1055
                XORG_OS_KBD="Lnx"
913
1056
                xorg_bus_linuxpci="yes"
 
1057
                linux_acpi="no"
914
1058
                case $host_cpu in
915
1059
                  ia64*)
916
1060
                        linux_ia64=yes
 
1061
                        linux_acpi="yes"
917
1062
                        ;;
918
1063
                  alpha*)
919
1064
                        linux_alpha=yes
920
1065
                        XORG_OS_PCI="axp"
921
1066
                        xorg_bus_linuxpci="no"
922
1067
                        ;;
 
1068
                  i*86|amd64*|x86_64*)
 
1069
                        linux_acpi="yes"
 
1070
                        ;;
923
1071
                  *)
924
1072
                        ;;
925
1073
                esac
1004
1152
                esac
1005
1153
                AC_SUBST([SOLARIS_INOUT_ARCH])
1006
1154
                if test x$solaris_asm_inline = xyes ; then
1007
 
                        XORG_CFLAGS="${XORG_CFLAGS} "'$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-${SOLARIS_INOUT_ARCH}.il'
 
1155
                        SOLARIS_ASM_CFLAGS='$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il'
 
1156
                        XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)'
1008
1157
                fi
1009
1158
                ;;
1010
1159
          *)
1077
1226
                XSERVER_CFLAGS="$GCC_WARNINGS $XSERVER_CFLAGS"
1078
1227
                LD_EXPORT_SYMBOLS_FLAG="-rdynamic"
1079
1228
        fi
 
1229
        case $host_os in
 
1230
                openbsd*)
 
1231
                LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic"
 
1232
                ;;
 
1233
        esac
1080
1234
        AC_SUBST([XORG_CFLAGS])
1081
1235
        AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])
1082
1236
 
1129
1283
AM_CONDITIONAL([XORG_LOADER_SPARC], [test "x$xorg_loader_sparcmuldiv" = xyes])
1130
1284
AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])
1131
1285
AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
 
1286
AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
1132
1287
AM_CONDITIONAL([SOLARIS_USL_CONSOLE], [test "x$solaris_usl_console" = xyes])
1133
1288
AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])
1134
1289
AM_CONDITIONAL(MFB, [test "x$XORG" = xyes])
1152
1307
 
1153
1308
        AC_PATH_PROG(MKFONTSCALE, mkfontscale)
1154
1309
        AC_PATH_PROG(MKFONTDIR, mkfontdir)
 
1310
        
 
1311
        # freetype support code borrowed from lib/XFont
 
1312
        if test x$XP_USE_FREETYPE = xyes; then
 
1313
            AC_DEFINE(XP_USE_FREETYPE,1,[Support FreeType rasterizer in Xprint for nearly all font file formats])
 
1314
 
 
1315
            if test "$freetype_config" = "auto" ; then
 
1316
                PKG_CHECK_MODULES(FREETYPE, freetype2,
 
1317
                        freetype_config=no, freetype_config=yes)
 
1318
            fi
 
1319
 
 
1320
            if test "$freetype_config" = "yes"; then
 
1321
                AC_PATH_PROG(ft_config,freetype-config,no)
 
1322
                if test "$ft_config" = "no"; then
 
1323
                        AC_MSG_ERROR([You must have freetype installed; see http://www.freetype.org/])
 
1324
                fi
 
1325
            else
 
1326
                ft_config="$freetype_config"
 
1327
            fi
 
1328
 
 
1329
            if test "$freetype_config" != "no"; then
 
1330
                FREETYPE_CFLAGS="`$ft_config --cflags`"
 
1331
                FREETYPE_LIBS="`$ft_config --libs`"
 
1332
            fi
 
1333
            FREETYPE_REQUIRES="freetype2"
 
1334
        else
 
1335
            FREETYPE_CFLAGS=""
 
1336
            FREETYPE_LIBS=""
 
1337
            FREETYPE_REQUIRES=""
 
1338
        fi
 
1339
        AC_SUBST(FREETYPE_LIBS)
 
1340
        AC_SUBST(FREETYPE_CFLAGS)
 
1341
        AC_SUBST(FREETYPE_REQUIRES)
 
1342
        # end freetype support
1155
1343
fi
 
1344
AM_CONDITIONAL(XP_USE_FREETYPE, [test "x$XPRINT" = xyes && test "x$XP_USE_FREETYPE" = xyes])
1156
1345
 
1157
1346
 
1158
1347
dnl XWin DDX
1224
1413
AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes])
1225
1414
 
1226
1415
 
 
1416
dnl kdrive DDX
 
1417
dnl utterly incomplete yet
 
1418
 
 
1419
XEYPHR_LIBS=
 
1420
XEPHYR_INCS=
 
1421
XSDL_LIBS=
 
1422
XSDL_INCS=
 
1423
XSDL_DIRS=
 
1424
 
 
1425
AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])
 
1426
if test "$KDRIVE" = yes; then
 
1427
    AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])
 
1428
    AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])
 
1429
 
 
1430
    AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
 
1431
    if test "$ac_cv_header_sys_vm86_h" = yes; then
 
1432
        AC_DEFINE(KDRIVEVESA, 1, [Build VESA-based kdrive servers])
 
1433
    fi
 
1434
 
 
1435
    AC_CHECK_HEADERS([linux/fb.h])
 
1436
    if test "$ac_cv_header_linux_fb_h" = yes; then
 
1437
        AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
 
1438
    fi
 
1439
    
 
1440
    # tslib...
 
1441
 
 
1442
    # damage shadow extension glx (NOTYET) fb mi
 
1443
    KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
 
1444
    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"
 
1445
    KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
 
1446
    KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
 
1447
    
 
1448
    KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H"
 
1449
 
 
1450
    # dix os fb mi extension glx (NOTYET) damage shadow xpstubs
 
1451
    #KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $FB_LIB $XEXT_LIB $MIEXT_DAMAGE_LIB \
 
1452
    #    $MIEXT_SHADOW_LIB $XPSTUBS_LIB"
 
1453
    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
 
1454
    KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
 
1455
    KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
 
1456
    KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
 
1457
    KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
 
1458
 
 
1459
    # check if we can build Xephyr
 
1460
    PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
 
1461
    
 
1462
    # check for SDL SDK
 
1463
    AC_CHECK_HEADERS([SDL/SDL.h])
 
1464
fi
 
1465
AC_SUBST(KDRIVE_INCS)
 
1466
AC_SUBST(KDRIVE_PURE_INCS)
 
1467
AC_SUBST(KDRIVE_CFLAGS)
 
1468
AC_SUBST(KDRIVE_PURE_LIBS)
 
1469
AC_SUBST(KDRIVE_LIBS)
 
1470
AM_CONDITIONAL(TSLIB, false)
 
1471
AM_CONDITIONAL(H3600_TS, false)
 
1472
AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
 
1473
AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
 
1474
#AM_CONDITIONAL(KDRIVEVESA, false)
 
1475
#AM_CONDITIONAL(KDRIVEFBDEV, false)
 
1476
 
 
1477
AM_CONDITIONAL(XEPHYR, [test x"$xephyr" = xyes])
 
1478
XEPHYR_LIBS="$XEPHYR_LIBS $XSERVER_LIBS"
 
1479
AC_SUBST([XEPHYR_LIBS])
 
1480
AC_SUBST([XEPHYR_INCS])
 
1481
 
 
1482
AM_CONDITIONAL(XSDLSERVER, [test x"$ac_cv_header_SDL_SDL_h" = xyes])
 
1483
if test x"$ac_cv_header_SDL_SDL_h" = xyes -o x"$XSDL" = xyes; then
 
1484
    # PKG_CHECK_MODULES(XSDL_EXTRA, Xfont xau $XDMCP_MODULES)
 
1485
    AC_DEFINE(XSDLSERVER,,[Build Xsdl server])
 
1486
    XSDL_LIBS="`sdl-config --libs` $XSERVER_LIBS"
 
1487
    XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
 
1488
fi
 
1489
AC_SUBST([XSDL_LIBS])
 
1490
AC_SUBST([XSDL_INCS])
 
1491
 
 
1492
 
1227
1493
dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)
1228
1494
AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
1229
1495
AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
1249
1515
 
1250
1516
dnl and the rest of these are generic, so they're in config.h
1251
1517
AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
1252
 
AC_DEFINE(XF86BIGFONT, 1, [Build XFree86 BigFont extension])
1253
1518
AC_DEFINE(XResExtension, 1, [Build XRes extension])
1254
 
AC_DEFINE(DPMSExtension, 1, [Build DPMS extension])
1255
1519
 
1256
1520
dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined
1257
1521
dnl _*_SOURCE on Solaris restricts to the standards, and removes non-standard
1372
1636
mfb/Makefile
1373
1637
cfb/Makefile
1374
1638
cfb16/Makefile
1375
 
cfb24/Makefile
1376
1639
cfb32/Makefile
1377
 
ilbm/Makefile
1378
 
iplan2p4/Makefile
1379
1640
mi/Makefile
1380
1641
miext/Makefile
1381
1642
miext/damage/Makefile
1382
1643
miext/shadow/Makefile
1383
1644
miext/cw/Makefile
1384
 
miext/layer/Makefile
1385
1645
miext/rootless/Makefile
1386
1646
os/Makefile
1387
1647
randr/Makefile
1390
1650
Xext/Makefile
1391
1651
Xi/Makefile
1392
1652
xfixes/Makefile
 
1653
exa/Makefile
1393
1654
hw/Makefile
1394
1655
hw/xfree86/Makefile
1395
1656
hw/xfree86/common/Makefile
1433
1694
hw/xfree86/xf4bpp/Makefile
1434
1695
hw/xfree86/xf8_16bpp/Makefile
1435
1696
hw/xfree86/xf8_32bpp/Makefile
1436
 
hw/xfree86/xf8_32wid/Makefile
1437
1697
hw/xfree86/utils/Makefile
 
1698
hw/xfree86/utils/cvt/Makefile
1438
1699
hw/xfree86/utils/gtf/Makefile
1439
1700
hw/xfree86/utils/ioport/Makefile
1440
1701
hw/xfree86/utils/kbd_mode/Makefile
1449
1710
hw/dmx/glxProxy/Makefile
1450
1711
hw/dmx/Makefile
1451
1712
hw/vfb/Makefile
 
1713
hw/xgl/Makefile
 
1714
hw/xgl/egl/Makefile
 
1715
hw/xgl/egl/module/Makefile
 
1716
hw/xgl/glx/Makefile
 
1717
hw/xgl/glx/module/Makefile
 
1718
hw/xgl/glxext/Makefile
 
1719
hw/xgl/glxext/module/Makefile
1452
1720
hw/xnest/Makefile
1453
1721
hw/xwin/Makefile
1454
1722
hw/darwin/Makefile
 
1723
hw/kdrive/Makefile
 
1724
hw/kdrive/ati/Makefile
 
1725
hw/kdrive/chips/Makefile
 
1726
hw/kdrive/ephyr/Makefile
 
1727
hw/kdrive/epson/Makefile
 
1728
hw/kdrive/fake/Makefile
 
1729
hw/kdrive/fbdev/Makefile
 
1730
hw/kdrive/i810/Makefile
 
1731
hw/kdrive/linux/Makefile
 
1732
hw/kdrive/mach64/Makefile
 
1733
hw/kdrive/mga/Makefile
 
1734
hw/kdrive/neomagic/Makefile
 
1735
hw/kdrive/nvidia/Makefile
 
1736
hw/kdrive/pm2/Makefile
 
1737
hw/kdrive/r128/Makefile
 
1738
hw/kdrive/sdl/Makefile
 
1739
hw/kdrive/sis300/Makefile
 
1740
hw/kdrive/smi/Makefile
 
1741
hw/kdrive/src/Makefile
 
1742
hw/kdrive/vesa/Makefile
 
1743
hw/kdrive/via/Makefile
1455
1744
Xprint/Makefile
1456
1745
Xprint/doc/Makefile
1457
1746
Xprint/pcl/Makefile
 
1747
Xprint/pcl-mono/Makefile
1458
1748
Xprint/raster/Makefile
1459
1749
Xprint/ps/Makefile
1460
1750
Xprint/etc/Makefile