Browse Source

LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Michele Calgaro 6 months ago
parent
commit
c56ae12168
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 19 additions and 19 deletions
  1. 9
    9
      acinclude.m4
  2. 9
    9
      aclocal.m4
  3. 1
    1
      kkbswitch/Makefile.am

+ 9
- 9
acinclude.m4 View File

@@ -1553,19 +1553,19 @@ AC_PATH_QT_MOC_UIC
1553 1553
 KDE_CHECK_QT_JPEG
1554 1554
 
1555 1555
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
1556
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1556
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1557 1557
 else
1558
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1558
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1559 1559
 fi
1560
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
1560
+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
1561 1561
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
1562 1562
   if test -e "$a"; then
1563
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
1563
+     LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
1564 1564
      break
1565 1565
   fi
1566 1566
 done
1567 1567
 
1568
-AC_SUBST(LIB_QT)
1568
+AC_SUBST(LIB_TQT)
1569 1569
 AC_SUBST(LIB_QPE)
1570 1570
 
1571 1571
 AC_SUBST(kde_qtver)
@@ -2036,7 +2036,7 @@ elif test $kde_qtver = 2; then
2036 2036
    AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2037 2037
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2038 2038
 else
2039
-   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2039
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")
2040 2040
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2041 2041
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2042 2042
    AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -4898,8 +4898,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
4898 4898
 
4899 4899
   AC_MSG_CHECKING([for Qtopia])
4900 4900
 
4901
-  LIB_QTOPIA="-lqpe"
4902
-  AC_SUBST(LIB_QTOPIA)
4901
+  LIB_TQTOPIA="-lqpe"
4902
+  AC_SUBST(LIB_TQTOPIA)
4903 4903
 
4904 4904
   kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
4905 4905
 
@@ -4946,7 +4946,7 @@ is required.])
4946 4946
 
4947 4947
   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
4948 4948
   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
4949
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
4949
+  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
4950 4950
 
4951 4951
   cat > conftest.$ac_ext <<EOF
4952 4952
 #include "confdefs.h"

+ 9
- 9
aclocal.m4 View File

@@ -1565,19 +1565,19 @@ AC_PATH_QT_MOC_UIC
1565 1565
 KDE_CHECK_QT_JPEG
1566 1566
 
1567 1567
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
1568
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1568
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1569 1569
 else
1570
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1570
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1571 1571
 fi
1572
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
1572
+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
1573 1573
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
1574 1574
   if test -e "$a"; then
1575
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
1575
+     LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
1576 1576
      break
1577 1577
   fi
1578 1578
 done
1579 1579
 
1580
-AC_SUBST(LIB_QT)
1580
+AC_SUBST(LIB_TQT)
1581 1581
 AC_SUBST(LIB_QPE)
1582 1582
 
1583 1583
 AC_SUBST(kde_qtver)
@@ -2048,7 +2048,7 @@ elif test $kde_qtver = 2; then
2048 2048
    AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2049 2049
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2050 2050
 else
2051
-   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2051
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")
2052 2052
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2053 2053
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2054 2054
    AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -4910,8 +4910,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
4910 4910
 
4911 4911
   AC_MSG_CHECKING([for Qtopia])
4912 4912
 
4913
-  LIB_QTOPIA="-lqpe"
4914
-  AC_SUBST(LIB_QTOPIA)
4913
+  LIB_TQTOPIA="-lqpe"
4914
+  AC_SUBST(LIB_TQTOPIA)
4915 4915
 
4916 4916
   kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
4917 4917
 
@@ -4958,7 +4958,7 @@ is required.])
4958 4958
 
4959 4959
   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
4960 4960
   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
4961
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
4961
+  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
4962 4962
 
4963 4963
   cat > conftest.$ac_ext <<EOF
4964 4964
 #include "confdefs.h"

+ 1
- 1
kkbswitch/Makefile.am View File

@@ -7,7 +7,7 @@ kkbswitch_SOURCES = boldlistboxitem.cpp boldmenuitem.cpp kbconfig.cpp kbconfigdl
7 7
 
8 8
 INCLUDES = $(all_includes)
9 9
 
10
-kkbswitch_LDADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lDCOP
10
+kkbswitch_LDADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) -lDCOP
11 11
 
12 12
 messages:
13 13
 	$(XGETTEXT) *.cpp -o $(podir)/kkbswitch.pot

Loading…
Cancel
Save