Browse Source

qt_includes => tqt_includes conversion

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Slávek Banko 6 months ago
parent
commit
d07cfb6a8c
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
1 changed files with 18 additions and 18 deletions
  1. 18
    18
      acinclude.m4

+ 18
- 18
acinclude.m4 View File

@@ -1250,7 +1250,7 @@ ac_cxxflags_safe="$CXXFLAGS"
1250 1250
 ac_ldflags_safe="$LDFLAGS"
1251 1251
 ac_libs_safe="$LIBS"
1252 1252
 
1253
-CXXFLAGS="$CXXFLAGS -I$qt_includes"
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 1256
 LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
@@ -1412,12 +1412,12 @@ AC_MSG_CHECKING([for Qt])
1412 1412
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
1413 1413
 LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
1414 1414
 fi
1415
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
1415
+ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
1416 1416
 qt_libraries=""
1417
-qt_includes=""
1417
+tqt_includes=""
1418 1418
 AC_ARG_WITH(qt-dir,
1419 1419
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
1420
-    [  ac_qt_includes="$withval"/include
1420
+    [  ac_tqt_includes="$withval"/include
1421 1421
        ac_qt_libraries="$withval"/lib${tdelibsuff}
1422 1422
        ac_qt_bindir="$withval"/bin
1423 1423
     ])
@@ -1425,7 +1425,7 @@ AC_ARG_WITH(qt-dir,
1425 1425
 AC_ARG_WITH(qt-includes,
1426 1426
     AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
1427 1427
     [
1428
-       ac_qt_includes="$withval"
1428
+       ac_tqt_includes="$withval"
1429 1429
     ])
1430 1430
 
1431 1431
 kde_qt_libs_given=no
@@ -1444,8 +1444,8 @@ for dir in $kde_qt_dirs; do
1444 1444
    qt_incdirs="$qt_incdirs $dir/include $dir"
1445 1445
 done
1446 1446
 qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
1447
-if test ! "$ac_qt_includes" = "NO"; then
1448
-   qt_incdirs="$ac_qt_includes $qt_incdirs"
1447
+if test ! "$ac_tqt_includes" = "NO"; then
1448
+   qt_incdirs="$ac_tqt_includes $qt_incdirs"
1449 1449
 fi
1450 1450
 
1451 1451
 if test "$kde_qtver" != "1"; then
@@ -1455,7 +1455,7 @@ else
1455 1455
 fi
1456 1456
 
1457 1457
 AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
1458
-ac_qt_includes="$qt_incdir"
1458
+ac_tqt_includes="$qt_incdir"
1459 1459
 
1460 1460
 qt_libdirs=""
1461 1461
 for dir in $kde_qt_dirs; do
@@ -1508,11 +1508,11 @@ LDFLAGS="$ac_ldflags_safe"
1508 1508
 LIBS="$ac_libs_safe"
1509 1509
 
1510 1510
 AC_LANG_RESTORE
1511
-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
1511
+if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then
1512 1512
   ac_cv_have_qt="have_qt=no"
1513 1513
   ac_qt_notfound=""
1514 1514
   missing_qt_mt=""
1515
-  if test "$ac_qt_includes" = NO; then
1515
+  if test "$ac_tqt_includes" = NO; then
1516 1516
     if test "$ac_qt_libraries" = NO; then
1517 1517
       ac_qt_notfound="(headers and libraries)";
1518 1518
     else
@@ -1541,11 +1541,11 @@ if test "$have_qt" != yes; then
1541 1541
   AC_MSG_RESULT([$have_qt]);
1542 1542
 else
1543 1543
   ac_cv_have_qt="have_qt=yes \
1544
-    ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
1545
-  AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT])
1544
+    ac_tqt_includes=$ac_tqt_includes ac_qt_libraries=$ac_qt_libraries"
1545
+  AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_tqt_includes $USING_QT_MT])
1546 1546
 
1547 1547
   qt_libraries="$ac_qt_libraries"
1548
-  qt_includes="$ac_qt_includes"
1548
+  tqt_includes="$ac_tqt_includes"
1549 1549
 fi
1550 1550
 
1551 1551
 if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -1553,12 +1553,12 @@ if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
1553 1553
 fi
1554 1554
 
1555 1555
 AC_SUBST(qt_libraries)
1556
-AC_SUBST(qt_includes)
1556
+AC_SUBST(tqt_includes)
1557 1557
 
1558
-if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
1558
+if test "$tqt_includes" = "$x_includes" || test -z "$tqt_includes"; then
1559 1559
  TQT_INCLUDES=""
1560 1560
 else
1561
- TQT_INCLUDES="-I$qt_includes"
1561
+ TQT_INCLUDES="-I$tqt_includes"
1562 1562
  all_includes="$TQT_INCLUDES $all_includes"
1563 1563
 fi
1564 1564
 
@@ -1793,7 +1793,7 @@ fi
1793 1793
 
1794 1794
 if test -z "$1"; then
1795 1795
 
1796
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
1796
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $tqt_includes"
1797 1797
 test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
1798 1798
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1799 1799
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1876,7 +1876,7 @@ fi
1876 1876
 AC_SUBST(kde_libraries)
1877 1877
 AC_SUBST(kde_includes)
1878 1878
 
1879
-if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes"  || test "$kde_includes" = "/usr/include"; then
1879
+if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$tqt_includes"  || test "$kde_includes" = "/usr/include"; then
1880 1880
  KDE_INCLUDES=""
1881 1881
 else
1882 1882
  KDE_INCLUDES="-I$kde_includes"

Loading…
Cancel
Save