Browse Source

AC_PATH_QT* -> AC_PATH_TQT* conversion

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 1 year ago
parent
commit
af774cb9cf
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 18 additions and 18 deletions
  1. 9
    9
      acinclude.m4
  2. 9
    9
      aclocal.m4

+ 9
- 9
acinclude.m4 View File

@@ -299,7 +299,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],
[
AC_REQUIRE([KDE_CHECK_PERL])
qt_bindirs=""
@@ -1299,7 +1299,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])
@@ -1582,7 +1582,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

@@ -1605,14 +1605,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

@@ -1762,7 +1762,7 @@ dnl
AC_DEFUN([AC_BASE_PATH_KDE],
[
AC_REQUIRE([KDE_CHECK_STL])
AC_REQUIRE([AC_PATH_QT])dnl
AC_REQUIRE([AC_PATH_TQT])dnl
AC_REQUIRE([KDE_CHECK_LIB64])

AC_CHECK_RPATH
@@ -5213,7 +5213,7 @@ fi
AC_SUBST(LEXLIB)
])

AC_DEFUN([AC_PATH_QTOPIA],
AC_DEFUN([AC_PATH_TQTOPIA],
[
dnl TODO: use AC_CACHE_VAL

@@ -5230,7 +5230,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])


+ 9
- 9
aclocal.m4 View File

@@ -311,7 +311,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],
[
AC_REQUIRE([KDE_CHECK_PERL])
qt_bindirs=""
@@ -1311,7 +1311,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])
@@ -1594,7 +1594,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

@@ -1617,14 +1617,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

@@ -1774,7 +1774,7 @@ dnl
AC_DEFUN([AC_BASE_PATH_KDE],
[
AC_REQUIRE([KDE_CHECK_STL])
AC_REQUIRE([AC_PATH_QT])dnl
AC_REQUIRE([AC_PATH_TQT])dnl
AC_REQUIRE([KDE_CHECK_LIB64])

AC_CHECK_RPATH
@@ -5225,7 +5225,7 @@ fi
AC_SUBST(LEXLIB)
])

AC_DEFUN([AC_PATH_QTOPIA],
AC_DEFUN([AC_PATH_TQTOPIA],
[
dnl TODO: use AC_CACHE_VAL

@@ -5242,7 +5242,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])


Loading…
Cancel
Save