← Back to branch summary

~hexmode/ubuntu/lucid/php5/php5.fix-php-bug-33210

« back to all changes in this revision

Viewing changes to ext/standard/config.m4

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-11-06 01:44:25 UTC
  • mfrom: (1.1.15 upstream) (0.3.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091106014425-5dsqjhbg303h3kfn
Tags: 5.2.11.dfsg.1-1ubuntu1
https://launchpad.net/bugs/323731
* Merge from debian testing, remaining changes:
  - debian/control, debian/rules: Disable a few build dependencies and
    accompanying, binary packages which we do not want to support in main:
    + firebird2-dev/php5-interbase (we have a seperate php-interbase source)
    + libc-client/php5-imap (we have a seperate php-imap source)
    + libmcrypt-dev/php5-mcrypt (seperate php-mycrpt source)
    + readline support again, now that the libedit issue is fixed.
  - debian/control: Add build dependency: libdedit-dev (>= 2.9.cvs.20050518-1)
    CLI readline support.
  - debian/rules:
    + Correctly mangle PHP5_* macros for lpia
  - debian/control:
    + Use libdb-4.6-dev.
    + Rename Vcs-Browser & Vcs-Git to XS-Original-Vcs-Browser & XS-Original-Vcs-Git (LP: #323731).
  - Dropped patches:
    - debian/patches/119-sybase-alias.patch: Use Debian's patch.
    - debian/patches/fix-autoconf-ftbfs.patch: Use Debian's patch
    - debian/patches/fix-zlib-decompression: Already in upstream
  - Use the default pear/install-pear-nozlib.phar in php 5.2.11
  - debian/control: Move php5-suhoshin to Suggests.
  - debian/rules: Fix broken symlink for pear.
  - Dropped dependency on autoconf2.13.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/standard/config.m4
1
 
dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*-
 
1
dnl $Id: config.m4 286890 2009-08-06 14:07:16Z scottmac $ -*- autoconf -*-
2
2
 
3
3
divert(3)dnl
4
4
 
309
309
 
310
310
dnl
311
311
dnl Detect library functions needed by php dns_xxx functions
312
 
dnl ext/standard/dns.h will collect these in a single define: HAVE_DNS_FUNCS
 
312
dnl ext/standard/php_dns.h will collect these in a single define: HAVE_DNS_FUNCS
313
313
dnl
314
314
PHP_CHECK_FUNC(res_nmkquery, resolv, bind, socket)
315
315
PHP_CHECK_FUNC(res_nsend, resolv, bind, socket)
509
509
                            info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
510
510
                            microtime.c pack.c pageinfo.c quot_print.c rand.c \
511
511
                            reg.c soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
512
 
                            url_scanner.c var.c versioning.c assert.c strnatcmp.c levenshtein.c \
 
512
                            var.c versioning.c assert.c strnatcmp.c levenshtein.c \
513
513
                            incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
514
514
                            http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
515
515
                            var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \