diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-05 21:52:21 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-05 21:52:21 +0000 |
| commit | 841d7763aef4b11a5b38900ce54fa5950522c9f0 (patch) | |
| tree | 41f3b5ae65015233aa1b9fae999e5e466f0d152d | |
| parent | 07f305dba1867e5527b50901bf4d711d1f9ee488 (diff) | |
| download | admin-841d7763.tar.gz admin-841d7763.zip | |
TQt LDFLAGs propagation fix
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common/admin@1159656 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | acinclude.m4.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in index ce6f82d..124054f 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -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 ------------------------------------------------------------ if test "$kde_qtver" = "4"; then - qtlib="QtCore -lQtGui" + qtlib="QtCore -lQtGui -lQt3Support" fi if test "$kde_qtver" = "3"; then if test "x$kde_use_qt_emb" = "xyes"; then @@ -1714,9 +1714,9 @@ KDE_CHECK_TQT KDE_CHECK_QT_JPEG 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 -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' +LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) $(LIBTQT_LDFLAGS)' fi 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 @@ -2790,8 +2790,11 @@ dnl AC_MSG_ERROR([You are attempting to compile Trinity without the Trinity Qt else AC_MSG_RESULT(yes) 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" + AC_SUBST(QT_LDFLAGS) + qtlib="$qtlib $LIBTQT_LDFLAGS" LIBTQT_CXXFLAGS="-include tqt.h" all_includes="$all_includes $LIBTQT_CXXFLAGS" QT_INCLUDES="$QT_INCLUDES $LIBTQT_CXXFLAGS" |