blob: 974695df5100fa6aa96e9d1669c8a63a8a60e9ee (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
--- configure.orig 2011-10-27 08:40:31.000000000 +0000
+++ configure 2014-02-20 19:04:01.546588828 +0000
@@ -14827,7 +14827,7 @@
imagemagick_support="no"
else
IMAGEMAGICK_CFLAGS=$pkg_cv_IMAGEMAGICK_CFLAGS
- IMAGEMAGICK_LIBS=$pkg_cv_IMAGEMAGICK_LIBS
+ IMAGEMAGICK_LIBS="$pkg_cv_IMAGEMAGICK_LIBS /usr/local/lib/gcc47/libstdc++.so"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -15411,7 +15411,7 @@
if test -z "$QTDIR"; then
MOC="moc-qt4"
else
- MOC="$QTDIR/bin/moc"
+ MOC="$QTDIR/bin/moc-qt4"
fi
# Check whether --with-moc was given.
|
