From 364ead430e12b5cf53554c10be850fcdc2fa7b78 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 24 Sep 2018 23:43:13 +0900 Subject: [PATCH] AC_PATH_QT* -> AC_PATH_TQT* conversion Signed-off-by: Michele Calgaro --- acinclude.m4 | 18 +++++++++--------- aclocal.m4 | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 1a5bfce..693ef0f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -298,7 +298,7 @@ dnl Find the meta object compiler and the ui compiler in the PATH, dnl in $QTDIR/bin, and some more usual places dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_PATH_QT_MOC_UIC, +AC_DEFUN(AC_PATH_TQT_MOC_UIC, [ qt_bindirs="" for dir in $kde_qt_dirs; do @@ -1191,7 +1191,7 @@ dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed) dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_PATH_QT_1_3, +AC_DEFUN(AC_PATH_TQT_1_3, [ AC_REQUIRE([K_PATH_X]) AC_REQUIRE([KDE_USE_QT]) @@ -1468,7 +1468,7 @@ test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" AC_SUBST(QT_INCLUDES) AC_SUBST(QT_LDFLAGS) -AC_PATH_QT_MOC_UIC +AC_PATH_TQT_MOC_UIC KDE_CHECK_QT_JPEG @@ -1485,14 +1485,14 @@ AC_SUBST(LIB_QPE) AC_SUBST(kde_qtver) ]) -AC_DEFUN(AC_PATH_QT, +AC_DEFUN(AC_PATH_TQT, [ -AC_PATH_QT_1_3 +AC_PATH_TQT_1_3 ]) AC_DEFUN(KDE_CHECK_UIC_PLUGINS, [ -AC_REQUIRE([AC_PATH_QT_MOC_UIC]) +AC_REQUIRE([AC_PATH_TQT_MOC_UIC]) if test x$ac_uic_supports_libpath = xyes; then @@ -1575,7 +1575,7 @@ dnl AC_DEFUN(AC_BASE_PATH_KDE, [ AC_PREREQ([2.13]) -AC_REQUIRE([AC_PATH_QT])dnl +AC_REQUIRE([AC_PATH_TQT])dnl AC_REQUIRE([KDE_CHECK_LIB64]) AC_CHECK_RPATH @@ -4891,7 +4891,7 @@ fi AC_SUBST(LEXLIB) ]) -AC_DEFUN(AC_PATH_QTOPIA, +AC_DEFUN(AC_PATH_TQTOPIA, [ dnl TODO: use AC_CACHE_VAL @@ -4908,7 +4908,7 @@ AC_DEFUN(AC_PATH_QTOPIA, qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat" qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat" - AC_REQUIRE([AC_PATH_QT]) + AC_REQUIRE([AC_PATH_TQT]) AC_MSG_CHECKING([for Qtopia]) diff --git a/aclocal.m4 b/aclocal.m4 index f7c51b4..dee493e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -310,7 +310,7 @@ dnl Find the meta object compiler and the ui compiler in the PATH, dnl in $QTDIR/bin, and some more usual places dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_PATH_QT_MOC_UIC, +AC_DEFUN(AC_PATH_TQT_MOC_UIC, [ qt_bindirs="" for dir in $kde_qt_dirs; do @@ -1203,7 +1203,7 @@ dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed) dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_PATH_QT_1_3, +AC_DEFUN(AC_PATH_TQT_1_3, [ AC_REQUIRE([K_PATH_X]) AC_REQUIRE([KDE_USE_QT]) @@ -1480,7 +1480,7 @@ test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" AC_SUBST(QT_INCLUDES) AC_SUBST(QT_LDFLAGS) -AC_PATH_QT_MOC_UIC +AC_PATH_TQT_MOC_UIC KDE_CHECK_QT_JPEG @@ -1497,14 +1497,14 @@ AC_SUBST(LIB_QPE) AC_SUBST(kde_qtver) ]) -AC_DEFUN(AC_PATH_QT, +AC_DEFUN(AC_PATH_TQT, [ -AC_PATH_QT_1_3 +AC_PATH_TQT_1_3 ]) AC_DEFUN(KDE_CHECK_UIC_PLUGINS, [ -AC_REQUIRE([AC_PATH_QT_MOC_UIC]) +AC_REQUIRE([AC_PATH_TQT_MOC_UIC]) if test x$ac_uic_supports_libpath = xyes; then @@ -1587,7 +1587,7 @@ dnl AC_DEFUN(AC_BASE_PATH_KDE, [ AC_PREREQ([2.13]) -AC_REQUIRE([AC_PATH_QT])dnl +AC_REQUIRE([AC_PATH_TQT])dnl AC_REQUIRE([KDE_CHECK_LIB64]) AC_CHECK_RPATH @@ -4903,7 +4903,7 @@ fi AC_SUBST(LEXLIB) ]) -AC_DEFUN(AC_PATH_QTOPIA, +AC_DEFUN(AC_PATH_TQTOPIA, [ dnl TODO: use AC_CACHE_VAL @@ -4920,7 +4920,7 @@ AC_DEFUN(AC_PATH_QTOPIA, qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat" qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat" - AC_REQUIRE([AC_PATH_QT]) + AC_REQUIRE([AC_PATH_TQT]) AC_MSG_CHECKING([for Qtopia])