AC_PATH_QT* -> AC_PATH_TQT* conversion

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/5/head
Michele Calgaro 6 years ago
parent 4d2fd58a40
commit 364ead430e
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -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 in $QTDIR/bin, and some more usual places
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl dnl
AC_DEFUN(AC_PATH_QT_MOC_UIC, AC_DEFUN(AC_PATH_TQT_MOC_UIC,
[ [
qt_bindirs="" qt_bindirs=""
for dir in $kde_qt_dirs; do 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 and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl dnl
AC_DEFUN(AC_PATH_QT_1_3, AC_DEFUN(AC_PATH_TQT_1_3,
[ [
AC_REQUIRE([K_PATH_X]) AC_REQUIRE([K_PATH_X])
AC_REQUIRE([KDE_USE_QT]) 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_INCLUDES)
AC_SUBST(QT_LDFLAGS) AC_SUBST(QT_LDFLAGS)
AC_PATH_QT_MOC_UIC AC_PATH_TQT_MOC_UIC
KDE_CHECK_QT_JPEG KDE_CHECK_QT_JPEG
@ -1485,14 +1485,14 @@ AC_SUBST(LIB_QPE)
AC_SUBST(kde_qtver) 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_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 if test x$ac_uic_supports_libpath = xyes; then
@ -1575,7 +1575,7 @@ dnl
AC_DEFUN(AC_BASE_PATH_KDE, AC_DEFUN(AC_BASE_PATH_KDE,
[ [
AC_PREREQ([2.13]) AC_PREREQ([2.13])
AC_REQUIRE([AC_PATH_QT])dnl AC_REQUIRE([AC_PATH_TQT])dnl
AC_REQUIRE([KDE_CHECK_LIB64]) AC_REQUIRE([KDE_CHECK_LIB64])
AC_CHECK_RPATH AC_CHECK_RPATH
@ -4891,7 +4891,7 @@ fi
AC_SUBST(LEXLIB) AC_SUBST(LEXLIB)
]) ])
AC_DEFUN(AC_PATH_QTOPIA, AC_DEFUN(AC_PATH_TQTOPIA,
[ [
dnl TODO: use AC_CACHE_VAL 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_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
qtopia_minverstr="$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]) AC_MSG_CHECKING([for Qtopia])

18
aclocal.m4 vendored

@ -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 in $QTDIR/bin, and some more usual places
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl dnl
AC_DEFUN(AC_PATH_QT_MOC_UIC, AC_DEFUN(AC_PATH_TQT_MOC_UIC,
[ [
qt_bindirs="" qt_bindirs=""
for dir in $kde_qt_dirs; do 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 and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl dnl
AC_DEFUN(AC_PATH_QT_1_3, AC_DEFUN(AC_PATH_TQT_1_3,
[ [
AC_REQUIRE([K_PATH_X]) AC_REQUIRE([K_PATH_X])
AC_REQUIRE([KDE_USE_QT]) 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_INCLUDES)
AC_SUBST(QT_LDFLAGS) AC_SUBST(QT_LDFLAGS)
AC_PATH_QT_MOC_UIC AC_PATH_TQT_MOC_UIC
KDE_CHECK_QT_JPEG KDE_CHECK_QT_JPEG
@ -1497,14 +1497,14 @@ AC_SUBST(LIB_QPE)
AC_SUBST(kde_qtver) 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_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 if test x$ac_uic_supports_libpath = xyes; then
@ -1587,7 +1587,7 @@ dnl
AC_DEFUN(AC_BASE_PATH_KDE, AC_DEFUN(AC_BASE_PATH_KDE,
[ [
AC_PREREQ([2.13]) AC_PREREQ([2.13])
AC_REQUIRE([AC_PATH_QT])dnl AC_REQUIRE([AC_PATH_TQT])dnl
AC_REQUIRE([KDE_CHECK_LIB64]) AC_REQUIRE([KDE_CHECK_LIB64])
AC_CHECK_RPATH AC_CHECK_RPATH
@ -4903,7 +4903,7 @@ fi
AC_SUBST(LEXLIB) AC_SUBST(LEXLIB)
]) ])
AC_DEFUN(AC_PATH_QTOPIA, AC_DEFUN(AC_PATH_TQTOPIA,
[ [
dnl TODO: use AC_CACHE_VAL 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_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
qtopia_minverstr="$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]) AC_MSG_CHECKING([for Qtopia])

Loading…
Cancel
Save