← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xterm/quantal

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-05-06 05:13:35 UTC
  • mfrom: (1.1.14 upstream) (11.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20090506051335-wq7afxwrm5ir33xr
Tags: 242-1ubuntu1
https://launchpad.net/bugs/372492
* Merge from debian unstable, remaining changes: LP: #372492
  - Enabled URL hilighting
  - rm -rf for .pc patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
1
 
dnl $XTermId: aclocal.m4,v 1.257 2009/01/25 23:32:11 tom Exp $
 
1
dnl $XTermId: aclocal.m4,v 1.258 2009/02/13 21:04:32 tom Exp $
2
2
dnl
3
3
dnl $XFree86: xc/programs/xterm/aclocal.m4,v 3.65 2006/06/19 00:36:50 dickey Exp $
4
4
dnl
636
636
fi
637
637
])dnl
638
638
dnl ---------------------------------------------------------------------------
639
 
dnl CF_GCC_WARNINGS version: 23 updated: 2008/07/26 17:54:02
 
639
dnl CF_GCC_WARNINGS version: 24 updated: 2009/02/01 15:21:00
640
640
dnl ---------------
641
641
dnl Check if the compiler supports useful warning options.  There's a few that
642
642
dnl we don't use, simply because they're too noisy:
669
669
then
670
670
# The "-wdXXX" options suppress warnings:
671
671
# remark #1419: external declaration in primary source file
672
 
# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
673
672
# remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
674
673
# remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
675
674
# remark #193: zero used for undefined preprocessing identifier
677
676
# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
678
677
# remark #869: parameter "tw" was never referenced
679
678
# remark #981: operands are evaluated in unspecified order
680
 
# warning #269: invalid format string conversion
 
679
# warning #279: controlling expression is constant
681
680
 
682
681
        AC_CHECKING([for $CC warning options])
683
682
        cf_save_CFLAGS="$CFLAGS"
684
683
        EXTRA_CFLAGS="-Wall"
685
684
        for cf_opt in \
686
685
                wd1419 \
687
 
                wd1682 \
688
686
                wd1683 \
689
687
                wd1684 \
690
688
                wd193 \
 
689
                wd593 \
691
690
                wd279 \
692
 
                wd593 \
693
691
                wd810 \
694
692
                wd869 \
695
693
                wd981
2338
2336
fi
2339
2337
])dnl
2340
2338
dnl ---------------------------------------------------------------------------
2341
 
dnl CF_XKB_BELL_EXT version: 2 updated: 2003/05/18 17:28:57
 
2339
dnl CF_XKB_BELL_EXT version: 3 updated: 2009/02/13 16:00:39
2342
2340
dnl ---------------
2343
2341
dnl Check for XKB bell extension
2344
2342
AC_DEFUN([CF_XKB_BELL_EXT],[
2345
2343
AC_CACHE_CHECK(for XKB Bell extension, cf_cv_xkb_bell_ext,[
2346
2344
AC_TRY_LINK([
 
2345
#include <X11/Intrinsic.h>
2347
2346
#include <X11/XKBlib.h>         /* has the prototype */
2348
2347
#include <X11/extensions/XKBbells.h>    /* has the XkbBI_xxx definitions */
2349
2348
],[
2350
 
int x = XkbBI_Info
2351
 
        |XkbBI_MinorError
2352
 
        |XkbBI_MajorError
2353
 
        |XkbBI_TerminalBell
2354
 
        |XkbBI_MarginBell;
 
2349
        int x = (XkbBI_Info |XkbBI_MinorError |XkbBI_MajorError |XkbBI_TerminalBell |XkbBI_MarginBell);
 
2350
        Atom y;
 
2351
        XkbBell((Display *)0, (Widget)0, 0, y);
2355
2352
],[cf_cv_xkb_bell_ext=yes],[cf_cv_xkb_bell_ext=no])
2356
2353
])
2357
 
 
2358
2354
test "$cf_cv_xkb_bell_ext" = yes && AC_DEFINE(HAVE_XKB_BELL_EXT)
2359
2355
])
2360
2356
dnl ---------------------------------------------------------------------------