On Thu, Jun 12, 2003 at 05:29:08PM -0500, Keith Packard wrote:
>
> I switched the configuration from autoconf to automake and didn't bother
> to bring that app forwards. I prefer 'pkg-config', but if you think
> fontconfig-config is necessary, please feel free to submit a working
> version to the bugzilla...
It seems that fontconfig-config can be created quite trivially as a
wrapper of pkg-config; patch to make a working fontconfig-config
follows (patch is against the fontconfig-config as shipped with
XFree86 4.3.0).
This way, it doesn't even need to be updated (since it gets all the
real stuff from pkg-config).
------------- cut here -------------- 8< -----------------------------
--- /usr/X11R6/bin/fontconfig-config Mon May 26 17:44:53 2003
+++ /tmp/fontconfig-config Thu Jun 12 22:17:26 2003
@@ -1,15 +1,12 @@
#! /bin/sh
-prefix="/usr/X11R6"
-exec_prefix="/usr/X11R6/bin"
-libdir="/usr/X11R6/lib"
-includedir="/usr/X11R6/include"
-version="1.0.1"
+prefix="`pkg-config --variable=prefix fontconfig`"
+exec_prefix="`pkg-config --variable=exec_prefix fontconfig`"
usage()
{
cat <<EOF
-Usage: fontconfig-config [OPTIONS] [LIBRARIES]
+Usage: fontconfig-config [OPTIONS]
Options:
[--prefix[=DIR]]
[--exec-prefix[=DIR]]
@@ -47,7 +44,7 @@
echo_exec_prefix=yes
;;
--version)
- echo $version
+ pkg-config --modversion fontconfig
exit 0
;;
--cflags)
@@ -78,17 +75,11 @@
fi
if test "$echo_cflags" = "yes" ; then
- cflags="-I${includedir}"
- echo $cflags
+ pkg-config --cflags fontconfig
fi
if test "$echo_libs" = "yes" ; then
- libs="-lfontconfig"
- if test "${libdir}" != "/usr/lib" ; then
- echo -L${libdir} $libs
- else
- echo $libs
- fi
+ pkg-config --libs fontconfig
fi
# EOF
------------- cut here -------------- 8< -----------------------------
> -keith
--
Ambrose LI Cheuk-Wing <a.c.li@xxxxxxxx>
http://ada.dhs.org/~acli/
