← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xterm/trusty

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2010-03-31 12:32:27 UTC
  • mfrom: (1.1.17 upstream) (11.1.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100331123227-8a6qwmyciob6j88y
Tags: 256-1ubuntu1
https://launchpad.net/bugs/539473
* Merge from Debian unstable.
* Revert the libutempter change for lucid. (LP: #539473)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
1
 
dnl $XTermId: configure.in,v 1.254 2009/08/30 21:46:21 tom Exp $
 
1
dnl $XTermId: configure.in,v 1.256 2010/01/04 21:41:10 tom Exp $
2
2
dnl
3
3
dnl -----------------------------------------------------------------------------
4
4
dnl this file is part of xterm
5
5
dnl
6
 
dnl Copyright 1997-2008,2009 by Thomas E. Dickey
 
6
dnl Copyright 1997-2009,2010 by Thomas E. Dickey
7
7
dnl 
8
8
dnl                         All Rights Reserved
9
9
dnl 
331
331
AC_MSG_RESULT($default_TERM)
332
332
AC_DEFINE_UNQUOTED(DFT_TERMTYPE,"$default_TERM")
333
333
 
334
 
AC_MSG_CHECKING(for private terminfo-directory)
335
 
AC_ARG_WITH(own-terminfo,
336
 
        [  --with-own-terminfo=P   set default $TERMINFO (default: from environment)],
337
 
        [TERMINFO_DIR=$withval],
338
 
        [TERMINFO_DIR=${TERMINFO-none}])
339
 
AC_MSG_RESULT($TERMINFO_DIR)
340
 
if test "$TERMINFO_DIR" = yes ; then
341
 
        AC_MSG_WARN(no value given)
342
 
elif test "$TERMINFO_DIR" != none ; then
343
 
        if test -d $TERMINFO_DIR ; then
344
 
                AC_DEFINE_UNQUOTED(OWN_TERMINFO_DIR,"$TERMINFO_DIR")
 
334
AC_CHECK_PROG(cf_tic_prog,tic,yes,no)
 
335
if test "$cf_tic_prog" = yes ; then
 
336
        AC_MSG_CHECKING(for private terminfo-directory)
 
337
        AC_ARG_WITH(own-terminfo,
 
338
                [  --with-own-terminfo=P   set default $TERMINFO (default: from environment)],
 
339
                [TERMINFO_DIR=$withval],
 
340
                [TERMINFO_DIR=${TERMINFO-none}])
 
341
        AC_MSG_RESULT($TERMINFO_DIR)
 
342
        if test "$TERMINFO_DIR" = yes ; then
 
343
                AC_MSG_WARN(no value given)
 
344
        elif test "$TERMINFO_DIR" != none ; then
 
345
                if test -d $TERMINFO_DIR ; then
 
346
                        AC_DEFINE_UNQUOTED(OWN_TERMINFO_DIR,"$TERMINFO_DIR")
 
347
                else
 
348
                        AC_MSG_WARN(not a directory)
 
349
                fi
 
350
        elif test "$prefix" != NONE ; then
 
351
                TERMINFO_DIR='${prefix}/lib/terminfo'
 
352
        elif test -d /usr/lib/terminfo ; then
 
353
                TERMINFO_DIR=/usr/lib/terminfo
345
354
        else
346
 
                AC_MSG_WARN(not a directory)
347
 
        fi
348
 
elif test "$prefix" != NONE ; then
349
 
        TERMINFO_DIR='${prefix}/lib/terminfo'
350
 
elif test -d /usr/lib/terminfo ; then
351
 
        TERMINFO_DIR=/usr/lib/terminfo
 
355
                TERMINFO_DIR=
 
356
        fi
 
357
        SET_TERMINFO=
 
358
        if test -n "$TERMINFO_DIR" ; then
 
359
                TERMINFO_DIR='$(DESTDIR)'$TERMINFO_DIR
 
360
                SET_TERMINFO='TERMINFO=$(TERMINFO_DIR)'
 
361
        fi
 
362
        no_ticprog=
352
363
else
 
364
        no_ticprog="#"
353
365
        TERMINFO_DIR=
354
 
fi
355
 
SET_TERMINFO=
356
 
if test -n "$TERMINFO_DIR" ; then
357
 
        TERMINFO_DIR='$(DESTDIR)'$TERMINFO_DIR
358
 
        SET_TERMINFO='TERMINFO=$(TERMINFO_DIR)'
359
 
fi
 
366
        SET_TERMINFO=
 
367
fi
 
368
AC_SUBST(no_ticprog)
360
369
AC_SUBST(TERMINFO_DIR)
361
370
AC_SUBST(SET_TERMINFO)
362
371
 
705
714
        CF_WITH_PCRE
706
715
        if test "$with_pcre" = no ; then
707
716
                CF_REGEX
708
 
                if test "X$cf_cv_regex" != "Xregex.h" ; then
 
717
                if test "X$cf_cv_regex_hdrs" != "Xregex.h" ; then
709
718
                        AC_MSG_ERROR(Only POSIX or PCRE regular expressions are supported)
710
719
                fi
711
720
        fi