diff options
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | src/kile.kdevprj | 2 | ||||
| -rw-r--r-- | src/kile/Makefile.am | 2 | ||||
| -rw-r--r-- | src/kile/symbols/Makefile.am | 2 |
4 files changed, 16 insertions, 16 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" diff --git a/src/kile.kdevprj b/src/kile.kdevprj index 17fa0dc..1979a8c 100644 --- a/src/kile.kdevprj +++ b/src/kile.kdevprj @@ -22,7 +22,7 @@ bin_program=kile cflags=-pg -a cppflags= cxxflags=\s-O0 -g3 -Wall -ldadd=-ltdeprint $(LIB_TDESPELL) $(LIB_TDEPARTS) $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) +ldadd=-ltdeprint $(LIB_TDESPELL) $(LIB_TDEPARTS) $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) ldflags=\s \s [General] diff --git a/src/kile/Makefile.am b/src/kile/Makefile.am index 065c98b..2661af4 100644 --- a/src/kile/Makefile.am +++ b/src/kile/Makefile.am @@ -81,7 +81,7 @@ INCLUDES = $(all_includes) METASOURCES = AUTO # the library search path. -kile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) +kile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) rcdir = $(kde_datadir)/kile rc_DATA = kileui.rc docpartui.rc kilestdtools.rc tips diff --git a/src/kile/symbols/Makefile.am b/src/kile/symbols/Makefile.am index 3cd27f1..3adb206 100644 --- a/src/kile/symbols/Makefile.am +++ b/src/kile/symbols/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -gesymb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) +gesymb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) noinst_PROGRAMS = gesymb gesymb_SOURCES = gesymb.cpp gesymb.h |