blob: 9d80b556b6c27d6d38f6292b74b23841a45392fb (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
$NetBSD: patch-aa,v 1.1.1.1 2001/08/01 08:57:37 skrll Exp $
--- configure.org Wed Jul 4 13:36:39 2001
+++ configure Wed Jul 4 14:09:19 2001
@@ -2873,7 +2873,7 @@
fi
-if test -z "1"; then
+if test -z ""; then
kde_qtver=2
else
kde_qtver=1
@@ -3442,7 +3442,7 @@
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $USER_INCLUDES $LDFLAGS $USER_LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
@@ -4312,7 +4312,7 @@
if test $kde_qtver = 2; then
- LIBQT="$LIBQT $LIBPNG"
+ LIBQT="$LIBQT $LIBPNG -lmng -ljpeg -llcms"
fi
echo $ac_n "checking for Qt""... $ac_c" 1>&6
echo "configure:4319: checking for Qt" >&5
@@ -4401,7 +4401,7 @@
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $USER_INCLUDES $LDFLAGS $USER_LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross
|
