← Back to branch summary

~ubuntu-branches/ubuntu/saucy/apache2/saucy

« back to all changes in this revision

Viewing changes to srclib/apr-util/include/apu.hw

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-02-12 20:06:35 UTC
  • mfrom: (14.3.34 sid)
  • Revision ID: package-import@ubuntu.com-20120212200635-2u9d58jxqkmx91na
Tags: 2.2.22-1ubuntu1
* Merge from Debian testing.  Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree
  - debian/apache2.py, debian/apache2.2-common.install: Add apport hook.
  - debian/control, debian/ask-for-passphrase, debian/config-dir/mods-available/ssl.conf:
    Plymouth aware passphrase dialog program ask-for-passphrase.

Show diffs side-by-side

added added

removed removed

Lines of Context:
srclib/apr-util/include/apu.hw
125
125
#define APU_HAVE_ODBC           1
126
126
#endif
127
127
 
 
128
#define APU_HAVE_CRYPTO         0
 
129
 
 
130
#ifndef APU_DSO_MODULE_BUILD
 
131
#define APU_HAVE_OPENSSL        0
 
132
#define APU_HAVE_NSS            0
 
133
#endif
 
134
 
128
135
#define APU_HAVE_APR_ICONV      1
129
136
#define APU_HAVE_ICONV          0
130
137
#define APR_HAS_XLATE           (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)