[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/fonts
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-06-23 2:44:36
[Download RAW message or body]

CVS commit by mueller: 

use pkgconfig fontconfig if fontconfig-config cannot be found (needed for fontconfig \
                >= 2.2)
CCMAIL: 57403-done@bugs.kde.org


  M +25 -1     configure.in.in   1.2


--- kdebase/kcontrol/fonts/configure.in.in  #1.1:1.2
@@ -1,8 +1,32 @@
 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/]) +        KDE_FIND_PATH(pkg-config, PKGCONFIG, \
[${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ +        \
AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check \
http://www.fontconfig.org/ ]) +        ])
 ])
 
+if test -n "$PKGCONFIG"; then
+  vers=`$PKGCONFIG fontconfig --modversion 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="`$PKGCONFIG fontconfig --libs`"
+     LIBFONTCONFIG_RPATH=
+     for args in $LIBFONTCONFIG_LIBS; do
+          case $args in
+            -L*)
+               LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
+               ;;
+          esac
+     done
+     LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | sed -e "s/-L/-R/g"`
+     LIBFONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`"
+
+     AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the \
libfontconfig library]) +  fi
+fi
+
 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;}'` +fi
+
   if test -n "$vers" && test "$vers" -ge 1000000
   then


[prev in list] [next in list] [prev in thread] [next in thread]