|
|
@ -1463,7 +1463,7 @@ dnl If we got --enable-embedded then adjust the Qt library name.
|
|
|
|
dnl Also Qt4 uses a different library name
|
|
|
|
dnl Also Qt4 uses a different library name
|
|
|
|
dnl ------------------------------------------------------------
|
|
|
|
dnl ------------------------------------------------------------
|
|
|
|
if test "$kde_qtver" = "4"; then
|
|
|
|
if test "$kde_qtver" = "4"; then
|
|
|
|
qtlib="QtCore -lQtGui"
|
|
|
|
qtlib="QtCore -lQtGui -lQt3Support"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$kde_qtver" = "3"; then
|
|
|
|
if test "$kde_qtver" = "3"; then
|
|
|
|
if test "x$kde_use_qt_emb" = "xyes"; then
|
|
|
|
if test "x$kde_use_qt_emb" = "xyes"; then
|
|
|
@ -1714,9 +1714,9 @@ KDE_CHECK_TQT
|
|
|
|
KDE_CHECK_QT_JPEG
|
|
|
|
KDE_CHECK_QT_JPEG
|
|
|
|
|
|
|
|
|
|
|
|
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
|
|
|
|
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
|
|
|
|
LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
|
|
|
|
LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) $(LIBTQT_LDFLAGS)'
|
|
|
|
else
|
|
|
|
else
|
|
|
|
LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
|
|
|
|
LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) $(LIBTQT_LDFLAGS)'
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
|
|
|
|
test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
|
|
|
|
for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
|
|
|
|
for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
|
|
|
@ -2790,8 +2790,11 @@ dnl AC_MSG_ERROR([You are attempting to compile Trinity without the Trinity Qt
|
|
|
|
else
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
LIBTQT_LDFLAGS="-ltqt"
|
|
|
|
LIBTQT_LDFLAGS="-ltqt"
|
|
|
|
all_libraries="$all_libraries $LIBTQT_LDFLAGS"
|
|
|
|
AC_SUBST(LIBTQT_LDFLAGS)
|
|
|
|
|
|
|
|
dnl all_libraries="$all_libraries $LIBTQT_LDFLAGS"
|
|
|
|
QT_LDFLAGS="$QT_LDFLAGS $LIBTQT_LDFLAGS"
|
|
|
|
QT_LDFLAGS="$QT_LDFLAGS $LIBTQT_LDFLAGS"
|
|
|
|
|
|
|
|
AC_SUBST(QT_LDFLAGS)
|
|
|
|
|
|
|
|
qtlib="$qtlib $LIBTQT_LDFLAGS"
|
|
|
|
LIBTQT_CXXFLAGS="-include tqt.h"
|
|
|
|
LIBTQT_CXXFLAGS="-include tqt.h"
|
|
|
|
all_includes="$all_includes $LIBTQT_CXXFLAGS"
|
|
|
|
all_includes="$all_includes $LIBTQT_CXXFLAGS"
|
|
|
|
QT_INCLUDES="$QT_INCLUDES $LIBTQT_CXXFLAGS"
|
|
|
|
QT_INCLUDES="$QT_INCLUDES $LIBTQT_CXXFLAGS"
|
|
|
|