[kaffe] CVS kaffe (robilad): build fixes for kaffe-qt-awt on 64 bit systems
Kaffe CVS
cvs-commits at kaffe.org
Thu Sep 15 20:16:44 PDT 2005
PatchSet 6905
Date: 2005/09/16 03:11:20
Author: robilad
Branch: HEAD
Tag: (none)
Log:
build fixes for kaffe-qt-awt on 64 bit systems
2005-09-16 Dalibor Topic <robilad at kaffe.org>
* m4/gwqt.m4: (--with-qt-libraries, --with-qt-binaries)
Added new options. Check for qt binaries like moc in
first, before checking in /home/topic/qt4/bin/:/usr/kerberos/bin:/usr/lib/ccache/bin:/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/home/topic/bin.
Reported by: David Walluck <walluck at mandrake.org>
Members:
ChangeLog:1.4426->1.4427
configure:1.486->1.487
m4/gwqt.m4:INITIAL->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4426 kaffe/ChangeLog:1.4427
--- kaffe/ChangeLog:1.4426 Thu Sep 15 13:55:19 2005
+++ kaffe/ChangeLog Fri Sep 16 03:11:20 2005
@@ -1,3 +1,11 @@
+2005-09-16 Dalibor Topic <robilad at kaffe.org>
+
+ * m4/gwqt.m4: (--with-qt-libraries, --with-qt-binaries)
+ Added new options. Check for qt binaries like moc in
+ $QTBINDIR first, before checking in $PATH.
+
+ Reported by: David Walluck <walluck at mandrake.org>
+
2005-09-15 Dalibor Topic <robilad at kaffe.org>
* configure.ac: (--with-kaffe-qt-awt) Invoke AC_PATH_X
Index: kaffe/configure
diff -u kaffe/configure:1.486 kaffe/configure:1.487
--- kaffe/configure:1.486 Thu Sep 15 13:55:21 2005
+++ kaffe/configure Fri Sep 16 03:11:21 2005
@@ -1148,7 +1148,9 @@
--with-x use the X Window System
--with-kaffe-qt-awt enable build of Kaffe's Qt2/3/embedded-based AWT
engine (not built by default)
- --with-qtdir=DIR Qt installation directory default=$QTDIR
+ --with-qt-libraries=DIR Qt library installation directory (default = $QTDIR/lib)
+ --with-qt-binaries=DIR Qt binary installation directory (default = $QTDIR/bin)
+ --with-qtdir=DIR Qt installation directory (default=$QTDIR)
--with-kaffe-nanox-awt enable build of Kaffe's Nano-X AWT engine (not built
by default)
--with-nanox-include=dir
@@ -5965,7 +5967,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5968 "configure"' > conftest.$ac_ext
+ echo '#line 5970 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7322,7 +7324,7 @@
# Provide some information about the compiler.
-echo "$as_me:7325:" \
+echo "$as_me:7327:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -8424,11 +8426,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8427: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8429: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8431: \$? = $ac_status" >&5
+ echo "$as_me:8433: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8686,11 +8688,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8689: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8691: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8693: \$? = $ac_status" >&5
+ echo "$as_me:8695: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8748,11 +8750,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8751: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8753: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8755: \$? = $ac_status" >&5
+ echo "$as_me:8757: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10988,7 +10990,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10991 "configure"
+#line 10993 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11086,7 +11088,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11089 "configure"
+#line 11091 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13338,11 +13340,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13341: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13343: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13345: \$? = $ac_status" >&5
+ echo "$as_me:13347: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13400,11 +13402,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13403: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13405: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13407: \$? = $ac_status" >&5
+ echo "$as_me:13409: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14769,7 +14771,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14772 "configure"
+#line 14774 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14867,7 +14869,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14870 "configure"
+#line 14872 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15752,11 +15754,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15755: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15757: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15759: \$? = $ac_status" >&5
+ echo "$as_me:15761: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15814,11 +15816,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15817: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15819: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15821: \$? = $ac_status" >&5
+ echo "$as_me:15823: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17940,11 +17942,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17943: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17945: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17947: \$? = $ac_status" >&5
+ echo "$as_me:17949: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18202,11 +18204,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18205: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18207: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18209: \$? = $ac_status" >&5
+ echo "$as_me:18211: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18264,11 +18266,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18267: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18269: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18271: \$? = $ac_status" >&5
+ echo "$as_me:18273: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20504,7 +20506,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20507 "configure"
+#line 20509 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20602,7 +20604,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20605 "configure"
+#line 20607 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -46855,6 +46857,31 @@
+
+# Check whether --with-qt-libraries or --without-qt-libraries was given.
+if test "${with_qt_libraries+set}" = set; then
+ withval="$with_qt_libraries"
+ QTLIBDIR=$withval
+
+fi;
+
+if test x"$QTLIBDIR" = x"" ; then
+ QTLIBDIR=$QTDIR/lib
+fi
+
+
+# Check whether --with-qt-binaries or --without-qt-binaries was given.
+if test "${with_qt_binaries+set}" = set; then
+ withval="$with_qt_binaries"
+ QTBINDIR=$withval
+
+fi;
+
+if test x"$QTBINDIR" = x"" ; then
+ QTBINDIR=$QTDIR/bin
+fi
+
+
echo "$as_me:$LINENO: checking QTDIR" >&5
echo $ECHO_N "checking QTDIR... $ECHO_C" >&6
@@ -46918,7 +46945,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:$QTDIR/bin"
+as_dummy="$QTBINDIR:$PATH"
for as_dir in $as_dummy
do
IFS=$as_save_IFS
@@ -46965,7 +46992,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:$QTDIR/bin"
+as_dummy="$QTBINDIR:$PATH"
for as_dir in $as_dummy
do
IFS=$as_save_IFS
@@ -47048,19 +47075,19 @@
#define WIN32 ""
_ACEOF
- if test -f "$QTDIR/lib/qt.lib" ; then
+ if test -f "$QTLIBDIR/qt.lib" ; then
QT_LIB="qt.lib"
QT_IS_STATIC="yes"
QT_IS_MT="no"
- elif test -f "$QTDIR/lib/qt-mt.lib" ; then
+ elif test -f "$QTLIBDIR/qt-mt.lib" ; then
QT_LIB="qt-mt.lib"
QT_IS_STATIC="yes"
QT_IS_MT="yes"
- elif test -f "$QTDIR/lib/qt$QT_VER.lib" ; then
+ elif test -f "$QTLIBDIR/qt$QT_VER.lib" ; then
QT_LIB="qt$QT_VER.lib"
QT_IS_STATIC="no"
QT_IS_MT="no"
- elif test -f "$QTDIR/lib/qt-mt$QT_VER.lib" ; then
+ elif test -f "$QTLIBDIR/qt-mt$QT_VER.lib" ; then
QT_LIB="qt-mt$QT_VER.lib"
QT_IS_STATIC="no"
QT_IS_MT="yes"
@@ -47068,14 +47095,14 @@
;;
*)
- QT_IS_STATIC=`ls $QTDIR/lib/*.a 2> /dev/null`
+ QT_IS_STATIC=`ls $QTLIBDIR/*.a 2> /dev/null`
if test "x$QT_IS_STATIC" = x; then
QT_IS_STATIC="no"
else
QT_IS_STATIC="yes"
fi
if test x$QT_IS_STATIC = xno ; then
- QT_IS_DYNAMIC=`ls $QTDIR/lib/*.so 2> /dev/null`
+ QT_IS_DYNAMIC=`ls $QTLIBDIR/*.so 2> /dev/null`
if test "x$QT_IS_DYNAMIC" = x; then
{ { echo "$as_me:$LINENO: error: *** Couldn't find any Qt libraries" >&5
echo "$as_me: error: *** Couldn't find any Qt libraries" >&2;}
@@ -47083,17 +47110,17 @@
fi
fi
- if test "x`ls $QTDIR/lib/libqt-mt.* 2> /dev/null`" != x ; then
+ if test "x`ls $QTLIBDIR/libqt-mt.* 2> /dev/null`" != x ; then
QT_LIB="-lqt-mt"
QT_IS_MT="yes"
- elif test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
+ elif test "x`ls $QTLIBDIR/libqt.* 2> /dev/null`" != x ; then
QT_LIB="-lqt"
QT_IS_MT="no"
- elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then
+ elif test "x`ls $QTLIBDIR/libqte-mt.* 2> /dev/null`" != x ; then
QT_LIB="-lqte-mt"
QT_IS_MT="yes"
QT_IS_EMBEDDED="yes"
- elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
+ elif test "x`ls $QTLIBDIR/libqte.* 2> /dev/null`" != x ; then
QT_LIB="-lqte"
QT_IS_MT="no"
QT_IS_EMBEDDED="yes"
@@ -47120,7 +47147,7 @@
# test for Qtopia
echo "$as_me:$LINENO: checking Qtopia" >&5
echo $ECHO_N "checking Qtopia... $ECHO_C" >&6
- if test "x`ls $QTDIR/lib/libqpe.* 2> /dev/null`" != x ; then
+ if test "x`ls $QTLIBDIR/libqpe.* 2> /dev/null`" != x ; then
QT_CXXFLAGS="$QT_CXXFLAGS -DQPE"
QT_LIB="-lqpe -lqtopia -lm $QT_LIB"
echo "$as_me:$LINENO: result: found" >&5
@@ -47203,7 +47230,7 @@
QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
fi
-QT_LDADD="-L$QTDIR/lib $QT_LIBS"
+QT_LDADD="-L$QTLIBDIR $QT_LIBS"
if test x$QT_IS_STATIC = xyes ; then
OLDLIBS="$LIBS"
===================================================================
Checking out kaffe/m4/gwqt.m4
RCS: /home/cvs/kaffe/kaffe/m4/gwqt.m4,v
VERS: 1.4
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/m4/gwqt.m4 Fri Sep 16 03:16:44 2005
@@ -0,0 +1,251 @@
+# Check for Qt compiler flags, linker flags, and binary packages
+AC_DEFUN([gw_CHECK_QT],
+[
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([AC_PATH_X])
+
+AC_ARG_WITH([qt-libraries],
+ [ --with-qt-libraries=DIR Qt library installation directory (default = $QTDIR/lib)],
+ [QTLIBDIR=$withval]
+)
+
+if test x"$QTLIBDIR" = x"" ; then
+ QTLIBDIR=$QTDIR/lib
+fi
+
+AC_ARG_WITH([qt-binaries],
+ [ --with-qt-binaries=DIR Qt binary installation directory (default = $QTDIR/bin)],
+ [QTBINDIR=$withval]
+)
+
+if test x"$QTBINDIR" = x"" ; then
+ QTBINDIR=$QTDIR/bin
+fi
+
+
+AC_MSG_CHECKING([QTDIR])
+AC_ARG_WITH([qtdir], [ --with-qtdir=DIR Qt installation directory (default=$QTDIR)], QTDIR=$withval)
+# Check that QTDIR is defined or that --with-qtdir given
+if test x"$QTDIR" = x ; then
+ QT_SEARCH="/usr/lib/qt31 /usr/local/qt31 /usr/lib/qt3 /usr/local/qt3 /usr/lib/qt2 /usr/local/qt2 /usr/lib/qt /usr/local/qt /usr/share/qt /usr/share/qt3"
+ for i in $QT_SEARCH; do
+ if test -f $i/include/qglobal.h -a x$QTDIR = x; then QTDIR=$i; fi
+ done
+fi
+if test x"$QTDIR" = x ; then
+ AC_MSG_ERROR([*** QTDIR must be defined, or --with-qtdir option given])
+fi
+AC_MSG_RESULT([$QTDIR])
+
+# Change backslashes in QTDIR to forward slashes to prevent escaping
+# problems later on in the build process, mainly for Cygwin build
+# environment using MSVC as the compiler
+# TODO: Use sed instead of perl
+QTDIR=`echo $QTDIR | perl -p -e 's/\\\\/\\//g'`
+
+# Figure out which version of Qt we are using
+AC_MSG_CHECKING([Qt version])
+QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTDIR/include/qglobal.h | perl -p -e 's/\D//g'`
+case "${QT_VER}" in
+ 2*)
+ QT_MAJOR="2"
+ ;;
+ 3*)
+ QT_MAJOR="3"
+ ;;
+ *)
+ AC_MSG_ERROR([*** Don't know how to handle this Qt major version])
+ ;;
+esac
+AC_MSG_RESULT([$QT_VER ($QT_MAJOR)])
+
+# Check that moc is in path
+AC_PATH_PROG(MOC, moc,,[$QTBINDIR:$PATH])
+if test x$MOC = x ; then
+ AC_MSG_ERROR([*** moc must be in path])
+fi
+
+# uic is the Qt user interface compiler
+AC_PATH_PROG(UIC, uic,,[$QTBINDIR:$PATH])
+#if test x$UIC = x ; then
+# AC_MSG_ERROR([*** uic must be in path])
+#fi
+
+# qembed is the Qt data embedding utility.
+# It is located in $QTDIR/tools/qembed, and must be compiled and installed
+# manually, we'll let it slide if it isn't present
+AC_CHECK_PROG(QEMBED, qembed, qembed)
+
+
+# Calculate Qt include path
+QT_CXXFLAGS="-I$QTDIR/include"
+
+QT_IS_EMBEDDED="no"
+# On unix, figure out if we're doing a static or dynamic link
+case "${host}" in
+ *-cygwin)
+ AC_DEFINE_UNQUOTED(WIN32, "", Defined if on Win32 platform)
+ if test -f "$QTLIBDIR/qt.lib" ; then
+ QT_LIB="qt.lib"
+ QT_IS_STATIC="yes"
+ QT_IS_MT="no"
+ elif test -f "$QTLIBDIR/qt-mt.lib" ; then
+ QT_LIB="qt-mt.lib"
+ QT_IS_STATIC="yes"
+ QT_IS_MT="yes"
+ elif test -f "$QTLIBDIR/qt$QT_VER.lib" ; then
+ QT_LIB="qt$QT_VER.lib"
+ QT_IS_STATIC="no"
+ QT_IS_MT="no"
+ elif test -f "$QTLIBDIR/qt-mt$QT_VER.lib" ; then
+ QT_LIB="qt-mt$QT_VER.lib"
+ QT_IS_STATIC="no"
+ QT_IS_MT="yes"
+ fi
+ ;;
+
+ *)
+ QT_IS_STATIC=`ls $QTLIBDIR/*.a 2> /dev/null`
+ if test "x$QT_IS_STATIC" = x; then
+ QT_IS_STATIC="no"
+ else
+ QT_IS_STATIC="yes"
+ fi
+ if test x$QT_IS_STATIC = xno ; then
+ QT_IS_DYNAMIC=`ls $QTLIBDIR/*.so 2> /dev/null`
+ if test "x$QT_IS_DYNAMIC" = x; then
+ AC_MSG_ERROR([*** Couldn't find any Qt libraries])
+ fi
+ fi
+
+ if test "x`ls $QTLIBDIR/libqt-mt.* 2> /dev/null`" != x ; then
+ QT_LIB="-lqt-mt"
+ QT_IS_MT="yes"
+ elif test "x`ls $QTLIBDIR/libqt.* 2> /dev/null`" != x ; then
+ QT_LIB="-lqt"
+ QT_IS_MT="no"
+ elif test "x`ls $QTLIBDIR/libqte-mt.* 2> /dev/null`" != x ; then
+ QT_LIB="-lqte-mt"
+ QT_IS_MT="yes"
+ QT_IS_EMBEDDED="yes"
+ elif test "x`ls $QTLIBDIR/libqte.* 2> /dev/null`" != x ; then
+ QT_LIB="-lqte"
+ QT_IS_MT="no"
+ QT_IS_EMBEDDED="yes"
+ fi
+ ;;
+
+esac
+AC_MSG_CHECKING([if Qt is static])
+AC_MSG_RESULT([$QT_IS_STATIC])
+AC_MSG_CHECKING([if Qt is multithreaded])
+AC_MSG_RESULT([$QT_IS_MT])
+AC_MSG_CHECKING([if Qt is embedded])
+AC_MSG_RESULT([$QT_IS_EMBEDDED])
+
+if test x$QT_IS_EMBEDDED = xyes ; then
+ QT_CXXFLAGS="$QT_CXXFLAGS -DQWS"
+
+ # test for Qtopia
+ AC_MSG_CHECKING([Qtopia])
+ if test "x`ls $QTLIBDIR/libqpe.* 2> /dev/null`" != x ; then
+ QT_CXXFLAGS="$QT_CXXFLAGS -DQPE"
+ QT_LIB="-lqpe -lqtopia -lm $QT_LIB"
+ AC_MSG_RESULT([found])
+ else
+ AC_MSG_RESULT([not found])
+ fi
+fi
+
+QT_GUILINK=""
+QASSISTANTCLIENT_LDADD="-lqassistantclient"
+case "${host}" in
+ *irix*)
+ QT_LIBS="$QT_LIB"
+ if test $QT_IS_STATIC = yes ; then
+ QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE"
+ fi
+ ;;
+
+ *linux*)
+ QT_LIBS="$QT_LIB"
+ if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then
+ QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg"
+ fi
+ ;;
+
+
+ *osf*)
+ # Digital Unix (aka DGUX aka Tru64)
+ QT_LIBS="$QT_LIB"
+ if test $QT_IS_STATIC = yes ; then
+ QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE"
+ fi
+ ;;
+
+ *solaris*)
+ QT_LIBS="$QT_LIB"
+ if test $QT_IS_STATIC = yes ; then
+ QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -lresolv -lsocket -lnsl"
+ fi
+ ;;
+
+
+ *win*)
+ # linker flag to suppress console when linking a GUI app on Win32
+ QT_GUILINK="/subsystem:windows"
+
+ if test $QT_MAJOR = "3" ; then
+ if test $QT_IS_MT = yes ; then
+ QT_LIBS="/nodefaultlib:libcmt"
+ else
+ QT_LIBS="/nodefaultlib:libc"
+ fi
+ fi
+
+ if test $QT_IS_STATIC = yes ; then
+ QT_LIBS="$QT_LIBS $QT_LIB kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib shell32.lib imm32.lib advapi32.lib wsock32.lib winspool.lib winmm.lib netapi32.lib"
+ if test $QT_MAJOR = "3" ; then
+ QT_LIBS="$QT_LIBS qtmain.lib"
+ fi
+ else
+ QT_LIBS="$QT_LIBS $QT_LIB"
+ if test $QT_MAJOR = "3" ; then
+ QT_CXXFLAGS="$QT_CXXFLAGS -DQT_DLL"
+ QT_LIBS="$QT_LIBS qtmain.lib qui.lib user32.lib netapi32.lib"
+ fi
+ fi
+ QASSISTANTCLIENT_LDADD="qassistantclient.lib"
+ ;;
+
+esac
+
+
+if test x"$QT_IS_EMBEDDED" = "xyes" ; then
+ QT_CXXFLAGS="-DQWS $QT_CXXFLAGS"
+fi
+
+if test x"$QT_IS_MT" = "xyes" ; then
+ QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
+fi
+
+QT_LDADD="-L$QTLIBDIR $QT_LIBS"
+
+if test x$QT_IS_STATIC = xyes ; then
+ OLDLIBS="$LIBS"
+ LIBS="$QT_LDADD"
+ AC_CHECK_LIB(Xft, XftFontOpen, QT_LDADD="$QT_LDADD -lXft")
+ LIBS="$LIBS"
+fi
+
+AC_MSG_CHECKING([QT_CXXFLAGS])
+AC_MSG_RESULT([$QT_CXXFLAGS])
+AC_MSG_CHECKING([QT_LDADD])
+AC_MSG_RESULT([$QT_LDADD])
+
+AC_SUBST(QT_CXXFLAGS)
+AC_SUBST(QT_LDADD)
+AC_SUBST(QT_GUILINK)
+AC_SUBST(QASSISTANTCLIENT_LDADD)
+
+])
More information about the kaffe
mailing list