diff -Naur mail-notification-4.1.org/configure mail-notification-4.1/configure --- configure 2007-06-28 18:06:41.000000000 +0200 +++ configure 2007-06-28 18:07:08.000000000 +0200 @@ -24403,12 +24403,12 @@ pkg_cv_EVOLUTION_PLUGIN_CFLAGS="$EVOLUTION_PLUGIN_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin-\$evolution_branch \$evolution_plugin_min_version\"") >&5 - ($PKG_CONFIG --exists --print-errors "evolution-plugin-$evolution_branch $evolution_plugin_min_version") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin \$evolution_plugin_min_version\"") >&5 + ($PKG_CONFIG --exists --print-errors "evolution-plugin $evolution_plugin_min_version") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-$evolution_branch $evolution_plugin_min_version" 2>/dev/null` + pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin $evolution_plugin_min_version" 2>/dev/null` else pkg_failed=yes fi @@ -24421,12 +24421,12 @@ pkg_cv_EVOLUTION_PLUGIN_LIBS="$EVOLUTION_PLUGIN_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin-\$evolution_branch \$evolution_plugin_min_version\"") >&5 - ($PKG_CONFIG --exists --print-errors "evolution-plugin-$evolution_branch $evolution_plugin_min_version") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin \$evolution_plugin_min_version\"") >&5 + ($PKG_CONFIG --exists --print-errors "evolution-plugin $evolution_plugin_min_version") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-$evolution_branch $evolution_plugin_min_version" 2>/dev/null` + pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin $evolution_plugin_min_version" 2>/dev/null` else pkg_failed=yes fi @@ -24445,9 +24445,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-plugin-$evolution_branch $evolution_plugin_min_version"` + EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-plugin $evolution_plugin_min_version"` else - EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-$evolution_branch $evolution_plugin_min_version"` + EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin $evolution_plugin_min_version"` fi # Put the nasty error message in config.log where it belongs echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5 @@ -24468,7 +24468,7 @@ if test $found = yes; then { echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5 echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6; } - evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$evolution_branch 2>/dev/null` + evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin 2>/dev/null` if test -n "$evolution_plugindir"; then { echo "$as_me:$LINENO: result: $evolution_plugindir" >&5 echo "${ECHO_T}$evolution_plugindir" >&6; }