Browse Source

Change default TQt library name from 'qt' to 'tqt'.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Slávek Banko 5 months ago
parent
commit
7d383aafec
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
3 changed files with 8 additions and 8 deletions
  1. 3
    3
      acinclude.m4
  2. 3
    3
      admin/acinclude.m4.in
  3. 2
    2
      configure.in

+ 3
- 3
acinclude.m4 View File

@@ -1486,8 +1486,8 @@ AC_DEFUN([AC_SS_FIND_QT],
1486 1486
 
1487 1487
 AC_DEFUN([AC_SS_FIND_QT3_NAME],
1488 1488
 [
1489
-	AC_MSG_CHECKING([for the Qt library name])
1490
-	AC_ARG_WITH(qt-name,[  --with-qt-name=NAME     Use NAME instead of \"qt\" as Qt library name],SS_TQTLIB_NAME="$withval",SS_TQTLIB_NAME="qt")
1489
+	AC_MSG_CHECKING([for the TQt library name])
1490
+	AC_ARG_WITH(qt-name,[  --with-tqt-name=NAME     Use NAME instead of \"tqt\" as TQt library name],SS_TQTLIB_NAME="$withval",SS_TQTLIB_NAME="tqt")
1491 1491
 	AC_MSG_RESULT("$SS_TQTLIB_NAME")
1492 1492
 ])
1493 1493
 
@@ -1695,7 +1695,7 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
1695 1695
 [
1696 1696
 	AC_ARG_WITH(qt-library-dir,[  --with-qt-library-dir   path to the Qt 3.x library ],SS_QT3_LIBDIR="$withval",SS_QT3_LIBDIR="NOTGIVEN")
1697 1697
 	if test "$SS_QT3_LIBDIR" = "NOTGIVEN"; then
1698
-		AC_MSG_CHECKING([for the Qt library])
1698
+		AC_MSG_CHECKING([for the TQt library])
1699 1699
 
1700 1700
 		ss_qt_library_test_dirs="$SS_QT3_GENERAL_DIR/lib /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib"
1701 1701
 		test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $ss_qt_library_test_dirs"

+ 3
- 3
admin/acinclude.m4.in View File

@@ -1486,8 +1486,8 @@ AC_DEFUN([AC_SS_FIND_QT],
1486 1486
 
1487 1487
 AC_DEFUN([AC_SS_FIND_QT3_NAME],
1488 1488
 [
1489
-	AC_MSG_CHECKING([for the Qt library name])
1490
-	AC_ARG_WITH(qt-name,[  --with-qt-name=NAME     Use NAME instead of \"qt\" as Qt library name],SS_TQTLIB_NAME="$withval",SS_TQTLIB_NAME="qt")
1489
+	AC_MSG_CHECKING([for the TQt library name])
1490
+	AC_ARG_WITH(qt-name,[  --with-tqt-name=NAME     Use NAME instead of \"tqt\" as TQt library name],SS_TQTLIB_NAME="$withval",SS_TQTLIB_NAME="tqt")
1491 1491
 	AC_MSG_RESULT("$SS_TQTLIB_NAME")
1492 1492
 ])
1493 1493
 
@@ -1695,7 +1695,7 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
1695 1695
 [
1696 1696
 	AC_ARG_WITH(qt-library-dir,[  --with-qt-library-dir   path to the Qt 3.x library ],SS_QT3_LIBDIR="$withval",SS_QT3_LIBDIR="NOTGIVEN")
1697 1697
 	if test "$SS_QT3_LIBDIR" = "NOTGIVEN"; then
1698
-		AC_MSG_CHECKING([for the Qt library])
1698
+		AC_MSG_CHECKING([for the TQt library])
1699 1699
 
1700 1700
 		ss_qt_library_test_dirs="$SS_QT3_GENERAL_DIR/lib /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib"
1701 1701
 		test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $ss_qt_library_test_dirs"

+ 2
- 2
configure.in View File

@@ -81,7 +81,7 @@ AC_SS_HEADER([Looking for X])
81 81
 
82 82
 AC_SS_FIND_X
83 83
 AC_SS_CHECK_XSS
84
-AC_SS_HEADER([Looking for Qt])
84
+AC_SS_HEADER([Looking for TQt])
85 85
 
86 86
 SS_QT3_MAJOR_VERSION_REQUIRED="3"
87 87
 SS_QT3_MINOR_VERSION_REQUIRED="0"
@@ -101,7 +101,7 @@ SS_QT4_INCLUDE_FILE_TO_SEARCH="QtCore/QtPlugin"
101 101
 
102 102
 AC_SS_FIND_QT
103 103
 
104
-AC_SS_HEADER([Checking KDE])
104
+AC_SS_HEADER([Checking TDE])
105 105
 
106 106
 SS_KDE_GENERAL_FILE_TO_SEARCH="bin/tde-config"
107 107
 SS_KDE_INCLUDE_FILE_TO_SEARCH="tdeversion.h"

Loading…
Cancel
Save