← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/apache2/jaunty-proposed

« back to all changes in this revision

Viewing changes to srclib/apr-util/build/apu-conf.m4

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2008-12-15 00:06:50 UTC
  • mfrom: (14.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20081215000650-5ovq2vvvrtmn5r1l
Tags: 2.2.11-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/{control, rules}: enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: add ufw profiles.

Show diffs side-by-side

added added

removed removed

Lines of Context:
srclib/apr-util/build/apu-conf.m4
356
356
    LIBS=$save_libs
357
357
  ])
358
358
 
 
359
if test "$apu_has_ldap_openldap" = "1"; then
 
360
    save_cppflags="$CPPFLAGS"
 
361
    save_ldflags="$LDFLAGS"
 
362
    save_libs="$LIBS"
 
363
 
 
364
    CPPFLAGS="$CPPFLAGS $APRUTIL_INCLUDES"
 
365
    LDFLAGS="$LDFLAGS $APRUTIL_LDFLAGS"
 
366
    AC_CACHE_CHECK([style of ldap_set_rebind_proc routine], ac_cv_ldap_set_rebind_proc_style,
 
367
    APR_TRY_COMPILE_NO_WARNING([
 
368
    #ifdef HAVE_LBER_H
 
369
    #include <lber.h>
 
370
    #endif
 
371
    #ifdef HAVE_LDAP_H
 
372
    #include <ldap.h>
 
373
    #endif
 
374
    ], [
 
375
    int tmp = ldap_set_rebind_proc((LDAP *)0, (LDAP_REBIND_PROC *)0, (void *)0);
 
376
    /* use tmp to suppress the warning */
 
377
    tmp=0;
 
378
    ], ac_cv_ldap_set_rebind_proc_style=three, ac_cv_ldap_set_rebind_proc_style=two))
 
379
 
 
380
    if test "$ac_cv_ldap_set_rebind_proc_style" = "three"; then
 
381
        AC_DEFINE(LDAP_SET_REBIND_PROC_THREE, 1, [Define if ldap_set_rebind_proc takes three arguments])
 
382
    fi
 
383
 
 
384
    CPPFLAGS="$save_cppflags"
 
385
    LDFLAGS="$save_ldflags"
 
386
    LIBS="$save_libs"
 
387
fi
 
388
 
359
389
AC_SUBST(ldap_h)
360
390
AC_SUBST(lber_h)
361
391
AC_SUBST(ldap_ssl_h)