922632d8cd
- Fix adesklets breakage after an imlib2 update. Somehow, it started to detect iconv installed, but fails to link the binary properly. Also fix some other configure syntax errors. Pointy hat to: me (for not testing everything before commit) Reported by: pav, erwin
58 lines
2.6 KiB
Text
58 lines
2.6 KiB
Text
--- configure.orig 2006-03-31 05:19:07.000000000 +0400
|
|
+++ configure 2008-03-15 00:14:53.000000000 +0300
|
|
@@ -5352,7 +5352,8 @@
|
|
UNAME_REDUX=`uname -r -s | sed 's/\..*//' 2> /dev/null`
|
|
if test "$UNAME_REDUX" != 'FreeBSD 5' && \
|
|
test "$UNAME_REDUX" != 'FreeBSD 6' && \
|
|
- test "$UNAME_REDUX" != 'FreeBSD 7'
|
|
+ test "$UNAME_REDUX" != 'FreeBSD 7' && \
|
|
+ test "$UNAME_REDUX" != 'FreeBSD 8'
|
|
then
|
|
|
|
cat >>confdefs.h <<\_ACEOF
|
|
@@ -6735,13 +6736,13 @@
|
|
echo "${ECHO_T}no" >&6
|
|
fi
|
|
|
|
-if ! test x$PKG_CONFIG = "x" ; then
|
|
+if ! test "x$PKG_CONFIG" = "x" ; then
|
|
if $PKG_CONFIG --exists fontconfig 2> /dev/null; then
|
|
FONTCONFIG_LIBS=`pkg-config --libs fontconfig`
|
|
FONTCONFIG_CFLAGS=`pkg-config --cflags fontconfig`
|
|
fi
|
|
fi
|
|
-if test x$FONTCONFIG_LIBS = "x"; then
|
|
+if test "x$FONTCONFIG_LIBS" = "x"; then
|
|
FONTCONFIG_LIBS=-lfontconfig
|
|
fi
|
|
LIBS="$LIBS $FONTCONFIG_LIBS"
|
|
@@ -7367,11 +7368,11 @@
|
|
IMLIB2_LIBS="`$IMLIB2_CONFIG $imlib2_config_args --libs`"
|
|
|
|
imlib2_config_major_version=`$IMLIB2_CONFIG $imlib2_config_args \
|
|
- --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
|
+ --version | sed -E -e 's/[^0-9]*([0-9]+).*/\1/'`
|
|
imlib2_config_minor_version=`$IMLIB2_CONFIG $imlib2_config_args \
|
|
- --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
|
|
+ --version | sed -E -e 's/[^0-9]*([0-9]+)\.([0-9]+).*/\2/'`
|
|
imlib2_config_micro_version=`$IMLIB2_CONFIG $imlib2_config_args \
|
|
- --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
|
|
+ --version | sed -E -e 's/[^0-9]*([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/'`
|
|
imlib2_wanted_major_version="1"
|
|
imlib2_wanted_minor_version="1"
|
|
imlib2_wanted_micro_version="2"
|
|
@@ -7441,11 +7442,11 @@
|
|
echo $ECHO_N "checking for imlib2 - version >= 1.2.0... $ECHO_C" >&6
|
|
|
|
imlib2_config_major_version=`$IMLIB2_CONFIG $imlib2_config_args \
|
|
- --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
|
+ --version | sed -E -e 's/[^0-9]*([0-9]+).*/\1/'`
|
|
imlib2_config_minor_version=`$IMLIB2_CONFIG $imlib2_config_args \
|
|
- --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
|
|
+ --version | sed -E -e 's/[^0-9]*([0-9]+)\.([0-9]+).*/\2/'`
|
|
imlib2_config_micro_version=`$IMLIB2_CONFIG $imlib2_config_args \
|
|
- --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
|
|
+ --version | sed -E -e 's/[^0-9]*([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/'`
|
|
imlib2_wished_major_version="1"
|
|
imlib2_wished_minor_version="2"
|
|
imlib2_wished_micro_version="0"
|