~ubuntu-branches/ubuntu/lucid/libx11/lucid

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-12-04 11:43:54 UTC
  • mfrom: (1.1.10 upstream) (2.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20091204114354-0lik4mbb1bv1a8nw
Tags: 2:1.3.2-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add 100_latin_locale_alias.diff (LP 379785)

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
 
4
4
AC_PREREQ(2.60)
5
5
AC_INIT([libX11],
6
 
        1.2.2,
 
6
        1.3.2,
7
7
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
8
8
        libX11)
9
9
AC_CONFIG_SRCDIR([Makefile.am])
14
14
AM_CONFIG_HEADER([src/config.h])
15
15
AC_CONFIG_HEADER([include/X11/XlibConf.h])
16
16
 
17
 
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
18
 
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
19
 
XORG_MACROS_VERSION(1.2)
 
17
# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_CHANGELOG, XORG_WITH_LINT
 
18
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
 
19
XORG_MACROS_VERSION(1.3)
20
20
 
21
21
# Set common system defines for POSIX extensions, such as _GNU_SOURCE
22
22
# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
27
27
AC_PROG_LIBTOOL
28
28
DOLT
29
29
AC_PROG_CC
30
 
XORG_CWARNFLAGS
 
30
XORG_DEFAULT_OPTIONS
31
31
 
32
32
if test x"$CC_FOR_BUILD" = x; then
33
33
        if test x"$cross_compiling" = xyes; then
40
40
 
41
41
XORG_PROG_RAWCPP
42
42
 
 
43
# Find perl for "make check" tests in nls/localerules.in
 
44
AC_ARG_WITH(perl,
 
45
        AC_HELP_STRING([--with-perl=<path>],
 
46
                        [path to perl interpreter for build-time tests]),
 
47
        [PERL=$withval ; AC_MSG_CHECKING([perl]) ;
 
48
         AC_MSG_RESULT([(from --with-perl) $PERL])],
 
49
        AC_CHECK_PROGS([PERL], [perl], [no]))
 
50
AM_CONDITIONAL(HAVE_PERL, test x$PERL != xno)
 
51
 
43
52
# Build with XCB support?
44
53
AC_ARG_WITH(xcb,
45
54
        AC_HELP_STRING([--with-xcb], [use XCB for low-level protocol implementation]),
54
63
case "$ac_cv_use_xcb" in
55
64
no)
56
65
        X11_REQUIRES="xau xcmiscproto bigreqsproto"
57
 
        X11_EXTRA_DEPS="xau xdmcp"
58
 
        PKG_CHECK_MODULES(XDMCP, xdmcp)
59
 
        AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS])
 
66
        X11_EXTRA_DEPS="xau"
 
67
        PKG_CHECK_MODULES(XDMCP, xdmcp,
 
68
                AC_CHECK_LIB(Xdmcp, XdmcpWrap,
 
69
                        [
 
70
                        AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS])
 
71
                        X11_EXTRA_DEPS="$X11_EXTRA_DEPS xdmcp"
 
72
                        ],
 
73
                        [
 
74
                        XDMCP_CFLAGS=
 
75
                        XDMCP_LIBS=
 
76
                        ], [$XDMCP_LIBS]),
 
77
                [AC_MSG_RESULT(no)])
60
78
        AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation])
61
79
        ;;
62
80
*)
76
94
dnl first and if it's not in the default location, that you set the ACLOCAL
77
95
dnl environment variable to find it, such as:
78
96
dnl     ACLOCAL="aclocal -I ${PREFIX}/share/aclocal"
79
 
m4_pattern_forbid(XTRANS_CONNECTION_FLAGS)
 
97
m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$])
80
98
 
81
99
# Transport selection macro from xtrans.m4
82
100
XTRANS_CONNECTION_FLAGS
163
181
 
164
182
# Checks for header files.
165
183
AC_HEADER_STDC
166
 
dnl AC_CHECK_HEADERS([stdio.h stdlib.h math.h])
 
184
AC_CHECK_HEADERS([sys/select.h])
167
185
 
168
186
# Checks for typedefs, structures, and compiler characteristics.
169
187
 
321
339
                [Disable XKB support *EXPERIMENTAL*]),
322
340
              [XKB=$enableval],[XKB=yes])
323
341
 
324
 
XORG_MANPAGE_SECTIONS
325
 
 
326
342
AC_ARG_ENABLE(man-pages,
327
343
              AC_HELP_STRING([--enable-man-pages=section],
328
344
                             [Choose manual section for installing man pages]),
410
426
XERRORDB="${X11_DATADIR}/XErrorDB"
411
427
AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
412
428
 
413
 
 
414
429
XORG_CHECK_MALLOC_ZERO
415
 
XORG_RELEASE_VERSION
416
 
XORG_CHANGELOG
 
430
 
 
431
# Specification documents are currently provided in troff format
 
432
AC_ARG_VAR([GROFF], [Path to a groff executable that supports -ms])
 
433
AC_PATH_PROGS([GROFF], [groff], [none], [$PATH:/usr/gnu/bin])
 
434
 
 
435
AC_ARG_VAR([PS2PDF], [Path to a ps2pdf executable])
 
436
AC_PATH_PROGS([PS2PDF], [ps2pdf], [none], [$PATH:/usr/gnu/bin])
 
437
 
 
438
if test "x${GROFF}" != xnone ; then
 
439
    AC_MSG_CHECKING([whether ${GROFF} -ms works])
 
440
    if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then
 
441
        groff_ms_works=yes
 
442
    else
 
443
        groff_ms_works=no
 
444
        GROFF=none
 
445
    fi
 
446
    AC_MSG_RESULT([${groff_ms_works}])
 
447
fi
 
448
 
 
449
AC_MSG_CHECKING([whether to build specifications])
 
450
AC_ARG_ENABLE(specs, AC_HELP_STRING([--enable-specs],
 
451
                                   [Enable building of specification docs]),
 
452
              [build_specs="${enableval}"], [build_specs="auto"])
 
453
 
 
454
if test "x${build_specs}" = xauto; then
 
455
    if test "x${GROFF}" = xnone ; then
 
456
        build_specs=no
 
457
    else
 
458
        build_specs=yes
 
459
    fi
 
460
fi
 
461
AC_MSG_RESULT([${build_specs}])
 
462
if test "x${build_specs}" = xyes && test "x${GROFF}" = xnone ; then
 
463
    AC_MSG_ERROR([can't build documentation without groff])
 
464
fi
 
465
 
 
466
AM_CONDITIONAL(BUILD_SPECS, [test x$build_specs = xyes])
 
467
AM_CONDITIONAL(HAVE_PS2PDF, [test x$PS2PDF != xnone])
 
468
 
417
469
 
418
470
AC_OUTPUT([Makefile
419
471
           include/Makefile
495
547
           nls/zh_TW/Makefile
496
548
           nls/zh_TW.big5/Makefile
497
549
           nls/zh_TW.UTF-8/Makefile
 
550
           specs/Makefile
 
551
           specs/i18n/Makefile
 
552
           specs/libX11/Makefile
 
553
           specs/XIM/Makefile
498
554
           x11.pc
499
555
           x11-xcb.pc])
500
556