diff options
| author | Richard A Nelson (Rick) <cowboy@debian.org> | 2008-07-15 22:25:00 +0000 |
|---|---|---|
| committer | Andreas Beckmann <debian@abeckmann.de> | 2012-10-01 20:07:42 +0200 |
| commit | cb83348f6c0b88c1d1104d6868be756aa51cc5fa (patch) | |
| tree | ebed61709d675b931e169105a514a8b82b1a0b83 /debian/configure.ac | |
| parent | c0720aa475c782c27a17942561685db0e730a77d (diff) | |
| download | sendmail-cb83348f6c0b88c1d1104d6868be756aa51cc5fa.tar.gz | |
Imported Debian patch 8.14.3-5debian/8.14.3-5
Diffstat (limited to 'debian/configure.ac')
| -rw-r--r-- | debian/configure.ac | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/debian/configure.ac b/debian/configure.ac index 4f336c9..8b730b7 100644 --- a/debian/configure.ac +++ b/debian/configure.ac @@ -96,6 +96,7 @@ AC_SUBST(PACKAGE_NAME) AC_SUBST(PACKAGE_STRING) AC_CONFIG_AUX_DIR([./build])dnl AC_CANONICAL_TARGET AC_ARG_PROGRAM +AC_PROG_MKDIR_P AC_PROG_MAKE_SET AM_INIT_AUTOMAKE AM_MAINTAINER_MODE @@ -648,13 +649,21 @@ if test "$sm_enable_milter" != "no"; then sm_libmilter_version=0]) if test "$sm_have_mfapi" = 'yes'; then AC_MSG_CHECKING([libmilter version]) - SM_RESULT_IFELSE([[ + AC_RUN_IFELSE([[ + /* + * This hack will compile and run a program + * to determine what level of libmilter should + * be used for this package + */ #include <stdlib.h> #include <stdio.h> #include <string.h> #include "libmilter/mfapi.h" char vers[30] = "0"; int main (void) { + FILE *confout = fopen("conftest.out","w"); + if (!confout) + return 1; snprintf(vers ,sizeof(vers) ,"%d%c%d%c%d" @@ -664,14 +673,15 @@ if test "$sm_enable_milter" != "no"; then ,'.' ,SM_LM_VRS_PLVL(SMFI_VERSION) ); - fprintf(stdout + fprintf(confout ,"%s\n" ,vers ); + close(confout); return 0; } ]] - ,[AS_VAR_SET(sm_libmilter_version, "$(cat conftest.out)")] + ,[sm_libmilter_version=`cat conftest.out`] ,[sm_libmilter_version=0] ) AC_MSG_RESULT([$sm_libmilter_version]) @@ -815,14 +825,14 @@ sm_have_newdb=no; sm_use_185=no; sm_newdb_lib=; if test $sm_enable_newdb != no; then - AC_CHECK_HEADERS(db4/db.h db3/db.h db2/db.h db1/db.h db.h \ - db4/db_185.h db3/db_185.h db2/db_185.h \ - db1/db_185.h db_185.h) - if [[ $ac_cv_header_db4_db_h = yes ]] \ + AC_CHECK_HEADERS(db.h db4/db.h db3/db.h db2/db.h db1/db.h \ + db_185.h db4/db_185.h db3/db_185.h db2/db_185.h \ + db1/db_185.h) + if [[ $ac_cv_header_db_h = yes ]] \ + || [[ $ac_cv_header_db4_db_h = yes ]] \ || [[ $ac_cv_header_db3_db_h = yes ]] \ || [[ $ac_cv_header_db2_db_h = yes ]] \ - || [[ $ac_cv_header_db1_db_h = yes ]] \ - || [[ $ac_cv_header_db_h = yes ]]; then + || [[ $ac_cv_header_db1_h = yes ]]; then sm_have_newdb=yes; fi; @@ -920,17 +930,16 @@ if test $sm_enable_newdb != no; then if test $sm_newdb_lib = db4; then AC_CHECK_LIB(db-4.6, db_create, [sm_newdb_lib='db-4.6'], [ AC_CHECK_LIB(db-4.5, db_create, [sm_newdb_lib='db-4.5'], [ - AC_CHECK_LIB(db-4.4, db_create, [sm_newdb_lib='db-4.4'], [ - AC_CHECK_LIB(db-4.3, db_create, [sm_newdb_lib='db-4.3'], [ - AC_CHECK_LIB(db-4.2, db_create_4002, - [sm_newdb_lib='db-4.2'], [ - AC_CHECK_LIB(db, db_create, - [sm_newdb_lib='db'], [sm_have_newdb=no])dnl - ])dnl - ])dnl - ])dnl - ])dnl - ])dnl + AC_CHECK_LIB(db-4.4, db_create, [sm_newdb_lib='db-4.4'], [ + AC_CHECK_LIB(db-4.3, db_create, [sm_newdb_lib='db-4.3'], [ + AC_CHECK_LIB(db-4.2, db_create_4002, [sm_newdb_lib='db-4.2'], [ + AC_CHECK_LIB(db, db_create, [sm_newdb_lib='db'], [ + sm_have_newdb=no])dnl + ])dnl + ])dnl + ])dnl + ])dnl + ])dnl elif test $sm_newdb_lib = db3; then AC_CHECK_LIB($sm_newdb_lib, db_create, [:], [ AC_CHECK_LIB(db, db_create, |