diff options
| author | Michele Calgaro <[email protected]> | 2018-09-17 23:20:19 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-09-17 23:20:19 +0900 |
| commit | 2ff9ffe9d6d8c70b914d8be94720c90ee94239ca (patch) | |
| tree | 45eed8e359494a0f8f4acd55689e3e7e331d0047 /acinclude.m4 | |
| parent | 2ae3e993c8cda48a7b2549f318a78821ebea8ab8 (diff) | |
| download | kile-2ff9ffe9d6d8c70b914d8be94720c90ee94239ca.tar.gz kile-2ff9ffe9d6d8c70b914d8be94720c90ee94239ca.zip | |
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index a8bdfd4..9bf04c7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1601,24 +1601,24 @@ AC_PATH_QT_MOC_UIC 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_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' else -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' fi -test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS" +test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS" for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do if test -e "$a"; then - LIB_QT="$LIB_QT ${kde_int_qt}_incremental" + LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental" break fi done -# Export just Qt libs in LIB_QT, "extended" version will be exported as LIB_QT_EXT -LIB_QT_EXT="$LIB_QT" -LIB_QT="$kde_int_qt" +# Export just Qt libs in LIB_TQT, "extended" version will be exported as LIB_TQT_EXT +LIB_TQT_EXT="$LIB_TQT" +LIB_TQT="$kde_int_qt" -AC_SUBST(LIB_QT_EXT) -AC_SUBST(LIB_QT) +AC_SUBST(LIB_TQT_EXT) +AC_SUBST(LIB_TQT) AC_SUBST(LIB_QPE) AC_SUBST(kde_qtver) @@ -2121,7 +2121,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") @@ -5464,8 +5464,8 @@ AC_DEFUN([AC_PATH_QTOPIA], AC_MSG_CHECKING([for Qtopia]) - LIB_QTOPIA="-lqpe" - AC_SUBST(LIB_QTOPIA) + LIB_TQTOPIA="-lqpe" + AC_SUBST(LIB_TQTOPIA) kde_qtopia_dirs="$QPEDIR /opt/Qtopia" @@ -5512,7 +5512,7 @@ is required.]) CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_QTOPIA $LIBQT" + LIBS="$LIBS $LIB_TQTOPIA $LIBQT" cat > conftest.$ac_ext <<EOF #include "confdefs.h" |