Parcourir la source

qt -> tqt conversion:

qtlib -> tqtlib
libqt -> libtqt
QTLIB -> TQTLIB
LIBQT -> LIBTQT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro il y a 9 mois
Parent
révision
4905976cc3
Signé par: Michele Calgaro <michele.calgaro@yahoo.it> ID de la clé GPG: 2A75B7CA8ADED5CF
2 fichiers modifiés avec 29 ajouts et 29 suppressions
  1. 1
    1
      INSTALL
  2. 28
    28
      acinclude.m4

+ 1
- 1
INSTALL Voir le fichier

@@ -23,7 +23,7 @@ below.
23 23
 - libgr-dev, libungif-dev, libjpeg-dev, libpng-dev, libtiff-dev, libxpm-dev (image libraries)
24 24
 - XFree86-dev (necessary for graphics programs)
25 25
 - zlib-dev (compression)
26
-- libqt or libqt-dev or qt-dev (QT development libraries)
26
+- libtqt or libtqt-dev or qt-dev (QT development libraries)
27 27
 - openssl
28 28
 - Any package with kde and dev in the title.
29 29
 - Any package with kde and lib in the title.

+ 28
- 28
acinclude.m4 Voir le fichier

@@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
371 371
   fi
372 372
 
373 373
 AC_MSG_CHECKING([for KDE libraries installed])
374
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
374
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBTQT $KDE_TEST_RPATH 1>&5'
375 375
 
376 376
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
377 377
   AC_MSG_RESULT(yes)
@@ -1253,9 +1253,9 @@ ac_libs_safe="$LIBS"
1253 1253
 CXXFLAGS="$CXXFLAGS -I$tqt_includes"
1254 1254
 LDFLAGS="$LDFLAGS $X_LDFLAGS"
1255 1255
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
1256
-LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
1256
+LIBS="$LIBTQT -lXext -lX11 $LIBSOCKET"
1257 1257
 else
1258
-LIBS="$LIBQT $LIBSOCKET"
1258
+LIBS="$LIBTQT $LIBSOCKET"
1259 1259
 fi
1260 1260
 LD_LIBRARY_PATH=
1261 1261
 export LD_LIBRARY_PATH
@@ -1295,7 +1295,7 @@ fi
1295 1295
 
1296 1296
 dnl ------------------------------------------------------------------------
1297 1297
 dnl Try to find the Qt headers and libraries.
1298
-dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
1298
+dnl $(QT_LDFLAGS) will be -Ltqtliblocation (if needed)
1299 1299
 dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
1300 1300
 dnl ------------------------------------------------------------------------
1301 1301
 dnl
@@ -1348,11 +1348,11 @@ kde_qt_was_given=yes
1348 1348
 dnl ------------------------------------------------------------------------
1349 1349
 dnl If we haven't been told how to link to Qt, we work it out for ourselves.
1350 1350
 dnl ------------------------------------------------------------------------
1351
-if test -z "$LIBQT_GLOB"; then
1351
+if test -z "$LIBTQT_GLOB"; then
1352 1352
   if test "x$kde_use_qt_emb" = "xyes"; then
1353
-    LIBQT_GLOB="libqte.*"
1353
+    LIBTQT_GLOB="libtqte.*"
1354 1354
   else
1355
-    LIBQT_GLOB="libqt.*"
1355
+    LIBTQT_GLOB="libtqt.*"
1356 1356
   fi
1357 1357
 fi
1358 1358
 
@@ -1360,12 +1360,12 @@ dnl ------------------------------------------------------------
1360 1360
 dnl If we got --enable-embedded then adjust the Qt library name.
1361 1361
 dnl ------------------------------------------------------------
1362 1362
 if test "x$kde_use_qt_emb" = "xyes"; then
1363
-  qtlib="qte"
1363
+  tqtlib="qte"
1364 1364
 else
1365
-  qtlib="qt"
1365
+  tqtlib="qt"
1366 1366
 fi
1367 1367
 
1368
-kde_int_qt="-l$qtlib"
1368
+kde_int_qt="-l$tqtlib"
1369 1369
 
1370 1370
 if test -z "$LIBQPE"; then
1371 1371
 dnl ------------------------------------------------------------
@@ -1387,30 +1387,30 @@ dnl If we got --enable-tqt-mt then adjust the Qt library name for the host.
1387 1387
 dnl ------------------------------------------------------------------------
1388 1388
 
1389 1389
 if test "x$kde_use_qt_mt" = "xyes"; then
1390
-  LIBQT="-l$qtlib-mt"
1391
-  kde_int_qt="-l$qtlib-mt"
1392
-  LIBQT_GLOB="lib$qtlib-mt.*"
1390
+  LIBTQT="-l$tqtlib-mt"
1391
+  kde_int_qt="-l$tqtlib-mt"
1392
+  LIBTQT_GLOB="lib$tqtlib-mt.*"
1393 1393
   USING_QT_MT="using -mt"
1394 1394
 else
1395
-  LIBQT="-l$qtlib"
1395
+  LIBTQT="-l$tqtlib"
1396 1396
 fi
1397 1397
 
1398 1398
 if test $kde_qtver != 1; then
1399 1399
 
1400 1400
   AC_REQUIRE([AC_FIND_PNG])
1401 1401
   AC_REQUIRE([AC_FIND_JPEG])
1402
-  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
1402
+  LIBTQT="$LIBTQT $LIBPNG $LIBJPEG"
1403 1403
 fi
1404 1404
 
1405 1405
 if test $kde_qtver = 3; then
1406 1406
   AC_REQUIRE([KDE_CHECK_LIBDL])
1407
-  LIBQT="$LIBQT $LIBDL"
1407
+  LIBTQT="$LIBTQT $LIBDL"
1408 1408
 fi
1409 1409
 
1410 1410
 AC_MSG_CHECKING([for Qt])
1411 1411
 
1412 1412
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
1413
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
1413
+LIBTQT="$LIBTQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
1414 1414
 fi
1415 1415
 ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
1416 1416
 qt_libraries=""
@@ -1461,21 +1461,21 @@ qt_libdirs=""
1461 1461
 for dir in $kde_qt_dirs; do
1462 1462
    qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
1463 1463
 done
1464
-qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1464
+qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1465 1465
 if test ! "$ac_qt_libraries" = "NO"; then
1466 1466
   qt_libdir=$ac_qt_libraries
1467 1467
 else
1468 1468
   qt_libdirs="$ac_qt_libraries $qt_libdirs"
1469
-  # if the Qt was given, the chance is too big that libqt.* doesn't exist
1469
+  # if the Qt was given, the chance is too big that libtqt.* doesn't exist
1470 1470
   qt_libdir=NONE
1471 1471
   for dir in $qt_libdirs; do
1472
-    try="ls -1 $dir/${LIBQT_GLOB}"
1472
+    try="ls -1 $dir/${LIBTQT_GLOB}"
1473 1473
     if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
1474 1474
   done
1475 1475
 fi
1476 1476
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
1477 1477
   if test -e "$a"; then
1478
-    LIBQT="$LIBQT ${kde_int_qt}_incremental"
1478
+    LIBTQT="$LIBTQT ${kde_int_qt}_incremental"
1479 1479
     break
1480 1480
   fi
1481 1481
 done
@@ -1491,7 +1491,7 @@ ac_libs_safe="$LIBS"
1491 1491
 
1492 1492
 CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
1493 1493
 LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
1494
-LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
1494
+LIBS="$LIBS $LIBTQT $KDE_MT_LIBS"
1495 1495
 
1496 1496
 KDE_PRINT_QT_PROGRAM
1497 1497
 
@@ -1522,9 +1522,9 @@ if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then
1522 1522
     if test "x$kde_use_qt_mt" = "xyes"; then
1523 1523
        missing_qt_mt="
1524 1524
 Make sure that you have compiled Qt with thread support!"
1525
-       ac_qt_notfound="(library $qtlib-mt)";
1525
+       ac_qt_notfound="(library $tqtlib-mt)";
1526 1526
     else
1527
-       ac_qt_notfound="(library $qtlib)";
1527
+       ac_qt_notfound="(library $tqtlib)";
1528 1528
     fi
1529 1529
   fi
1530 1530
 
@@ -2029,7 +2029,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
2029 2029
  kde_libs_safe="$LIBS"
2030 2030
  kde_cxxflags_safe="$CXXFLAGS"
2031 2031
 
2032
- LIBS="-lkde-qt-addon $LIBQT $LIBS"
2032
+ LIBS="-lkde-qt-addon $LIBTQT $LIBS"
2033 2033
  CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
2034 2034
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
2035 2035
 
@@ -2590,7 +2590,7 @@ AC_CACHE_VAL(kde_cv_qt_jpeg,
2590 2590
 AC_LANG_SAVE
2591 2591
 AC_LANG_CPLUSPLUS
2592 2592
 ac_save_LIBS="$LIBS"
2593
-LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
2593
+LIBS="$all_libraries $USER_LDFLAGS $LIBTQT"
2594 2594
 LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
2595 2595
 ac_save_CXXFLAGS="$CXXFLAGS"
2596 2596
 CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
@@ -4684,7 +4684,7 @@ AC_LANG_SAVE
4684 4684
 AC_LANG_CPLUSPLUS
4685 4685
 ac_save_LIBS="$LIBS"
4686 4686
 ac_save_CXXFLAGS="$CXXFLAGS"
4687
-LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
4687
+LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBTQT"
4688 4688
 CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
4689 4689
 AC_TRY_RUN(dnl
4690 4690
 [
@@ -5491,7 +5491,7 @@ is required.])
5491 5491
 
5492 5492
   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
5493 5493
   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
5494
-  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
5494
+  LIBS="$LIBS $LIB_TQTOPIA $LIBTQT"
5495 5495
 
5496 5496
   cat > conftest.$ac_ext <<EOF
5497 5497
 #include "confdefs.h"

Chargement…
Annuler
Enregistrer