[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/kde-common/admin
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2010-08-05 21:52:22
Message-ID: 20100805215222.54F09AC7CA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1159656 by tpearson:

TQt LDFLAGs propagation fix


 M  +7 -4      acinclude.m4.in  


--- branches/trinity/kde-common/admin/acinclude.m4.in #1159655:1159656
@@ -1463,7 +1463,7 @@
 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_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 @@
 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"
[prev in list] [next in list] [prev in thread] [next in thread]