diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2003-05-04 21:07:55 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2003-05-04 21:07:55 +0000 |
| commit | 9f8c64c3f381c522309a2e110034eac8e2e2d692 (patch) | |
| tree | ab8d9372b8828d3c6ddbba66d82d8986cbd94213 /x11-wm | |
| parent | Update to 3.2 (diff) | |
Fix for failure to detect fontconfig >= 2.1.92.
PR: 51461
Notes
Notes:
svn path=/head/; revision=80124
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/fvwm2-devel/files/patch-configure | 49 |
1 files changed, 45 insertions, 4 deletions
diff --git a/x11-wm/fvwm2-devel/files/patch-configure b/x11-wm/fvwm2-devel/files/patch-configure index da3b50faaabe..a25c9230691d 100644 --- a/x11-wm/fvwm2-devel/files/patch-configure +++ b/x11-wm/fvwm2-devel/files/patch-configure @@ -1,6 +1,47 @@ ---- configure.orig Thu Oct 31 18:14:43 2002 -+++ configure Thu Oct 31 18:15:52 2002 -@@ -6157,7 +6157,7 @@ +--- configure.orig Fri Feb 28 02:13:12 2003 ++++ configure Sun May 4 13:44:59 2003 +@@ -5430,17 +5430,17 @@ + if test x$fc_config_exec_prefix != x ; then + fc_config_args="$fc_config_args --exec-prefix=$fc_config_exec_prefix" + if test x${FC_CONFIG+set} != xset ; then +- FC_CONFIG=$fc_config_exec_prefix/bin/fontconfig-config ++ FC_CONFIG=$fc_config_exec_prefix/bin/pkg-config + fi + fi + if test x$fc_config_prefix != x ; then + fc_config_args="$fc_config_args --prefix=$fc_config_prefix" + if test x${FC_CONFIG+set} != xset ; then +- FC_CONFIG=$fc_config_prefix/bin/fontconfig-config ++ FC_CONFIG=$fc_config_prefix/bin/pkg-config + fi + fi +-# Extract the first word of "fontconfig-config", so it can be a program name with args. +-set dummy fontconfig-config; ac_word=$2 ++# Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_FC_CONFIG+set}" = set; then +@@ -5487,13 +5487,13 @@ + if test "$FC_CONFIG" = "no" ; then + no_fc=yes + else +- FC_CFLAGS=`$FC_CONFIG $fc_config_args --cflags` +- FC_LIBS=`$FC_CONFIG $fc_config_args --libs` +- fc_config_major_version=`$FC_CONFIG $fc_config_args --version | \ ++ FC_CFLAGS=`$FC_CONFIG fontconfig $fc_config_args --cflags` ++ FC_LIBS=`$FC_CONFIG fontconfig $fc_config_args --libs` ++ fc_config_major_version=`$FC_CONFIG fontconfig $fc_config_args --modversion | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +- fc_config_minor_version=`$FC_CONFIG $fc_config_args --version | \ ++ fc_config_minor_version=`$FC_CONFIG fontconfig $fc_config_args --modversion | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` +- fc_config_micro_version=`$FC_CONFIG $fc_config_args --version | \ ++ fc_config_micro_version=`$FC_CONFIG fontconfig $fc_config_args --modversion | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + fc_min_major_version=`echo $min_fc_version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +@@ -6432,7 +6432,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9,7 +50,7 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" -@@ -6429,7 +6429,7 @@ +@@ -6704,7 +6704,7 @@ #define HAVE_PNG 1 _ACEOF |