← Back to branch summary

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

« back to all changes in this revision

Viewing changes to configure.ac

Tags: 2:1.10.1-2
* Build xserver-xorg-core-udeb on hurd-i386.  Thanks, Samuel Thibault!
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
26
26
dnl Process this file with autoconf to create configure.
27
27
 
28
28
AC_PREREQ(2.57)
29
 
AC_INIT([xorg-server], 1.9.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
30
 
RELEASE_DATE="2011-03-17"
 
29
AC_INIT([xorg-server], 1.10.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 
30
RELEASE_DATE="2011-04-15"
31
31
AC_CONFIG_SRCDIR([Makefile.am])
32
32
AM_INIT_AUTOMAKE([foreign dist-bzip2])
33
33
AM_MAINTAINER_MODE
64
64
dnl forcing an entire recompile.x
65
65
AC_CONFIG_HEADERS(include/version-config.h)
66
66
 
67
 
AC_PROG_CC
68
67
AM_PROG_AS
69
 
AC_PROG_INSTALL
70
68
AC_PROG_LN_S
71
69
AC_LIBTOOL_WIN32_DLL
72
70
AC_DISABLE_STATIC
73
71
AC_PROG_LIBTOOL
74
 
DOLT
75
72
AC_PROG_MAKE_SET
76
73
PKG_PROG_PKG_CONFIG
77
74
AC_PROG_LEX
78
75
AC_PROG_YACC
79
76
AC_SYS_LARGEFILE
80
77
XORG_PROG_RAWCPP
81
 
AC_PROG_SED
82
78
 
83
79
# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow
84
80
# easier overrides at build time.
207
203
AC_FUNC_VPRINTF
208
204
AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr \
209
205
                strtol getopt getopt_long vsnprintf walkcontext backtrace \
210
 
                getisax getzoneid shmctl64 strcasestr ffs])
 
206
                getisax getzoneid shmctl64 strcasestr ffs vasprintf])
211
207
AC_FUNC_ALLOCA
212
208
dnl Old HAS_* names used in os/*.c.
213
209
AC_CHECK_FUNC([getdtablesize],
585
581
                                [ XQUARTZ_SPARKLE="${enableval}" ],
586
582
                                [ XQUARTZ_SPARKLE="no" ])
587
583
AC_SUBST([XQUARTZ_SPARKLE])
588
 
AC_ARG_ENABLE(builddocs,      AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),
589
 
                                [BUILDDOCS=$enableval],
590
 
                                [BUILDDOCS=no])
591
584
AC_ARG_ENABLE(install-libxf86config,
592
585
                                AS_HELP_STRING([--enable-install-libxf86config],
593
586
                                [Install libxf86config (default: disabled)]),
601
594
                                [SUPPORT_PC98=auto])
602
595
 
603
596
dnl GLX build options
604
 
AC_ARG_WITH(dri-driver-path,  AS_HELP_STRING([--with-dri-driver-path=PATH], [Path to DRI drivers (default: ${libdir}/dri)]),
605
 
                                [ DRI_DRIVER_PATH="$withval" ],
606
 
                                [ DRI_DRIVER_PATH="${libdir}/dri" ])
607
597
AC_ARG_ENABLE(aiglx,          AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]),
608
598
                                [AIGLX=$enableval],
609
599
                                [AIGLX=yes])
610
 
AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with TLS support (default: disabled)]),
611
 
                                [GLX_USE_TLS=$enableval],
612
 
                                [GLX_USE_TLS=no])
 
600
AX_TLS
 
601
AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with TLS support (default: auto)]),
 
602
                                [GLX_USE_TLS=$enableval
 
603
                                 if test "x$GLX_USE_TLS" = "xyes" && test "${ac_cv_tls}" = "none" ; then
 
604
                                   AC_MSG_ERROR([GLX with TLS support requested, but the compiler does not support it.])
 
605
                                 fi],
 
606
                                [GLX_USE_TLS=no
 
607
                                 if test "${ac_cv_tls}" != "none" ; then
 
608
                                   GLX_USE_TLS=yes
 
609
                                 fi])
 
610
AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
613
611
 
614
612
dnl Extensions.
615
613
AC_ARG_ENABLE(registry,       AS_HELP_STRING([--disable-registry], [Build string registry module (default: enabled)]), [XREGISTRY=$enableval], [XREGISTRY=yes])
716
714
        AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
717
715
fi
718
716
 
719
 
dnl Handle building documentation
720
 
AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes)
721
717
XORG_ENABLE_DOCS
722
718
XORG_ENABLE_DEVEL_DOCS
723
719
XORG_WITH_XMLTO(0.0.20)
795
791
APPLEWMPROTO="applewmproto >= 1.4"
796
792
 
797
793
dnl Core modules for most extensions, et al.
798
 
SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.0.99.3] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"
 
794
SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"
799
795
# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
800
796
AC_SUBST(SDK_REQUIRED_MODULES)
801
797
 
1259
1255
AC_DEFINE_DIR(PCI_TXT_IDS_PATH, PCI_TXT_IDS_DIR, [Default PCI text file ID path])
1260
1256
AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous config path])
1261
1257
AC_DEFINE_DIR(BASE_FONT_PATH, FONTROOTDIR, [Default base font path])
1262
 
AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
 
1258
dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`
 
1259
AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])
1263
1260
AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_NAME"], [Vendor name])
1264
1261
AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_NAME_SHORT"], [Short vendor name])
1265
1262
AC_DEFINE_UNQUOTED(XORG_DATE, ["$RELEASE_DATE"], [Vendor release])
1356
1353
FB_INC='-I$(top_srcdir)/fb'
1357
1354
MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow'
1358
1355
MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la'
 
1356
MIEXT_SYNC_INC='-I$(top_srcdir)/miext/sync'
 
1357
MIEXT_SYNC_LIB='$(top_builddir)/miext/sync/libsync.la'
1359
1358
CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
1360
1359
 
1361
1360
# SHA1 hashing
1495
1494
AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])
1496
1495
AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))
1497
1496
 
1498
 
XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"
 
1497
XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SYNC_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"
1499
1498
 
1500
1499
dnl ---------------------------------------------------------------------------
1501
1500
dnl DDX section.
1508
1507
AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
1509
1508
 
1510
1509
if test "x$XVFB" = xyes; then
1511
 
        XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
 
1510
        XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
1512
1511
        XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
1513
1512
        AC_SUBST([XVFB_LIBS])
1514
1513
        AC_SUBST([XVFB_SYS_LIBS])
1529
1528
        if test "x$have_xnest" = xno; then
1530
1529
                AC_MSG_ERROR([Xnest build explicitly requested, but required modules not found.])
1531
1530
        fi
1532
 
        XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"
 
1531
        XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"
1533
1532
        XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
1534
1533
        AC_SUBST([XNEST_LIBS])
1535
1534
        AC_SUBST([XNEST_SYS_LIBS])
1557
1556
        XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
1558
1557
        XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
1559
1558
        XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
1560
 
        XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"
 
1559
        XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"
1561
1560
 
1562
1561
        dnl ==================================================================
1563
1562
        dnl symbol visibility
1892
1891
                        XWIN_SYS_LIBS=-lwinsock2
1893
1892
                        ;;
1894
1893
        esac
1895
 
        XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $RANDR_LIB $RENDER_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"
 
1894
        XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $RANDR_LIB $RENDER_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"
1896
1895
        XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"
1897
1896
        AC_SUBST(XWIN_LIBS)
1898
1897
        AC_SUBST(XWIN_SERVER_NAME)
1912
1911
AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes])
1913
1912
AM_CONDITIONAL(XWIN_CLIPBOARD, [test "x$XWIN" = xyes])
1914
1913
AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && false])
1915
 
AM_CONDITIONAL(XWIN_NATIVEGDI, [test "x$XWIN" = xyes && false])
1916
 
AM_CONDITIONAL(XWIN_PRIMARYFB, [test "x$XWIN" = xyes && false])
 
1914
AM_CONDITIONAL(XWIN_NATIVEGDI, [test "x$XWIN" = xyes])
 
1915
AM_CONDITIONAL(XWIN_PRIMARYFB, [test "x$XWIN" = xyes])
1917
1916
AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes])
1918
1917
AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes])
1919
1918
 
1922
1921
        AC_DEFINE(XQUARTZ,1,[Have Quartz])
1923
1922
        AC_DEFINE(ROOTLESS,1,[Build Rootless code])
1924
1923
 
1925
 
        DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
 
1924
        DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
1926
1925
        AC_SUBST([DARWIN_LIBS])
1927
1926
 
1928
1927
        AC_CHECK_LIB([Xplugin],[xp_init],[:])
1983
1982
        fi
1984
1983
        DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"
1985
1984
        XDMX_CFLAGS="$DMXMODULES_CFLAGS"
1986
 
        XDMX_LIBS="$FB_LIB $MI_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $XEXT_LIB $MAIN_LIB $DIX_LIB $OS_LIB $FIXES_LIB"
 
1985
        XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"
1987
1986
        XDMX_SYS_LIBS="$DMXMODULES_LIBS"
1988
1987
        AC_SUBST([XDMX_CFLAGS])
1989
1988
        AC_SUBST([XDMX_LIBS])
2088
2087
    
2089
2088
    # damage shadow extension glx (NOTYET) fb mi
2090
2089
    KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
2091
 
    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"
 
2090
    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_SYNC_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"
2092
2091
    KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
2093
2092
    KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
2094
2093
    
2095
2094
    KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
2096
2095
 
2097
 
    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
 
2096
    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
2098
2097
    KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
2099
2098
    case $host_os in
2100
2099
        *linux*)
2177
2176
AC_SUBST([exec_prefix])
2178
2177
AC_SUBST([prefix])
2179
2178
 
 
2179
AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/loader/sdksyms.dep])
 
2180
 
2180
2181
AC_OUTPUT([
2181
2182
Makefile
2182
2183
glx/Makefile
2186
2187
dbe/Makefile
2187
2188
dix/Makefile
2188
2189
doc/Makefile
 
2190
doc/man/Makefile
2189
2191
doc/xml/Makefile
2190
2192
doc/xml/dtrace/Makefile
2191
2193
doc/xml/xserver.ent
2194
2196
config/Makefile
2195
2197
mi/Makefile
2196
2198
miext/Makefile
 
2199
miext/sync/Makefile
2197
2200
miext/damage/Makefile
2198
2201
miext/shadow/Makefile
2199
2202
miext/cw/Makefile
2220
2223
hw/xfree86/dri/Makefile
2221
2224
hw/xfree86/dri2/Makefile
2222
2225
hw/xfree86/exa/Makefile
 
2226
hw/xfree86/exa/man/Makefile
2223
2227
hw/xfree86/fbdevhw/Makefile
 
2228
hw/xfree86/fbdevhw/man/Makefile
2224
2229
hw/xfree86/i2c/Makefile
2225
2230
hw/xfree86/int10/Makefile
2226
2231
hw/xfree86/loader/Makefile
2231
2236
hw/xfree86/os-support/hurd/Makefile
2232
2237
hw/xfree86/os-support/misc/Makefile
2233
2238
hw/xfree86/os-support/linux/Makefile
2234
 
hw/xfree86/os-support/sco/Makefile
2235
2239
hw/xfree86/os-support/solaris/Makefile
2236
 
hw/xfree86/os-support/sysv/Makefile
2237
2240
hw/xfree86/parser/Makefile
2238
2241
hw/xfree86/ramdac/Makefile
2239
2242
hw/xfree86/shadowfb/Makefile
2241
2244
hw/xfree86/vgahw/Makefile
2242
2245
hw/xfree86/x86emu/Makefile
2243
2246
hw/xfree86/xaa/Makefile
2244
 
hw/xfree86/xf8_16bpp/Makefile
2245
2247
hw/xfree86/utils/Makefile
 
2248
hw/xfree86/utils/man/Makefile
2246
2249
hw/xfree86/utils/cvt/Makefile
2247
2250
hw/xfree86/utils/gtf/Makefile
2248
2251
hw/dmx/config/Makefile
 
2252
hw/dmx/config/man/Makefile
2249
2253
hw/dmx/doc/Makefile
 
2254
hw/dmx/doc/doxygen.conf
2250
2255
hw/dmx/examples/Makefile
2251
2256
hw/dmx/input/Makefile
2252
2257
hw/dmx/glxProxy/Makefile
2253
2258
hw/dmx/Makefile
 
2259
hw/dmx/man/Makefile
2254
2260
hw/vfb/Makefile
 
2261
hw/vfb/man/Makefile
2255
2262
hw/xnest/Makefile
 
2263
hw/xnest/man/Makefile
2256
2264
hw/xwin/Makefile
2257
2265
hw/xwin/glx/Makefile
 
2266
hw/xwin/man/Makefile
2258
2267
hw/xquartz/Makefile
2259
2268
hw/xquartz/GL/Makefile
2260
2269
hw/xquartz/bundle/Makefile
2261
 
hw/xquartz/doc/Makefile
 
2270
hw/xquartz/man/Makefile
2262
2271
hw/xquartz/mach-startup/Makefile
2263
2272
hw/xquartz/pbproxy/Makefile
2264
2273
hw/xquartz/xpr/Makefile
2265
2274
hw/kdrive/Makefile
2266
2275
hw/kdrive/ephyr/Makefile
 
2276
hw/kdrive/ephyr/man/Makefile
2267
2277
hw/kdrive/fake/Makefile
2268
2278
hw/kdrive/fbdev/Makefile
2269
2279
hw/kdrive/linux/Makefile