← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xserver-xorg-video-sis/trusty

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois
  • Date: 2012-05-01 19:17:28 UTC
  • mfrom: (4.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20120501191728-lin26r5cjg0kfo1k
Tags: 1:0.10.4-1
* New upstream release:
  - Fix FTBFS with X server 1.12.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
20
20
#
21
21
# Process this file with autoconf to produce a configure script
22
22
 
23
 
AC_PREREQ(2.57)
 
23
# Initialize Autoconf
 
24
AC_PREREQ([2.60])
24
25
AC_INIT([xf86-video-sis],
25
 
        0.10.3,
 
26
        [0.10.4],
26
27
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
27
 
        xf86-video-sis)
28
 
 
 
28
        [xf86-video-sis])
29
29
AC_CONFIG_SRCDIR([Makefile.am])
30
 
AM_CONFIG_HEADER([config.h])
 
30
AC_CONFIG_HEADERS([config.h])
31
31
AC_CONFIG_AUX_DIR(.)
32
32
 
 
33
# Initialize Automake
33
34
AM_INIT_AUTOMAKE([foreign dist-bzip2])
34
 
 
35
35
AM_MAINTAINER_MODE
36
36
 
37
 
# Require xorg-macros: XORG_DEFAULT_OPTIONS
 
37
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
38
38
m4_ifndef([XORG_MACROS_VERSION],
39
 
          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
40
 
XORG_MACROS_VERSION(1.3)
 
39
          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
 
40
XORG_MACROS_VERSION(1.8)
41
41
XORG_DEFAULT_OPTIONS
42
42
 
43
 
# Checks for programs.
 
43
# Initialize libtool
44
44
AC_DISABLE_STATIC
45
45
AC_PROG_LIBTOOL
46
 
AC_PROG_CC
47
 
XORG_PROG_RAWCPP
48
46
 
49
47
AH_TOP([#include "xorg-server.h"])
50
48
 
 
49
# Define a configure option for an alternate module directory
51
50
AC_ARG_WITH(xorg-module-dir,
52
 
            AC_HELP_STRING([--with-xorg-module-dir=DIR],
 
51
            AS_HELP_STRING([--with-xorg-module-dir=DIR],
53
52
                           [Default xorg module directory [[default=$libdir/xorg/modules]]]),
54
53
            [moduledir="$withval"],
55
54
            [moduledir="$libdir/xorg/modules"])
56
55
 
57
 
AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
 
56
AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
58
57
                                  [Disable DRI support [[default=auto]]]),
59
58
              [DRI="$enableval"],
60
59
              [DRI=auto])
61
60
 
62
 
# Checks for extensions
 
61
# Store the list of server defined optional extensions in REQUIRED_MODULES
63
62
XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
64
63
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
65
64
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
66
65
XORG_DRIVER_CHECK_EXT(XV, videoproto)
67
66
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
68
67
 
69
 
# Checks for pkg-config packages
70
 
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
 
68
# Obtain compiler/linker options for the driver dependencies
 
69
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto >= 2.1 $REQUIRED_MODULES])
71
70
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
72
71
                  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
73
72
                  HAVE_XEXTPROTO_71="no")
76
75
 
77
76
# Checks for libraries.
78
77
 
79
 
# Checks for header files.
80
 
AC_HEADER_STDC
81
 
 
82
78
if test "$DRI" != no; then
83
79
        AC_CHECK_FILE([${sdkdir}/dri.h],
84
80
                      [have_dri_h="yes"], [have_dri_h="no"])
103
99
AM_CONDITIONAL(DRI, test x$DRI = xyes)
104
100
if test "$DRI" = yes; then
105
101
        PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
106
 
        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
107
 
        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
 
102
        AC_DEFINE(SISDRI,1,[Enable DRI driver support])
 
103
        AC_DEFINE(SISDRI_DEVEL,1,[Enable developmental DRI driver support])
108
104
fi
109
105
 
110
106
# technically this should be a configure flag.  meh.
118
114
CPPFLAGS="$SAVE_CPPFLAGS"
119
115
 
120
116
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
121
 
    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
 
117
    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901])
122
118
    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
123
119
fi
124
120
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
125
121
 
126
 
AC_SUBST([DRI_CFLAGS])
127
 
AC_SUBST([XORG_CFLAGS])
128
122
AC_SUBST([moduledir])
129
123
 
130
124
DRIVER_NAME=sis
131
125
AC_SUBST([DRIVER_NAME])
132
126
 
133
 
AC_OUTPUT([
134
 
        Makefile
135
 
        src/Makefile
136
 
        man/Makefile
 
127
AC_CONFIG_FILES([
 
128
                Makefile
 
129
                src/Makefile
 
130
                man/Makefile
137
131
])
 
132
AC_OUTPUT