← Back to branch summary

~ubuntu-branches/ubuntu/lucid/zsh-beta/lucid

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Porcheron
  • Date: 2007-11-07 21:17:29 UTC
  • mfrom: (1.1.33 upstream)
  • Revision ID: james.westby@ubuntu.com-20071107211729-t20yh1yfbv7vvdxf
Tags: 4.3.4-dev-1+20071030-1ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  -  Add "add-shell /bin/zsh" because zsh-beta is already registered
     as an alternative to zsh, and this is needed to be able to have
     zsh-beta as the only installed zsh.
  - Don't set PATH in zshenv any more
  - Update maintainer in field debian/control.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1134
1134
               brk sbrk \
1135
1135
               pathconf sysconf \
1136
1136
               tgetent tigetflag tigetnum tigetstr setupterm initscr \
1137
 
               setcchar waddwstr \
 
1137
               setcchar waddwstr wget_wch use_default_colors \
1138
1138
               pcre_compile pcre_study pcre_exec \
1139
1139
               nl_langinfo \
1140
1140
               erand48 open_memstream \
1354
1354
ERRNO_H="$zsh_cv_path_errno_h"
1355
1355
AC_SUBST(ERRNO_H)dnl
1356
1356
 
 
1357
dnl Where are curses key definitions located?  Need for keypad() mode.
 
1358
AC_CACHE_CHECK(where curses key definitions are located, zsh_cv_path_curses_keys_h,
 
1359
[dnl This is an identical trick to errno.h, except we use ncurses.h
 
1360
dnl if we can.
 
1361
if test x$ac_cv_header_ncurses_h = xyes; then
 
1362
  echo "#include <ncurses.h>" >nametmp.c
 
1363
else
 
1364
  if test x$ac_cv_header_curses_h = xyes; then
 
1365
    echo "#include <curses.h>" >nametmp.c
 
1366
  else
 
1367
    echo >nametmp.c
 
1368
  fi
 
1369
fi
 
1370
curses_list="`$CPP nametmp.c |
 
1371
sed -n -e 's/^#line[    ].*\"\(.*\)\"/\1/p' \
 
1372
       -e 's/^#[        0-9].*\"\(.*\)\"/\1/p' |
 
1373
sed 's/\\\\\\\\/\//g' |
 
1374
$AWK '{ if ($1 ~ /\.h/) files[[$1]] = $1 }
 
1375
  END { for (var in files) print var }'`"
 
1376
rm -f nametmp.c
 
1377
for CURSES_TRY_H in $curses_list /dev/null
 
1378
do
 
1379
  nkeys=`test -f $CURSES_TRY_H && \
 
1380
  $EGREP '#[    ]*define[       ][      ]*KEY_' $CURSES_TRY_H | \
 
1381
  wc -l | sed 's/[      ]//g'`
 
1382
  if test "x$nkeys" != x && test "$nkeys" -ge 10
 
1383
  then
 
1384
    CURSES_KEYS_H=$CURSES_TRY_H
 
1385
    break
 
1386
  fi
 
1387
done
 
1388
zsh_cv_path_curses_keys_h="$CURSES_KEYS_H"
 
1389
])
 
1390
CURSES_KEYS_H="$zsh_cv_path_curses_keys_h"
 
1391
AC_SUBST(CURSES_KEYS_H)dnl
 
1392
 
1357
1393
dnl -----------------------------------------------------
1358
1394
dnl Look for the file containing the RLIMIT_* definitions
1359
1395
dnl -----------------------------------------------------