diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-10-29 18:16:16 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-01-17 13:26:05 +0100 |
| commit | 15c430b36a6f76968e3daae6e9a443f17d8ba0b9 (patch) | |
| tree | 0518b0172525643163af75a80331833124e8ae0e | |
| parent | f69d621edc7035956cbde92facc69710a4e4af4f (diff) | |
| download | kvirc-15c430b36a6f76968e3daae6e9a443f17d8ba0b9.tar.gz kvirc-15c430b36a6f76968e3daae6e9a443f17d8ba0b9.zip | |
Change default TQt library name from 'qt' to 'tqt'.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7d383aafeca23bcf7356c2c65784d9144d23f996)
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | admin/acinclude.m4.in | 6 | ||||
| -rw-r--r-- | configure.in | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 203b1b11..4a016ee3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1486,8 +1486,8 @@ AC_DEFUN([AC_SS_FIND_QT], AC_DEFUN([AC_SS_FIND_QT3_NAME], [ - AC_MSG_CHECKING([for the Qt library name]) - AC_ARG_WITH(qt-name,[ --with-qt-name=NAME Use NAME instead of \"qt\" as Qt library name],SS_QTLIB_NAME="$withval",SS_QTLIB_NAME="qt") + AC_MSG_CHECKING([for the TQt library name]) + AC_ARG_WITH(qt-name,[ --with-qt-name=NAME Use NAME instead of \"tqt\" as TQt library name],SS_QTLIB_NAME="$withval",SS_QTLIB_NAME="tqt") AC_MSG_RESULT("$SS_QTLIB_NAME") ]) @@ -1695,7 +1695,7 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR], [ 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") if test "$SS_QT3_LIBDIR" = "NOTGIVEN"; then - AC_MSG_CHECKING([for the Qt library]) + AC_MSG_CHECKING([for the TQt library]) 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" test -n "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $ss_qt_library_test_dirs" diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index 773d0ab2..186e6e98 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -1486,8 +1486,8 @@ AC_DEFUN([AC_SS_FIND_QT], AC_DEFUN([AC_SS_FIND_QT3_NAME], [ - AC_MSG_CHECKING([for the Qt library name]) - AC_ARG_WITH(qt-name,[ --with-qt-name=NAME Use NAME instead of \"qt\" as Qt library name],SS_QTLIB_NAME="$withval",SS_QTLIB_NAME="qt") + AC_MSG_CHECKING([for the TQt library name]) + AC_ARG_WITH(qt-name,[ --with-qt-name=NAME Use NAME instead of \"tqt\" as TQt library name],SS_QTLIB_NAME="$withval",SS_QTLIB_NAME="tqt") AC_MSG_RESULT("$SS_QTLIB_NAME") ]) @@ -1695,7 +1695,7 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR], [ 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") if test "$SS_QT3_LIBDIR" = "NOTGIVEN"; then - AC_MSG_CHECKING([for the Qt library]) + AC_MSG_CHECKING([for the TQt library]) 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" test -n "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $ss_qt_library_test_dirs" diff --git a/configure.in b/configure.in index c6fa3b78..874fcbde 100644 --- a/configure.in +++ b/configure.in @@ -81,7 +81,7 @@ AC_SS_HEADER([Looking for X]) AC_SS_FIND_X AC_SS_CHECK_XSS -AC_SS_HEADER([Looking for Qt]) +AC_SS_HEADER([Looking for TQt]) SS_QT3_MAJOR_VERSION_REQUIRED="3" SS_QT3_MINOR_VERSION_REQUIRED="0" @@ -101,7 +101,7 @@ SS_QT4_INCLUDE_FILE_TO_SEARCH="QtCore/QtPlugin" AC_SS_FIND_QT -AC_SS_HEADER([Checking KDE]) +AC_SS_HEADER([Checking TDE]) SS_KDE_GENERAL_FILE_TO_SEARCH="bin/tde-config" SS_KDE_INCLUDE_FILE_TO_SEARCH="tdeversion.h" |