diff options
| author | Michele Calgaro <[email protected]> | 2018-09-17 23:20:01 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-09-17 23:20:01 +0900 |
| commit | 3e741d33157eaf47d6604baa3276ff75b71675ee (patch) | |
| tree | 45ea29e89afe6fa7c1b0b447e3a2e9c1ba86cd22 | |
| parent | 9d7a327ba93f3e6d5eab9a87feb5a2f62899b39b (diff) | |
| download | libkexiv2-3e741d33157eaf47d6604baa3276ff75b71675ee.tar.gz libkexiv2-3e741d33157eaf47d6604baa3276ff75b71675ee.zip | |
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <[email protected]>
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | libkexiv2/libkexiv2/Makefile.am | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index facce85..617e2af 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1601,19 +1601,19 @@ 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 -AC_SUBST(LIB_QT) +AC_SUBST(LIB_TQT) AC_SUBST(LIB_QPE) AC_SUBST(kde_qtver) @@ -2125,7 +2125,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)") @@ -5468,8 +5468,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" @@ -5516,7 +5516,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/libkexiv2/libkexiv2/Makefile.am b/libkexiv2/libkexiv2/Makefile.am index 79ae56a..0593792 100644 --- a/libkexiv2/libkexiv2/Makefile.am +++ b/libkexiv2/libkexiv2/Makefile.am @@ -9,7 +9,7 @@ libkexiv2_la_SOURCES = kexiv2.cpp kexiv2private.cpp libkexiv2_version_info = 5:0:0 libkexiv2_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info $(libkexiv2_version_info) -no-undefined -libkexiv2_la_LIBADD = $(EXIV2_LIBS) $(LIB_TDECORE) $(LIB_QT) +libkexiv2_la_LIBADD = $(EXIV2_LIBS) $(LIB_TDECORE) $(LIB_TQT) libkexiv2include_HEADERS = kexiv2.h libkexiv2_export.h version.h |