Remove pkgconf hack which isn't needed anymore with pkgconf 0.8.5.

This commit is contained in:
Emanuel Haupt 2012-07-30 18:45:28 +00:00
parent 55572fdbcd
commit 6e4e7a3421
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=301737

View File

@ -1,57 +0,0 @@
--- ./configure.orig 2012-07-30 12:15:02.000000000 +0200
+++ ./configure 2012-07-30 12:16:02.000000000 +0200
@@ -6658,12 +6658,12 @@
pkg_cv_FTGL_CFLAGS="$FTGL_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ftgl >= 2.1.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ftgl >= 2.1.3") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ftgl >= 2.0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ftgl >= 2.0.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_FTGL_CFLAGS=`$PKG_CONFIG --cflags "ftgl >= 2.1.3" 2>/dev/null`
+ pkg_cv_FTGL_CFLAGS=`$PKG_CONFIG --cflags "ftgl >= 2.0.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -6676,12 +6676,12 @@
pkg_cv_FTGL_LIBS="$FTGL_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ftgl >= 2.1.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ftgl >= 2.1.3") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ftgl >= 2.0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ftgl >= 2.0.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_FTGL_LIBS=`$PKG_CONFIG --libs "ftgl >= 2.1.3" 2>/dev/null`
+ pkg_cv_FTGL_LIBS=`$PKG_CONFIG --libs "ftgl >= 2.0.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -6700,18 +6700,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FTGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ftgl >= 2.1.3"`
+ FTGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ftgl >= 2.0.0"`
else
- FTGL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ftgl >= 2.1.3"`
+ FTGL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ftgl >= 2.0.0"`
fi
# Put the nasty error message in config.log where it belongs
echo "$FTGL_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- as_fn_error $? "FTGL 2.1.3 or greater is required. Please see INSTALL" "$LINENO" 5
+ as_fn_error $? "FTGL 2.0.0 or greater is required. Please see INSTALL" "$LINENO" 5
elif test $pkg_failed = untried; then
- as_fn_error $? "FTGL 2.1.3 or greater is required. Please see INSTALL" "$LINENO" 5
+ as_fn_error $? "FTGL 2.0.0 or greater is required. Please see INSTALL" "$LINENO" 5
else
FTGL_CFLAGS=$pkg_cv_FTGL_CFLAGS
FTGL_LIBS=$pkg_cv_FTGL_LIBS