projects / packages / dovecot-pigeonhole.git / blame
| Commit | Line | Data |
|---|---|---|
| 1028cb9d JS |
1 | diff -ruN dovecot-2.1-pigeonhole-0.3.1/configure dovecot-2.1-pigeonhole-0.3.1-new/configure |
| 2 | --- dovecot-2.1-pigeonhole-0.3.1/configure 2012-05-25 21:32:09.000000000 +0000 | |
| 3 | +++ dovecot-2.1-pigeonhole-0.3.1/configure 2012-06-10 09:46:34.761871135 +0000 | |
| 4 | @@ -11385,19 +11385,19 @@ | |
| 2e6dee29 JS |
5 | fi |
| 6 | ||
| 7 | ||
| 8 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dovecot-config in \"$dovecotdir\"" >&5 | |
| 9 | -$as_echo_n "checking for dovecot-config in \"$dovecotdir\"... " >&6; } | |
| 10 | - if test -f "$dovecotdir/dovecot-config"; then | |
| 11 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dovecotdir/dovecot-config" >&5 | |
| 12 | -$as_echo "$dovecotdir/dovecot-config" >&6; } | |
| 13 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dovecot-devel in \"$dovecotdir\"" >&5 | |
| 14 | +$as_echo_n "checking for dovecot-devel in \"$dovecotdir\"... " >&6; } | |
| 1ce38939 JS |
15 | + if test -f "$dovecotdir/../dovecot-devel"; then |
| 16 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dovecotdir/../dovecot-devel" >&5 | |
| 17 | +$as_echo "$dovecotdir/../dovecot-devel" >&6; } | |
| 2e6dee29 JS |
18 | else |
| 19 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | |
| 20 | $as_echo "not found" >&6; } | |
| 21 | { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 | |
| 22 | $as_echo "$as_me: " >&6;} | |
| 23 | - { $as_echo "$as_me:${as_lineno-$LINENO}: Use --with-dovecot=DIR to provide the path to the dovecot-config file." >&5 | |
| 24 | -$as_echo "$as_me: Use --with-dovecot=DIR to provide the path to the dovecot-config file." >&6;} | |
| 25 | - as_fn_error $? "dovecot-config not found" "$LINENO" 5 | |
| 26 | + { $as_echo "$as_me:${as_lineno-$LINENO}: Use --with-dovecot=DIR to provide the path to the dovecot-devel file." >&5 | |
| 27 | +$as_echo "$as_me: Use --with-dovecot=DIR to provide the path to the dovecot-devel file." >&6;} | |
| 28 | + as_fn_error $? "dovecot-devel not found" "$LINENO" 5 | |
| 29 | fi | |
| 30 | ||
| 31 | old=`pwd` | |
| 1028cb9d | 32 | @@ -11406,8 +11406,8 @@ |
| 2e6dee29 JS |
33 | cd $old |
| 34 | DISTCHECK_CONFIGURE_FLAGS="--with-dovecot=$abs_dovecotdir --without-dovecot-install-dirs" | |
| 35 | ||
| 1028cb9d | 36 | - eval `grep -i '^dovecot_[a-z_]*=' "$dovecotdir"/dovecot-config` |
| 2e6dee29 | 37 | - eval `grep '^LIBDOVECOT[A-Z_]*=' "$dovecotdir"/dovecot-config` |
| 1028cb9d | 38 | + eval `grep -i '^dovecot_[a-z_]*=' "$dovecotdir"/../dovecot-devel` |
| 1ce38939 | 39 | + eval `grep '^LIBDOVECOT[A-Z_]*=' "$dovecotdir"/../dovecot-devel` |
| 2e6dee29 JS |
40 | |
| 41 | if test "$use_install_dirs" = "no"; then | |
| 42 | dovecot_pkgincludedir='$(pkgincludedir)' |