← Back to branch summary

~ubuntu-branches/ubuntu/wily/xterm/wily

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Robert Hooker
  • Date: 2010-06-10 22:13:44 UTC
  • mfrom: (1.1.18 upstream) (11.1.19 sid)
  • Revision ID: james.westby@ubuntu.com-20100610221344-s4wbmxbevlklu7fv
Tags: 259-1ubuntu1
https://launchpad.net/bugs/539473
https://launchpad.net/bugs/320388
https://launchpad.net/bugs/408496
* Merge from debian unstable. Remaining Ubuntu changes:
  - Revert the libutempter change because it's in universe. (LP: #539473)
  - Enabled URL highlighting
  - Add 100_uxterm_utf8_title.patch: Set utf8Titles to true by default
    when using uxterm, so that it displays utf8 directories in titles
    properly.  May cause issues with apps that use control sequences for
    updating the xterm titlebar - users should use xterm or set utf8Title
    to false in this case. (LP: #320388, #408496)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
1
 
dnl $XTermId: configure.in,v 1.256 2010/01/04 21:41:10 tom Exp $
 
1
dnl $XTermId: configure.in,v 1.264 2010/06/05 19:47:23 tom Exp $
2
2
dnl
3
3
dnl -----------------------------------------------------------------------------
4
4
dnl this file is part of xterm
280
280
        X11/DECkeysym.h \
281
281
        X11/Sunkeysym.h \
282
282
        X11/XF86keysym.h \
 
283
        X11/XKBlib.h \
283
284
        X11/Xpoll.h \
 
285
        X11/extensions/XKB.h \
284
286
        )
285
287
 
286
288
CF_X_ATHENA
300
302
        ;;
301
303
esac
302
304
 
 
305
AC_CHECK_FUNCS(XkbQueryExtension)
 
306
 
303
307
CF_XKB_BELL_EXT
 
308
 
304
309
AC_CHECK_FUNCS(Xutf8LookupString, [],[
305
310
        EXTRAHDRS="$EXTRAHDRS xutf8.h"
306
311
        EXTRASRCS="$EXTRASRCS xutf8.c"
583
588
 
584
589
AC_MSG_CHECKING(if you want saved-lines stored as a FIFO)
585
590
CF_ARG_DISABLE(fifo-lines,
586
 
        [  --enable-fifo-lines     disable FIFO-storage for saved-lines],
 
591
        [  --disable-fifo-lines    disable FIFO-storage for saved-lines],
587
592
        [enable_fifo_lines=no],
588
593
        [enable_fifo_lines=yes])
589
594
AC_MSG_RESULT($enable_fifo_lines)
712
717
AC_MSG_RESULT($enable_regex)
713
718
if test "$enable_regex" = yes ; then
714
719
        CF_WITH_PCRE
 
720
        if test "x$ac_cv_lib_pcreposix_regcomp" = xyes ; then
 
721
                # 2010/6/5 - workaround - plink.sh would remove the library
 
722
                AC_MSG_ERROR(This version of PCRE will not link properly with xterm)
 
723
        fi
715
724
        if test "$with_pcre" = no ; then
716
725
                CF_REGEX
717
726
                if test "X$cf_cv_regex_hdrs" != "Xregex.h" ; then
813
822
AC_MSG_RESULT($enable_luit)
814
823
if test "$enable_luit" = yes ; then
815
824
        AC_DEFINE(OPT_LUIT_PROG,1)
816
 
        CF_PATH_PROG(LUIT,luit)
 
825
        CF_PATH_PROG(LUIT,xterm-filter,bluit luit)
817
826
fi
818
827
 
819
828
AC_MSG_CHECKING(if you want wide-character support)
981
990
        CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-D$cf_def//`
982
991
done
983
992
 
 
993
CF_MAKE_TAGS
 
994
CF_DISABLE_RPATH_HACK
 
995
 
984
996
###     output Makefile and xtermcfg.h
985
997
AC_OUTPUT(Makefile)