[kaffe] CVS kaffe (robilad): fix for qt detection
Kaffe CVS
cvs-commits at kaffe.org
Tue Feb 7 16:17:16 PST 2006
PatchSet 7119
Date: 2006/02/07 23:59:06
Author: robilad
Branch: HEAD
Tag: (none)
Log:
fix for qt detection
2006-02-07 Holger Schurig <hs4233 at mail.mn-solutions.de>
Fix for #8.
* kaffe/m4/gwqt.m4: Fixed Qt directory layout assumptions.
Members:
ChangeLog:1.4637->1.4638
configure:1.535->1.536
m4/gwqt.m4:1.4->1.5
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4637 kaffe/ChangeLog:1.4638
--- kaffe/ChangeLog:1.4637 Tue Feb 7 21:46:51 2006
+++ kaffe/ChangeLog Tue Feb 7 23:59:06 2006
@@ -1,3 +1,9 @@
+2006-02-07 Holger Schurig <hs4233 at mail.mn-solutions.de>
+
+ Fix for #8.
+
+ * kaffe/m4/gwqt.m4: Fixed Qt directory layout assumptions.
+
2006-02-07 Dalibor Topic <robilad at kaffe.org>
Fix for #7.
Index: kaffe/configure
diff -u kaffe/configure:1.535 kaffe/configure:1.536
--- kaffe/configure:1.535 Tue Feb 7 21:46:53 2006
+++ kaffe/configure Tue Feb 7 23:59:13 2006
@@ -1170,6 +1170,7 @@
engine (not built by default)
--with-qt-libraries=DIR Qt library installation directory (default = $QTDIR/lib)
--with-qt-binaries=DIR Qt binary installation directory (default = $QTDIR/bin)
+ --with-qt-headers=DIR Qt include directory (default = $QTDIR/include)
--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)
@@ -5990,7 +5991,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5993 "configure"' > conftest.$ac_ext
+ echo '#line 5994 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7367,7 +7368,7 @@
# Provide some information about the compiler.
-echo "$as_me:7370:" \
+echo "$as_me:7371:" \
"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
@@ -8434,11 +8435,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8437: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8438: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8441: \$? = $ac_status" >&5
+ echo "$as_me:8442: \$? = $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.
@@ -8702,11 +8703,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8705: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8706: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8709: \$? = $ac_status" >&5
+ echo "$as_me:8710: \$? = $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.
@@ -8806,11 +8807,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8809: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8810: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8813: \$? = $ac_status" >&5
+ echo "$as_me:8814: \$? = $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
@@ -11151,7 +11152,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11154 "configure"
+#line 11155 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11251,7 +11252,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11254 "configure"
+#line 11255 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13595,11 +13596,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13598: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13599: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13602: \$? = $ac_status" >&5
+ echo "$as_me:13603: \$? = $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.
@@ -13699,11 +13700,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13702: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13703: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13706: \$? = $ac_status" >&5
+ echo "$as_me:13707: \$? = $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
@@ -15269,11 +15270,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15272: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15273: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15276: \$? = $ac_status" >&5
+ echo "$as_me:15277: \$? = $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.
@@ -15373,11 +15374,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15376: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15377: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15380: \$? = $ac_status" >&5
+ echo "$as_me:15381: \$? = $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
@@ -17580,11 +17581,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17583: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17584: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17587: \$? = $ac_status" >&5
+ echo "$as_me:17588: \$? = $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.
@@ -17848,11 +17849,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17851: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17852: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17855: \$? = $ac_status" >&5
+ echo "$as_me:17856: \$? = $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.
@@ -17952,11 +17953,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17955: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17956: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17959: \$? = $ac_status" >&5
+ echo "$as_me:17960: \$? = $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
@@ -48246,17 +48247,24 @@
+echo "$as_me:$LINENO: checking QTLIBDIR" >&5
+echo $ECHO_N "checking QTLIBDIR... $ECHO_C" >&6
+
# 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
+echo "$as_me:$LINENO: result: $QTLIBDIR" >&5
+echo "${ECHO_T}$QTLIBDIR" >&6
+
+echo "$as_me:$LINENO: checking QTBINDIR" >&5
+echo $ECHO_N "checking QTBINDIR... $ECHO_C" >&6
# Check whether --with-qt-binaries or --without-qt-binaries was given.
if test "${with_qt_binaries+set}" = set; then
@@ -48264,10 +48272,27 @@
QTBINDIR=$withval
fi;
-
if test x"$QTBINDIR" = x"" ; then
QTBINDIR=$QTDIR/bin
fi
+echo "$as_me:$LINENO: result: $QTBINDIR" >&5
+echo "${ECHO_T}$QTBINDIR" >&6
+
+
+echo "$as_me:$LINENO: checking QTINCDIR" >&5
+echo $ECHO_N "checking QTINCDIR... $ECHO_C" >&6
+
+# Check whether --with-qt-headers or --without-qt-headers was given.
+if test "${with_qt_headers+set}" = set; then
+ withval="$with_qt_headers"
+ QTINCDIR=$withval
+
+fi;
+if test x"$QTINCDIR" = x"" ; then
+ QTINCDIR=$QTDIR/include
+fi
+echo "$as_me:$LINENO: result: $QTINCDIR" >&5
+echo "${ECHO_T}$QTINCDIR" >&6
echo "$as_me:$LINENO: checking QTDIR" >&5
@@ -48302,7 +48327,7 @@
# Figure out which version of Qt we are using
echo "$as_me:$LINENO: checking Qt version" >&5
echo $ECHO_N "checking Qt version... $ECHO_C" >&6
-QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTDIR/include/qglobal.h | perl -p -e 's/\D//g'`
+QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTINCDIR/qglobal.h | perl -p -e 's/\D//g'`
case "${QT_VER}" in
2*)
QT_MAJOR="2"
@@ -48452,7 +48477,7 @@
# Calculate Qt include path
-QT_CXXFLAGS="-I$QTDIR/include"
+QT_CXXFLAGS="-I$QTINCDIR"
QT_IS_EMBEDDED="no"
# On unix, figure out if we're doing a static or dynamic link
@@ -48483,7 +48508,7 @@
;;
*)
- QT_IS_STATIC=`ls $QTLIBDIR/*.a 2> /dev/null`
+ QT_IS_STATIC=`ls $QTLIBDIR/libqt*.a 2>/dev/null`
if test "x$QT_IS_STATIC" = x; then
QT_IS_STATIC="no"
else
Index: kaffe/m4/gwqt.m4
diff -u kaffe/m4/gwqt.m4:1.4 kaffe/m4/gwqt.m4:1.5
--- kaffe/m4/gwqt.m4:1.4 Fri Sep 16 03:11:25 2005
+++ kaffe/m4/gwqt.m4 Tue Feb 7 23:59:27 2006
@@ -4,23 +4,38 @@
AC_REQUIRE([AC_PROG_CXX])
AC_REQUIRE([AC_PATH_X])
+
+AC_MSG_CHECKING([QTLIBDIR])
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_MSG_RESULT([$QTLIBDIR])
+
+AC_MSG_CHECKING([QTBINDIR])
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_RESULT([$QTBINDIR])
+
+
+AC_MSG_CHECKING([QTINCDIR])
+AC_ARG_WITH([qt-headers],
+ [ --with-qt-headers=DIR Qt include directory (default = $QTDIR/include)],
+ [QTINCDIR=$withval]
+)
+if test x"$QTINCDIR" = x"" ; then
+ QTINCDIR=$QTDIR/include
+fi
+AC_MSG_RESULT([$QTINCDIR])
AC_MSG_CHECKING([QTDIR])
@@ -45,7 +60,7 @@
# 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'`
+QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTINCDIR/qglobal.h | perl -p -e 's/\D//g'`
case "${QT_VER}" in
2*)
QT_MAJOR="2"
@@ -78,7 +93,7 @@
# Calculate Qt include path
-QT_CXXFLAGS="-I$QTDIR/include"
+QT_CXXFLAGS="-I$QTINCDIR"
QT_IS_EMBEDDED="no"
# On unix, figure out if we're doing a static or dynamic link
@@ -105,7 +120,7 @@
;;
*)
- QT_IS_STATIC=`ls $QTLIBDIR/*.a 2> /dev/null`
+ QT_IS_STATIC=`ls $QTLIBDIR/libqt*.a 2>/dev/null`
if test "x$QT_IS_STATIC" = x; then
QT_IS_STATIC="no"
else
More information about the kaffe
mailing list