|
|
@ -314,7 +314,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],
|
|
|
|
[
|
|
|
|
[
|
|
|
|
AC_REQUIRE([KDE_CHECK_PERL])
|
|
|
|
AC_REQUIRE([KDE_CHECK_PERL])
|
|
|
|
qt_bindirs=""
|
|
|
|
qt_bindirs=""
|
|
|
@ -1449,7 +1449,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])
|
|
|
@ -1789,7 +1789,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_TQT
|
|
|
|
KDE_CHECK_TQT
|
|
|
|
|
|
|
|
|
|
|
@ -1814,14 +1814,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
|
|
|
|
|
|
|
|
|
|
|
@ -1979,7 +1979,7 @@ dnl
|
|
|
|
AC_DEFUN([AC_BASE_PATH_KDE],
|
|
|
|
AC_DEFUN([AC_BASE_PATH_KDE],
|
|
|
|
[
|
|
|
|
[
|
|
|
|
AC_REQUIRE([KDE_CHECK_STL])
|
|
|
|
AC_REQUIRE([KDE_CHECK_STL])
|
|
|
|
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
|
|
|
@ -3764,7 +3764,7 @@ AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
|
|
|
|
|
|
|
|
|
|
|
|
AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
|
|
|
|
AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
|
|
|
|
[
|
|
|
|
[
|
|
|
|
AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
|
|
|
|
AC_BEFORE([AC_PATH_TQT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
|
|
|
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([grepping for visibility push/pop in headers])
|
|
|
|
AC_MSG_CHECKING([grepping for visibility push/pop in headers])
|
|
|
|
|
|
|
|
|
|
|
@ -5921,7 +5921,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
|
|
|
|
|
|
|
|
|
|
|
@ -5938,7 +5938,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])
|
|
|
|
|
|
|
|
|
|
|
|