diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-17 23:48:20 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-17 23:48:20 +0900 |
| commit | cc079094703da3f3c4362314f4a2e7d2f821b5c8 (patch) | |
| tree | a2426c648540bef0f59fc7379d7838507b2a3010 | |
| parent | ba9fa4225899d14afb732cdba9815fa391a300a9 (diff) | |
| download | keximdb-cc079094.tar.gz keximdb-cc079094.zip | |
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | keximdb/src/keximdb/Makefile.am | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 39ab8e9..ce8061a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1796,19 +1796,19 @@ 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) $(LIBTQT_LDFLAGS)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) $(LIBTQT_LDFLAGS)' else -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) $(LIBTQT_LDFLAGS)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) $(LIBTQT_LDFLAGS)' 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 -AC_SUBST(LIB_QT) +AC_SUBST(LIB_TQT) AC_SUBST(LIB_QPE) AC_SUBST(kde_qtver) @@ -2372,7 +2372,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)") @@ -5942,8 +5942,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" @@ -5990,7 +5990,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/keximdb/src/keximdb/Makefile.am b/keximdb/src/keximdb/Makefile.am index 94000e5..b223235 100644 --- a/keximdb/src/keximdb/Makefile.am +++ b/keximdb/src/keximdb/Makefile.am @@ -12,7 +12,7 @@ AM_CPPFLAGS = \ keximigrate_mdb_la_METASOURCES = AUTO keximigrate_mdb_la_LIBADD = \ - $(LIB_QT) $(GLIB_LIBADD) -L$(KEXIDB_LIB) -lkeximigrate \ + $(LIB_TQT) $(GLIB_LIBADD) -L$(KEXIDB_LIB) -lkeximigrate \ ../mdbtools/libmdb/libmdb.la keximigrate_mdb_la_LDFLAGS = \ |