← Back to branch summary

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

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Christopher James Halse Rogers
  • Date: 2012-01-23 16:09:29 UTC
  • mfrom: (1.1.46) (0.11.34 sid)
  • Revision ID: package-import@ubuntu.com-20120123160929-k4xdb9b7xeesiukp
Tags: 2:1.11.3-0ubuntu8
https://launchpad.net/bugs/903973
* debian/patches/224_return_BadWindow_not_BadMatch.diff:
  - Fix the error values of a whole slew of window-related calls.
    Fixes some gnome-settings-daemon aborts in XLib (LP: #903973)

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.10.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
30
 
RELEASE_DATE="2011-08-19"
 
29
AC_INIT([xorg-server], 1.11.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 
30
RELEASE_DATE="2011-12-16"
31
31
AC_CONFIG_SRCDIR([Makefile.am])
32
32
AM_INIT_AUTOMAKE([foreign dist-bzip2])
33
33
AM_MAINTAINER_MODE
34
34
 
35
 
# Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS
 
35
# Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS
36
36
m4_ifndef([XORG_MACROS_VERSION],
37
 
          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
38
 
XORG_MACROS_VERSION(1.10)
 
37
          [m4_fatal([must install xorg-macros 1.14 or later before running autoconf/autogen])])
 
38
XORG_MACROS_VERSION(1.14)
39
39
XORG_DEFAULT_OPTIONS
40
40
XORG_WITH_DOXYGEN(1.6.1)
41
 
XORG_CHECK_SGML_DOCTOOLS(1.5)
 
41
XORG_CHECK_SGML_DOCTOOLS(1.8)
 
42
XORG_ENABLE_DOCS
 
43
XORG_ENABLE_DEVEL_DOCS
 
44
XORG_WITH_XMLTO(0.0.20)
 
45
XORG_WITH_FOP
 
46
XORG_WITH_XSLTPROC
 
47
XORG_ENABLE_UNIT_TESTS
 
48
XORG_LD_WRAP([optional])
42
49
 
43
50
m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])])
44
51
XORG_FONT_MACROS_VERSION(1.1)
312
319
    ])]
313
320
)
314
321
 
315
 
dnl ARM needs additional compiler flags for proper backtraces if GCC is
316
 
dnl used. Compile a dummy program with the -mapcs-frame option. If it
317
 
dnl succeeds, we know that we are building for ARM with GCC.
318
 
old_CFLAGS="$CFLAGS"
319
 
CFLAGS="-mapcs-frame"
320
 
AC_COMPILE_IFELSE(
321
 
        AC_LANG_PROGRAM([[ ]]),
322
 
        ARM_BACKTRACE_CFLAGS="$CFLAGS",
323
 
        ARM_BACKTRACE_CFLAGS=""
324
 
)
325
 
CFLAGS="$old_CFLAGS"
326
 
AC_SUBST(ARM_BACKTRACE_CFLAGS)
327
 
 
328
322
dnl ---------------------------------------------------------------------------
329
323
dnl Bus options and CPU capabilities.  Replaces logic in
330
324
dnl hw/xfree86/os-support/bus/Makefile.am, among others.
467
461
AC_ARG_ENABLE(debug,         AS_HELP_STRING([--enable-debug],
468
462
                                  [Enable debugging (default: disabled)]),
469
463
                                [DEBUGGING=$enableval], [DEBUGGING=no])
470
 
AC_ARG_ENABLE(unit-tests,    AS_HELP_STRING([--enable-unit-tests],
471
 
                                  [Enable unit-tests (default: auto)]),
472
 
                                [UNITTESTS=$enableval], [UNITTESTS=auto])
473
464
AC_ARG_ENABLE(use-sigio-by-default, AS_HELP_STRING([--enable-use-sigio-by-default]
474
465
  [Enable SIGIO input handlers by default (default: $USE_SIGIO_BY_DEFAULT)]),
475
466
                                [USE_SIGIO_BY_DEFAULT=$enableval], [])
572
563
                                [ APPLE_APPLICATION_NAME="${withval}" ],
573
564
                                [ APPLE_APPLICATION_NAME="X11" ])
574
565
AC_SUBST([APPLE_APPLICATION_NAME])
575
 
AC_ARG_WITH(launchd-id-prefix,  AS_HELP_STRING([--with-launchd-id-prefix=PATH], [Prefix to use for launchd identifiers (default: org.x)]),
576
 
                                [ LAUNCHD_ID_PREFIX="${withval}" ],
577
 
                                [ LAUNCHD_ID_PREFIX="org.x" ])
578
 
AC_SUBST([LAUNCHD_ID_PREFIX])
579
 
AC_DEFINE_UNQUOTED(LAUNCHD_ID_PREFIX, "$LAUNCHD_ID_PREFIX", [Prefix to use for launchd identifiers])
 
566
AC_ARG_WITH(launchd-id-prefix,  AS_HELP_STRING([--with-launchd-id-prefix=PATH], [Deprecated: Use --with-bundle-id-prefix.]),
 
567
                                [ BUNDLE_ID_PREFIX="${withval}" ],
 
568
                                [ BUNDLE_ID_PREFIX="org.x" ])
 
569
AC_ARG_WITH(bundle-id-prefix,  AS_HELP_STRING([--with-bundle-id-prefix=PATH], [Prefix to use for bundle identifiers (default: org.x)]),
 
570
                               [ BUNDLE_ID_PREFIX="${withval}" ])
 
571
AC_SUBST([BUNDLE_ID_PREFIX])
 
572
AC_DEFINE_UNQUOTED(BUNDLE_ID_PREFIX, "$BUNDLE_ID_PREFIX", [Prefix to use for bundle identifiers])
580
573
AC_ARG_ENABLE(sparkle,AS_HELP_STRING([--enable-sparkle], [Enable updating of X11.app using the Sparkle Framework (default: disabled)]),
581
574
                                [ XQUARTZ_SPARKLE="${enableval}" ],
582
575
                                [ XQUARTZ_SPARKLE="no" ])
597
590
AC_ARG_ENABLE(aiglx,          AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]),
598
591
                                [AIGLX=$enableval],
599
592
                                [AIGLX=yes])
600
 
AX_TLS
 
593
XORG_TLS
601
594
AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with TLS support (default: auto)]),
602
595
                                [GLX_USE_TLS=$enableval
603
596
                                 if test "x$GLX_USE_TLS" = "xyes" && test "${ac_cv_tls}" = "none" ; then
608
601
                                   GLX_USE_TLS=yes
609
602
                                 fi])
610
603
AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
 
604
AC_ARG_WITH(khronos-spec-dir, AS_HELP_STRING([--with-khronos-spec-dir=PATH], [Path to Khronos OpenGL registry database files (default: auto)]),
 
605
                                [KHRONOS_SPEC_DIR="${withval}"],
 
606
                                [KHRONOS_SPEC_DIR=auto])
611
607
 
612
608
dnl Extensions.
613
609
AC_ARG_ENABLE(registry,       AS_HELP_STRING([--disable-registry], [Build string registry module (default: enabled)]), [XREGISTRY=$enableval], [XREGISTRY=yes])
629
625
AC_ARG_ENABLE(xace,           AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
630
626
AC_ARG_ENABLE(xselinux,       AS_HELP_STRING([--enable-xselinux], [Build SELinux extension (default: disabled)]), [XSELINUX=$enableval], [XSELINUX=no])
631
627
AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]), [XCSECURITY=$enableval], [XCSECURITY=no])
632
 
AC_ARG_ENABLE(xcalibrate,     AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
633
628
AC_ARG_ENABLE(tslib,          AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
634
629
AC_ARG_ENABLE(dbe,            AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])
635
630
AC_ARG_ENABLE(xf86bigfont,    AS_HELP_STRING([--enable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no])
644
639
AC_ARG_ENABLE(int10-module,     AS_HELP_STRING([--enable-int10-module], [Build Xorg with int10 module (default: enabled)]), [INT10MODULE=$enableval], [INT10MODULE=yes])
645
640
AC_ARG_ENABLE(windowswm,      AS_HELP_STRING([--enable-windowswm], [Build XWin with WindowsWM extension (default: no)]), [WINDOWSWM=$enableval], [WINDOWSWM=no])
646
641
AC_ARG_ENABLE(libdrm,         AS_HELP_STRING([--enable-libdrm], [Build Xorg with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes])
 
642
AC_ARG_ENABLE(clientids,      AS_HELP_STRING([--disable-clientids], [Build Xorg with client ID tracking (default: enabled)]), [CLIENTIDS=$enableval], [CLIENTIDS=yes])
647
643
 
648
644
dnl DDXes.
649
645
AC_ARG_ENABLE(xorg,           AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
714
710
        AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
715
711
fi
716
712
 
717
 
XORG_ENABLE_DOCS
718
 
XORG_ENABLE_DEVEL_DOCS
719
 
XORG_WITH_XMLTO(0.0.20)
720
 
XORG_WITH_FOP
721
 
 
722
713
dnl Handle installing libxf86config
723
714
AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])
724
715
 
740
731
                                save_LDFLAGS=$LDFLAGS
741
732
                                LDFLAGS="$LDFLAGS -framework Carbon"
742
733
                                AC_LINK_IFELSE([char FSFindFolder(); int main() { FSFindFolder(); return 0;}],
743
 
                                [xorg_cv_Carbon_framework=yes],
744
 
                                [xorg_cv_Carbon_framework=no])
745
 
                        LDFLAGS=$save_LDFLAGS])
 
734
                                               [xorg_cv_Carbon_framework=yes],
 
735
                                               [xorg_cv_Carbon_framework=no])
 
736
                                LDFLAGS=$save_LDFLAGS])
746
737
                
747
738
                        if test "X$xorg_cv_Carbon_framework" = Xyes; then
748
739
                                XQUARTZ=yes
751
742
                        fi
752
743
                fi
753
744
 
 
745
                AC_CHECK_FUNC(dispatch_async,
 
746
                              AC_DEFINE([HAVE_LIBDISPATCH], 1, [Define to 1 if you have the libdispatch (GCD) available]),
 
747
                              [])
 
748
 
754
749
                if test "x$XQUARTZ" = xyes ; then
755
750
                        XQUARTZ=yes
756
751
                        XVFB=no
779
774
SCRNSAVERPROTO="scrnsaverproto >= 1.1"
780
775
RESOURCEPROTO="resourceproto"
781
776
DRIPROTO="xf86driproto >= 2.1.0"
782
 
DRI2PROTO="dri2proto >= 2.3"
 
777
DRI2PROTO="dri2proto >= 2.6"
783
778
XINERAMAPROTO="xineramaproto"
784
779
BIGFONTPROTO="xf86bigfontproto >= 1.2.0"
785
 
XCALIBRATEPROTO="xcalibrateproto"
786
780
DGAPROTO="xf86dgaproto >= 2.0.99.1"
787
 
GLPROTO="glproto >= 1.4.10"
 
781
GLPROTO="glproto >= 1.4.14"
788
782
DMXPROTO="dmxproto >= 2.2.99.1"
789
783
VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
790
784
WINDOWSWMPROTO="windowswmproto"
791
785
APPLEWMPROTO="applewmproto >= 1.4"
792
786
 
793
787
dnl Core modules for most extensions, et al.
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"
 
788
SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 2.1.99.5] [kbproto >= 1.0.3] fontsproto"
795
789
# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
796
790
AC_SUBST(SDK_REQUIRED_MODULES)
797
791
 
806
800
LIBXI="xi >= 1.2.99.1"
807
801
LIBXTST="xtst >= 1.0.99.2"
808
802
LIBPCIACCESS="pciaccess >= 0.8.0"
809
 
LIBGLIB="glib-2.0 >= 2.16"
810
803
LIBUDEV="libudev >= 143"
811
804
LIBSELINUX="libselinux >= 2.0.86"
812
805
LIBDBUS="dbus-1 >= 1.0"
813
 
LIBPIXMAN="pixman-1 >= 0.15.20"
 
806
LIBPIXMAN="pixman-1 >= 0.21.8"
814
807
 
815
808
dnl Pixman is always required, but we separate it out so we can link
816
809
dnl specific modules against it
817
810
PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
818
811
REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"
819
812
 
820
 
REQUIRED_MODULES="[fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"
 
813
REQUIRED_MODULES="[fixesproto >= 5.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"
821
814
 
822
815
if test "x$CONFIG_UDEV" = xyes &&
823
816
 { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then
997
990
        REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO"
998
991
fi
999
992
 
 
993
# The XRes extension may support client ID tracking only if it has
 
994
# been specifically enabled. Client ID tracking is implicitly not
 
995
# supported if XRes extension is disabled.
 
996
AC_MSG_CHECKING([whether to track client ids])
 
997
if test "x$RES" = xyes && test "x$CLIENTIDS" = xyes; then
 
998
        AC_DEFINE(CLIENTIDS, 1, [Support client ID tracking])
 
999
else
 
1000
        CLIENTIDS=no
 
1001
fi
 
1002
AC_MSG_RESULT([$CLIENTIDS])
 
1003
AM_CONDITIONAL(CLIENTIDS, [test "x$CLIENTIDS" = xyes])
 
1004
 
1000
1005
if test "x$GLX" = xyes; then
1001
1006
        PKG_CHECK_MODULES([XLIB], [x11])
1002
1007
        PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL)
1009
1014
fi
1010
1015
AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
1011
1016
 
1012
 
if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a \( "x$DRI" = xyes -o "x$DRI2" = xyes \); then
 
1017
if test "x$GLX" = xno; then
 
1018
        AIGLX=no
 
1019
fi
 
1020
 
 
1021
if test "x$AIGLX" = xyes -a \( "x$DRI" = xyes -o "x$DRI2" = xyes \); then
1013
1022
        AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
1014
 
else
1015
 
        AIGLX=no
1016
1023
fi
1017
 
AM_CONDITIONAL(AIGLX, test "x$AIGLX" = xyes)
 
1024
AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI" = xyes || test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes)
1018
1025
 
1019
1026
if test "x$GLX_USE_TLS" = xyes ; then
1020
1027
        GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
1123
1130
        AC_DEFINE(DPMSExtension, 1, [Support DPMS extension])
1124
1131
fi
1125
1132
 
1126
 
if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then
1127
 
   AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
1128
 
   REQUIRED_MODULES="$REQUIRED_MODULES $XCALIBRATEPROTO"
1129
 
else
1130
 
   XCALIBRATE=no
1131
 
fi
1132
 
AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])
1133
 
 
1134
1133
AC_DEFINE(RENDER, 1, [Support RENDER extension])
1135
1134
RENDER_LIB='$(top_builddir)/render/librender.la'
1136
1135
RENDER_INC='-I$(top_srcdir)/render'
1188
1187
    case $host_os in
1189
1188
    linux*)
1190
1189
        dnl doesn't take AutoAddDevices into account, but whatever.
1191
 
        if test "x$CONFIG_HAL" = xyes; then
1192
 
            XKB_DFLT_RULES="evdev"
1193
 
        else
1194
 
            XKB_DFLT_RULES="base"
1195
 
        fi
 
1190
        XKB_DFLT_RULES="evdev"
1196
1191
        ;;
1197
1192
    *)
1198
1193
        XKB_DFLT_RULES="base"
1204
1199
AC_DEFINE_UNQUOTED(XKB_DFLT_LAYOUT, ["$XKB_DFLT_LAYOUT"], [Default XKB layout])
1205
1200
AC_DEFINE_UNQUOTED(XKB_DFLT_VARIANT, ["$XKB_DFLT_VARIANT"], [Default XKB variant])
1206
1201
AC_DEFINE_UNQUOTED(XKB_DFLT_OPTIONS, ["$XKB_DFLT_OPTIONS"], [Default XKB options])
 
1202
AC_SUBST([XKB_DFLT_RULES])
 
1203
AC_SUBST([XKB_DFLT_MODEL])
 
1204
AC_SUBST([XKB_DFLT_LAYOUT])
 
1205
AC_SUBST([XKB_DFLT_VARIANT])
 
1206
AC_SUBST([XKB_DFLT_OPTIONS])
1207
1207
 
1208
1208
XKB_LIB='$(top_builddir)/xkb/libxkb.la'
1209
1209
XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
1284
1284
fi
1285
1285
AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])
1286
1286
 
1287
 
# If unittests aren't explicitly disabled, check for required support
1288
 
if test "x$UNITTESTS" != xno ; then
1289
 
       PKG_CHECK_MODULES([GLIB], $LIBGLIB,
1290
 
                         [HAVE_GLIB=yes], [HAVE_GLIB=no])
1291
 
 
1292
 
       # Check if linker supports -wrap, passed via compiler flags
1293
 
       # When cross-compiling, reports no, since unit tests run from
1294
 
       # "make check", so would be running on build machine,  not target
1295
 
       AC_MSG_CHECKING([whether the linker supports -wrap])
1296
 
       save_LDFLAGS="$LDFLAGS"
1297
 
       LDFLAGS="$LDFLAGS -Wl,-wrap,exit"
1298
 
       AC_RUN_IFELSE([AC_LANG_PROGRAM([[
1299
 
        void __wrap_exit (int s)
1300
 
        {
1301
 
            __real_exit (0);
1302
 
        }]],
1303
 
        [[exit (1);]])],
1304
 
                     [linker_can_wrap="yes"],
1305
 
                     [linker_can_wrap="no"],
1306
 
                     [linker_can_wrap="no"])
1307
 
       AC_MSG_RESULT([$linker_can_wrap])
1308
 
       LDFLAGS="$save_LDFLAGS"
1309
 
fi
1310
 
 
1311
 
if test "x$UNITTESTS" = xauto; then
1312
 
       if test "x$HAVE_GLIB" = xyes && test "x$linker_can_wrap" = xyes; then
1313
 
           UNITTESTS=yes
1314
 
       else
1315
 
           UNITTESTS=no
1316
 
       fi
1317
 
fi
1318
 
if test "x$UNITTESTS" = xyes; then
1319
 
       if test "x$HAVE_GLIB" = xno; then
1320
 
           AC_MSG_ERROR([glib required to build unit tests])
1321
 
       fi
1322
 
       if test "x$linker_can_wrap" = xno; then
1323
 
           AC_MSG_ERROR([ld -wrap support required to build unit tests])
1324
 
       fi
1325
 
       AC_DEFINE(UNITTESTS, 1, [Enable unit tests])
1326
 
       AC_SUBST([GLIB_LIBS])
1327
 
       AC_SUBST([GLIB_CFLAGS])
1328
 
fi
1329
 
AM_CONDITIONAL(UNITTESTS, [test "x$UNITTESTS" = xyes])
1330
 
 
1331
1287
AC_DEFINE(XTEST, 1, [Support XTest extension])
1332
1288
AC_DEFINE(XSYNC, 1, [Support XSync extension])
1333
1289
AC_DEFINE(XCMISC, 1, [Support XCMisc extension])
1528
1484
        if test "x$have_xnest" = xno; then
1529
1485
                AC_MSG_ERROR([Xnest build explicitly requested, but required modules not found.])
1530
1486
        fi
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"
 
1487
        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 $MAIN_LIB $DIX_LIB $OS_LIB"
1532
1488
        XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
1533
1489
        AC_SUBST([XNEST_LIBS])
1534
1490
        AC_SUBST([XNEST_SYS_LIBS])
1567
1523
            if test x$GCC = xyes; then
1568
1524
                VISIBILITY_CFLAGS="-fvisibility=hidden"
1569
1525
            else
1570
 
                AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
1571
1526
                if test x$SUNCC = xyes; then
1572
1527
                    VISIBILITY_CFLAGS="-xldscope=hidden"
1573
1528
                else
1676
1631
                if test "${OS_MINOR}" -lt 8 ; then
1677
1632
                        AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.])
1678
1633
                fi
1679
 
                AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
1680
1634
                if test "x$SUNCC" = "xyes"; then
1681
1635
                        solaris_asm_inline="yes"
1682
1636
                fi
1777
1731
        AC_SUBST([XORG_INCS])
1778
1732
        AC_SUBST([XORG_OS])
1779
1733
        AC_SUBST([XORG_OS_SUBDIR])
1780
 
 
1781
 
        AC_PATH_PROG(PERL, perl, no)
1782
 
        dnl unlikely as this may be ...
1783
 
        if test "x$PERL" = xno; then
1784
 
                AC_MSG_ERROR([Perl is required to build the XFree86/Xorg DDX.])
1785
 
        fi
1786
 
        AC_SUBST(PERL)
1787
 
 
1788
1734
        AC_SUBST([XORG_CFLAGS])
1789
1735
 
1790
1736
        dnl these only go in xorg-config.h
1905
1851
 
1906
1852
        AC_DEFINE(DDXOSVERRORF, 1, [Use OsVendorVErrorF])
1907
1853
        AC_DEFINE(DDXBEFORERESET, 1, [Use ddxBeforeReset ])
 
1854
 
 
1855
dnl XWin with AIGLX requires OpenGL spec files in order to generate wrapper code for native GL functions
 
1856
        if [test "x$XWIN" = xyes && test "x$AIGLX" = xyes] ; then
 
1857
           if test "x$KHRONOS_SPEC_DIR" = "xauto" ; then
 
1858
                PKG_CHECK_MODULES([KHRONOS_OPENGL_REGISTRY], [khronos-opengl-registry])
 
1859
                KHRONOS_SPEC_DIR=`pkg-config khronos-opengl-registry --variable=specdir`
 
1860
           fi
 
1861
           AC_SUBST(KHRONOS_SPEC_DIR)
 
1862
        fi
 
1863
 
1908
1864
fi
1909
1865
AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes])
1910
1866
AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes])
1911
1867
AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes])
1912
1868
AM_CONDITIONAL(XWIN_CLIPBOARD, [test "x$XWIN" = xyes])
1913
 
AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && false])
 
1869
AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && test "x$AIGLX" = xyes])
1914
1870
AM_CONDITIONAL(XWIN_NATIVEGDI, [test "x$XWIN" = xyes])
1915
1871
AM_CONDITIONAL(XWIN_PRIMARYFB, [test "x$XWIN" = xyes])
1916
1872
AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes])
1921
1877
        AC_DEFINE(XQUARTZ,1,[Have Quartz])
1922
1878
        AC_DEFINE(ROOTLESS,1,[Build Rootless code])
1923
1879
 
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"
1925
 
        AC_SUBST([DARWIN_LIBS])
 
1880
        XQUARTZ_LIBS="$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"
 
1881
        AC_SUBST([XQUARTZ_LIBS])
1926
1882
 
1927
1883
        AC_CHECK_LIB([Xplugin],[xp_init],[:])
1928
1884
 
2073
2029
        XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"
2074
2030
    fi
2075
2031
 
2076
 
    PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
2077
2032
    if test "x$XEPHYR" = xauto; then
2078
 
        XEPHYR=$xephyr
2079
 
    fi
2080
 
    if test "x$XEPHYR" = xyes && test "x$xephyr" = xno; then    
2081
 
        AC_MSG_ERROR([Xephyr dependencies missing])
 
2033
        PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [XEPHYR="yes"], [XEPHYR="no"])
 
2034
    elif test "x$XEPHYR" = xyes ; then
 
2035
        PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS)
2082
2036
    fi
2083
2037
 
2084
2038
    # Xephyr needs nanosleep() which is in librt on Solaris
2176
2130
AC_SUBST([exec_prefix])
2177
2131
AC_SUBST([prefix])
2178
2132
 
2179
 
AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/loader/sdksyms.dep])
 
2133
AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/sdksyms.dep])
2180
2134
 
2181
2135
AC_OUTPUT([
2182
2136
Makefile
2187
2141
dbe/Makefile
2188
2142
dix/Makefile
2189
2143
doc/Makefile
2190
 
doc/man/Makefile
2191
 
doc/xml/Makefile
2192
 
doc/xml/dtrace/Makefile
2193
 
doc/xml/xserver.ent
 
2144
doc/dtrace/Makefile
 
2145
man/Makefile
2194
2146
fb/Makefile
2195
2147
record/Makefile
2196
2148
config/Makefile
2217
2169
hw/xfree86/dixmods/Makefile
2218
2170
hw/xfree86/dixmods/extmod/Makefile
2219
2171
hw/xfree86/doc/Makefile
2220
 
hw/xfree86/doc/devel/Makefile
2221
 
hw/xfree86/doc/man/Makefile
2222
 
hw/xfree86/doc/sgml/Makefile
2223
2172
hw/xfree86/dri/Makefile
2224
2173
hw/xfree86/dri2/Makefile
2225
2174
hw/xfree86/exa/Makefile
2229
2178
hw/xfree86/i2c/Makefile
2230
2179
hw/xfree86/int10/Makefile
2231
2180
hw/xfree86/loader/Makefile
 
2181
hw/xfree86/man/Makefile
2232
2182
hw/xfree86/modes/Makefile
2233
2183
hw/xfree86/os-support/Makefile
2234
2184
hw/xfree86/os-support/bsd/Makefile
2251
2201
hw/dmx/config/Makefile
2252
2202
hw/dmx/config/man/Makefile
2253
2203
hw/dmx/doc/Makefile
2254
 
hw/dmx/doc/doxygen.conf
 
2204
hw/dmx/doxygen/doxygen.conf
 
2205
hw/dmx/doxygen/Makefile
2255
2206
hw/dmx/examples/Makefile
2256
2207
hw/dmx/input/Makefile
2257
2208
hw/dmx/glxProxy/Makefile
2280
2231
hw/kdrive/src/Makefile
2281
2232
test/Makefile
2282
2233
test/xi2/Makefile
 
2234
xserver.ent
2283
2235
xorg-server.pc
2284
2236
])