--- kdebase-3.1.3/kcontrol/fonts/configure.in.in.fontconfig 2003-07-30 10:06:01.000000000 +0200 +++ kdebase-3.1.3/kcontrol/fonts/configure.in.in 2003-08-05 11:02:31.000000000 +0200 @@ -1,9 +1,19 @@ +KDE_FIND_PATH(pkg-config, PKG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ + AC_MSG_WARN([Could not find pkg-config]) +]) + KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ - AC_MSG_WARN([Could not find libfontconfig anywhere, check http://www.fontconfig.org/]) + FONTCONFIG_CONFIG="$PKG_CONFIG fontconfig" + $FONTCONFIG_CONFIG --exists || AC_MSG_WARN([Could not find libfontconfig anywhere, check http://www.fontconfig.org/]) ]) if test -n "$FONTCONFIG_CONFIG"; then - vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test -n "$PKG_CONFIG"; then + __version="--modversion" + else + __version="--version" + fi + vers=`$FONTCONFIG_CONFIG $__version 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` if test -n "$vers" && test "$vers" -ge 1000000 then LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`"