diff options
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 564 |
1 files changed, 282 insertions, 282 deletions
@@ -53,7 +53,7 @@ dnl Internal subroutine of AC_PATH_X. dnl Set ac_x_includes and/or ac_x_libraries. AC_DEFUN(KDE_PATH_X_DIRECT, [ -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([KDE_CHECK_LIB64]) if test "$ac_x_includes" = NO; then # Guess where to find include files, by looking for this one X11 .h file. @@ -250,22 +250,22 @@ AC_DEFUN(KDE_FIND_PATH, fi ]) -AC_DEFUN(KDE_MOC_ERROR_MESSAGE, +AC_DEFUN(KDE_TQMOC_ERROR_MESSAGE, [ - AC_MSG_ERROR([No Qt meta object compiler (moc) found! -Please check whether you installed Qt correctly. + AC_MSG_ERROR([No TQt meta object compiler (moc) found! +Please check whether you installed TQt correctly. You need to have a running moc binary. configure tried to run $ac_cv_path_moc and the test didn't succeed. If configure shouldn't have tried this one, set -the environment variable MOC to the right one before running +the environment variable TQMOC to the right one before running configure. ]) ]) AC_DEFUN(KDE_UIC_ERROR_MESSAGE, [ - AC_MSG_WARN([No Qt ui compiler (uic) found! -Please check whether you installed Qt correctly. + AC_MSG_WARN([No TQt ui compiler (uic) found! +Please check whether you installed TQt correctly. You need to have a running uic binary. configure tried to run $ac_cv_path_uic and the test didn't succeed. If configure shouldn't have tried this one, set @@ -307,10 +307,10 @@ EOT dnl ------------------------------------------------------------------------ dnl Find the meta object compiler and the ui compiler in the PATH, -dnl in $QTDIR/bin, and some more usual places +dnl in $TQTDIR/bin, and some more usual places dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_PATH_QT_MOC_UIC, +AC_DEFUN(AC_PATH_TQT_TQMOC_UIC, [ qt_bindirs="" for dir in $kde_qt_dirs; do @@ -321,7 +321,7 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC, qt_bindirs="$ac_qt_bindir $qt_bindirs" fi - KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) + KDE_FIND_PATH(moc, TQMOC, [$qt_bindirs], [KDE_TQMOC_ERROR_MESSAGE]) if test -z "$UIC_NOT_NEEDED"; then KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""]) if test -z "$UIC_PATH" ; then @@ -343,7 +343,7 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC, UIC="echo uic not available: " fi - AC_SUBST(MOC) + AC_SUBST(TQMOC) AC_SUBST(UIC) UIC_TR="i18n" @@ -385,7 +385,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile TQt and kdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi @@ -610,7 +610,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, AC_DEFUN(AC_CREATE_KFSSTND, [ -AC_REQUIRE([AC_CHECK_RPATH]) +AC_RETQUIRE([AC_CHECK_RPATH]) AC_MSG_CHECKING([for KDE paths]) kde_result="" @@ -708,7 +708,7 @@ support]) ])) AC_SUBST(LIBCRYPT) if test $kde_have_crypt = yes; then - AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function]) + AC_DEFINE_UNTQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function]) fi AC_CHECK_SOCKLEN_T AC_LANG_C @@ -820,19 +820,19 @@ dnl ------------------------------------------------------------------------ dnl AC_DEFUN(K_PATH_X, [ -AC_REQUIRE([KDE_MISC_TESTS])dnl -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([KDE_MISC_TESTS])dnl +AC_RETQUIRE([KDE_CHECK_LIB64]) AC_ARG_ENABLE( embedded, - [ --enable-embedded link to Qt-embedded, don't use X], + [ --enable-embedded link to TQt-embedded, don't use X], kde_use_qt_emb=$enableval, kde_use_qt_emb=no ) AC_ARG_ENABLE( qtopia, - [ --enable-qtopia link to Qt-embedded, link to the Qtopia Environment], + [ --enable-qtopia link to TQt-embedded, link to the TQtopia Environment], kde_use_qt_emb_palm=$enableval, kde_use_qt_emb_palm=no ) @@ -994,13 +994,13 @@ them either.]) fi LIB_XEXT="-lXext" -QTE_NORTTI="" +TQTE_NORTTI="" else dnl We're using QT Embedded - CPPFLAGS=-DQWS + CPPFLAGS=-DTQWS CXXFLAGS="$CXXFLAGS -fno-rtti" - QTE_NORTTI="-fno-rtti -DQWS" + TQTE_NORTTI="-fno-rtti -DTQWS" X_PRE_LIBS="" LIB_X11="" LIB_XEXT="" @@ -1017,7 +1017,7 @@ else AC_SUBST(x_includes) AC_SUBST(x_libraries) fi -AC_SUBST(QTE_NORTTI) +AC_SUBST(TQTE_NORTTI) AC_SUBST(LIB_XEXT) @@ -1025,9 +1025,9 @@ AC_LANG_RESTORE ]) -AC_DEFUN(KDE_PRINT_QT_PROGRAM, +AC_DEFUN(KDE_PRINT_TQT_PROGRAM, [ -AC_REQUIRE([KDE_USE_QT]) +AC_RETQUIRE([KDE_USE_QT]) cat > conftest.$ac_ext <<EOF #include "confdefs.h" #include <qglobal.h> @@ -1042,7 +1042,7 @@ EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF -#if QT_VERSION < 210 +#if TQT_VERSION < 210 #error 1 #endif EOF @@ -1066,20 +1066,20 @@ int main() { EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext <<EOF - QStringList *t = new QStringList(); - Q_UNUSED(t); + TQStringList *t = new TQStringList(); + TTQ_UNUSED(t); EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF - QString s; + TQString s; s.setLatin1("Elvis is alive", 14); EOF fi fi if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF - (void)QStyleFactory::create(QString::null); - QCursor c(Qt::WhatsThisCursor); + (void)TQStyleFactory::create(TQString::null); + TQCursor c(TQt::WhatsThisCursor); EOF fi cat >> conftest.$ac_ext <<EOF @@ -1091,7 +1091,7 @@ EOF AC_DEFUN(KDE_USE_QT, [ if test -z "$1"; then - # Current default Qt version: 3.1 + # Current default TQt version: 3.1 kde_qtver=3 kde_qtsubver=1 else @@ -1109,16 +1109,16 @@ fi if test -z "$2"; then if test "$kde_qtver" = "2"; then if test $kde_qtsubver -gt 0; then - kde_qt_minversion=">= Qt 2.2.2" + kde_qt_minversion=">= TQt 2.2.2" else - kde_qt_minversion=">= Qt 2.0.2" + kde_qt_minversion=">= TQt 2.0.2" fi fi if test "$kde_qtver" = "3"; then if test $kde_qtsubver -gt 0; then - kde_qt_minversion=">= Qt 3.1 (20021021)" + kde_qt_minversion=">= TQt 3.1 (20021021)" else - kde_qt_minversion=">= Qt 3.0" + kde_qt_minversion=">= TQt 3.0" fi fi if test "$kde_qtver" = "1"; then @@ -1131,40 +1131,40 @@ fi if test -z "$3"; then if test $kde_qtver = 3; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 0x030100" + kde_qt_verstring="TQT_VERSION >= 0x030100" else - kde_qt_verstring="QT_VERSION >= 300" + kde_qt_verstring="TQT_VERSION >= 300" fi fi if test $kde_qtver = 2; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 222" + kde_qt_verstring="TQT_VERSION >= 222" else - kde_qt_verstring="QT_VERSION >= 200" + kde_qt_verstring="TQT_VERSION >= 200" fi fi if test $kde_qtver = 1; then - kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200" + kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200" fi else kde_qt_verstring=$3 fi if test $kde_qtver = 3; then - kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" + kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" fi if test $kde_qtver = 2; then - kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt" + kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt" fi if test $kde_qtver = 1; then - kde_qt_dirs="$QTDIR /usr/lib/qt" + kde_qt_dirs="$TQTDIR /usr/lib/qt" fi ]) -AC_DEFUN(KDE_CHECK_QT_DIRECT, +AC_DEFUN(KDE_CHECK_TQT_DIRECT, [ -AC_REQUIRE([KDE_USE_QT]) -AC_MSG_CHECKING([if Qt compiles without flags]) +AC_RETQUIRE([KDE_USE_QT]) +AC_MSG_CHECKING([if TQt compiles without flags]) AC_CACHE_VAL(kde_cv_qt_direct, [ AC_LANG_SAVE @@ -1187,7 +1187,7 @@ export LD_LIBRARY_PATH LIBRARY_PATH= export LIBRARY_PATH -KDE_PRINT_QT_PROGRAM +KDE_PRINT_TQT_PROGRAM if AC_TRY_EVAL(ac_link) && test -s conftest; then kde_cv_qt_direct="yes" @@ -1219,24 +1219,24 @@ fi ]) dnl ------------------------------------------------------------------------ -dnl Try to find the Qt headers and libraries. -dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed) -dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) +dnl Try to find the TQt headers and libraries. +dnl $(TQT_LDFLAGS) will be -Lqtliblocation (if needed) +dnl and $(TQT_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]) -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([K_PATH_X]) +AC_RETQUIRE([KDE_USE_QT]) +AC_RETQUIRE([KDE_CHECK_LIB64]) dnl ------------------------------------------------------------------------ -dnl Add configure flag to enable linking to MT version of Qt library. +dnl Add configure flag to enable linking to MT version of TQt library. dnl ------------------------------------------------------------------------ AC_ARG_ENABLE( mt, - [ --disable-mt link to non-threaded Qt (deprecated)], + [ --disable-mt link to non-threaded TQt (deprecated)], kde_use_qt_mt=$enableval, [ if test $kde_qtver = 3; then @@ -1247,7 +1247,7 @@ AC_ARG_ENABLE( ] ) -USING_QT_MT="" +USING_TQT_MT="" dnl ------------------------------------------------------------------------ dnl If we not get --disable-qt-mt then adjust some vars for the host. @@ -1258,7 +1258,7 @@ KDE_MT_LIBS= if test "x$kde_use_qt_mt" = "xyes"; then KDE_CHECK_THREADING if test "x$kde_use_threading" = "xyes"; then - CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS" + CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS" KDE_MT_LDFLAGS="$USE_THREADS" KDE_MT_LIBS="$LIBPTHREAD" else @@ -1271,19 +1271,19 @@ AC_SUBST(KDE_MT_LIBS) kde_qt_was_given=yes dnl ------------------------------------------------------------------------ -dnl If we haven't been told how to link to Qt, we work it out for ourselves. +dnl If we haven't been told how to link to TQt, we work it out for ourselves. dnl ------------------------------------------------------------------------ -if test -z "$LIBQT_GLOB"; then +if test -z "$LIBTQT_GLOB"; then if test "x$kde_use_qt_emb" = "xyes"; then - LIBQT_GLOB="libqte.*" + LIBTQT_GLOB="libqte.*" else - LIBQT_GLOB="libqt.*" + LIBTQT_GLOB="libqt.*" fi fi if test -z "$LIBQT"; then dnl ------------------------------------------------------------ -dnl If we got --enable-embedded then adjust the Qt library name. +dnl If we got --enable-embedded then adjust the TQt library name. dnl ------------------------------------------------------------ if test "x$kde_use_qt_emb" = "xyes"; then qtlib="qte" @@ -1297,23 +1297,23 @@ else kde_lib_qt_set=yes fi -if test -z "$LIBQPE"; then +if test -z "$LIBTQPE"; then dnl ------------------------------------------------------------ dnl If we got --enable-palmtop then add -lqpe to the link line dnl ------------------------------------------------------------ if test "x$kde_use_qt_emb" = "xyes"; then if test "x$kde_use_qt_emb_palm" = "xyes"; then - LIB_QPE="-lqpe" + LIB_TQPE="-lqpe" else - LIB_QPE="" + LIB_TQPE="" fi else - LIB_QPE="" + LIB_TQPE="" fi fi dnl ------------------------------------------------------------------------ -dnl If we got --enable-qt-mt then adjust the Qt library name for the host. +dnl If we got --enable-qt-mt then adjust the TQt library name for the host. dnl ------------------------------------------------------------------------ if test "x$kde_use_qt_mt" = "xyes"; then @@ -1324,26 +1324,26 @@ if test "x$kde_use_qt_mt" = "xyes"; then LIBQT="$qtlib-mt" kde_int_qt="$qtlib-mt" fi - LIBQT_GLOB="lib$qtlib-mt.*" - USING_QT_MT="using -mt" + LIBTQT_GLOB="lib$qtlib-mt.*" + USING_TQT_MT="using -mt" else LIBQT="-l$qtlib" fi if test $kde_qtver != 1; then - AC_REQUIRE([AC_FIND_PNG]) - AC_REQUIRE([AC_FIND_JPEG]) + AC_RETQUIRE([AC_FIND_PNG]) + AC_RETQUIRE([AC_FIND_JPEG]) LIBQT="$LIBQT $LIBPNG $LIBJPEG" fi if test $kde_qtver = 3; then - AC_REQUIRE([KDE_CHECK_LIBDL]) + AC_RETQUIRE([KDE_CHECK_LIBDL]) LIBQT="$LIBQT $LIBDL" kde_int_qt="$kde_int_qt $LIBDL" fi -AC_MSG_CHECKING([for Qt]) +AC_MSG_CHECKING([for TQt]) if test "x$kde_use_qt_emb" != "xyes"; then LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" @@ -1352,14 +1352,14 @@ ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO qt_libraries="" qt_includes="" AC_ARG_WITH(qt-dir, - [ --with-qt-dir=DIR where the root of Qt is installed ], + [ --with-qt-dir=DIR where the root of TQt is installed ], [ ac_qt_includes="$withval"/include ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_bindir="$withval"/bin ]) AC_ARG_WITH(qt-includes, - [ --with-qt-includes=DIR where the Qt includes are. ], + [ --with-qt-includes=DIR where the TQt includes are. ], [ ac_qt_includes="$withval" ]) @@ -1367,19 +1367,19 @@ AC_ARG_WITH(qt-includes, kde_qt_libs_given=no AC_ARG_WITH(qt-libraries, - [ --with-qt-libraries=DIR where the Qt library is installed.], + [ --with-qt-libraries=DIR where the TQt library is installed.], [ ac_qt_libraries="$withval" kde_qt_libs_given=yes ]) AC_CACHE_VAL(ac_cv_have_qt, -[#try to guess Qt locations +[#try to guess TQt locations qt_incdirs="" for dir in $kde_qt_dirs; do qt_incdirs="$qt_incdirs $dir/include $dir" done -qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 $x_includes" +qt_incdirs="$TQTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 $x_includes" if test ! "$ac_qt_includes" = "NO"; then qt_incdirs="$ac_qt_includes $qt_incdirs" fi @@ -1397,15 +1397,15 @@ qt_libdirs="" for dir in $kde_qt_dirs; do qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" done -qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" +qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then qt_libdir=$ac_qt_libraries else qt_libdirs="$ac_qt_libraries $qt_libdirs" - # if the Qt was given, the chance is too big that libqt.* doesn't exist + # if the TQt was given, the chance is too big that libqt.* doesn't exist qt_libdir=NONE for dir in $qt_libdirs; do - try="ls -1 $dir/${LIBQT_GLOB}" + try="ls -1 $dir/${LIBTQT_GLOB}" if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi done fi @@ -1423,7 +1423,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" LIBS="$LIBS $LIBQT $KDE_MT_LIBS" -KDE_PRINT_QT_PROGRAM +KDE_PRINT_TQT_PROGRAM if AC_TRY_EVAL(ac_link) && test -s conftest; then rm -f conftest* @@ -1451,14 +1451,14 @@ if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then else if test "x$kde_use_qt_mt" = "xyes"; then missing_qt_mt=" -Make sure that you have compiled Qt with thread support!" +Make sure that you have compiled TQt with thread support!" ac_qt_notfound="(library $qtlib-mt)"; else ac_qt_notfound="(library $qtlib)"; fi fi - AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! + AC_MSG_ERROR([TQt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! For more details about this problem, look at the end of config.log.$missing_qt_mt]) else have_qt="yes" @@ -1472,39 +1472,39 @@ if test "$have_qt" != yes; then else ac_cv_have_qt="have_qt=yes \ ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries" - AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT]) + AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_TQT_MT]) qt_libraries="$ac_qt_libraries" qt_includes="$ac_qt_includes" fi if test ! "$kde_qt_libs_given" = "yes"; then -KDE_CHECK_QT_DIRECT(qt_libraries= ,[]) +KDE_CHECK_TQT_DIRECT(qt_libraries= ,[]) fi AC_SUBST(qt_libraries) AC_SUBST(qt_includes) if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then - QT_INCLUDES="" + TQT_INCLUDES="" else - QT_INCLUDES="-I$qt_includes" - all_includes="$QT_INCLUDES $all_includes" + TQT_INCLUDES="-I$qt_includes" + all_includes="$TQT_INCLUDES $all_includes" fi if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then - QT_LDFLAGS="" + TQT_LDFLAGS="" else - QT_LDFLAGS="-L$qt_libraries" - all_libraries="$all_libraries $QT_LDFLAGS" + TQT_LDFLAGS="-L$qt_libraries" + all_libraries="$all_libraries $TQT_LDFLAGS" fi 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_SUBST(TQT_INCLUDES) +AC_SUBST(TQT_LDFLAGS) +AC_PATH_TQT_TQMOC_UIC -KDE_CHECK_QT_JPEG +KDE_CHECK_TQT_JPEG if test "x$kde_use_qt_emb" != "xyes"; then LIB_QT="$kde_int_qt $LIBJPEG_QT "' $(LIBRESOLV) $(LIBPNG) $(X_PRE_LIBS) -lXext $(LIB_X11) $(LIBSM)' @@ -1514,19 +1514,19 @@ fi test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS" AC_SUBST(LIB_QT) -AC_SUBST(LIB_QPE) +AC_SUBST(LIB_TQPE) AC_SUBST(kde_qtver) ]) AC_DEFUN(AC_PATH_QT, [ -AC_PATH_QT_1_3 +AC_PATH_TQT_1_3 ]) AC_DEFUN(KDE_CHECK_UIC_PLUGINS, [ -AC_REQUIRE([AC_PATH_QT_MOC_UIC]) +AC_RETQUIRE([AC_PATH_TQT_TQMOC_UIC]) if test x$ac_uic_supports_libpath = xyes; then @@ -1536,7 +1536,7 @@ AC_CACHE_VAL(kde_cv_uic_plugins, cat > actest.ui << EOF <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>NewConnectionDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <widget class="KLineEdit"> <property name="name"> <cstring>testInput</cstring> @@ -1636,8 +1636,8 @@ dnl AC_DEFUN(AC_BASE_PATH_KDE, [ AC_PREREQ([2.13]) -AC_REQUIRE([AC_PATH_QT])dnl -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([AC_PATH_QT])dnl +AC_RETQUIRE([KDE_CHECK_LIB64]) AC_CHECK_RPATH AC_MSG_CHECKING([for KDE]) @@ -1774,7 +1774,7 @@ fi AC_SUBST(KDE_LDFLAGS) AC_SUBST(KDE_INCLUDES) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) all_libraries="$all_libraries $USER_LDFLAGS" all_includes="$all_includes $USER_INCLUDES" @@ -1898,7 +1898,7 @@ For more details about this problem, look at the end of config.log.]) AC_LANG_RESTORE ]) -AC_DEFUN(KDE_CHECK_KDEQTADDON, +AC_DEFUN(KDE_CHECK_KDETQTADDON, [ AC_MSG_CHECKING(for kde-qt-addon) AC_CACHE_VAL(kde_cv_have_kdeqtaddon, @@ -1915,7 +1915,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, #include <qdom.h> ], [ - QDomDocument doc; + TQDomDocument doc; ], kde_cv_have_kdeqtaddon=yes, kde_cv_have_kdeqtaddon=no @@ -1936,13 +1936,13 @@ fi AC_DEFUN(KDE_CHECK_KIMGIO, [ - AC_REQUIRE([AC_BASE_PATH_KDE]) - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - AC_REQUIRE([AC_FIND_TIFF]) - AC_REQUIRE([AC_FIND_JPEG]) - AC_REQUIRE([AC_FIND_PNG]) - AC_REQUIRE([AC_FIND_JASPER]) - AC_REQUIRE([KDE_CREATE_LIBS_ALIASES]) + AC_RETQUIRE([AC_BASE_PATH_KDE]) + AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) + AC_RETQUIRE([AC_FIND_TIFF]) + AC_RETQUIRE([AC_FIND_JPEG]) + AC_RETQUIRE([AC_FIND_PNG]) + AC_RETQUIRE([AC_FIND_JASPER]) + AC_RETQUIRE([KDE_CREATE_LIBS_ALIASES]) if test "$1" = "existance"; then AC_LANG_SAVE @@ -1967,9 +1967,9 @@ AC_DEFUN(KDE_CHECK_KIMGIO, AC_DEFUN(KDE_CREATE_LIBS_ALIASES, [ - AC_REQUIRE([KDE_MISC_TESTS]) - AC_REQUIRE([KDE_CHECK_LIBDL]) - AC_REQUIRE([K_PATH_X]) + AC_RETQUIRE([KDE_MISC_TESTS]) + AC_RETQUIRE([KDE_CHECK_LIBDL]) + AC_RETQUIRE([K_PATH_X]) if test $kde_qtver = 3; then AC_SUBST(LIB_KDECORE, "-lkdecore") @@ -2341,7 +2341,7 @@ LIBS="$ac_save_LIBS" ])dnl if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) + AC_DEFINE_UNTQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) fi @@ -2412,7 +2412,7 @@ dnl continue with a warning (the user will get no jpeg support in khtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then - AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg]) + AC_DEFINE_UNTQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg]) else if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then AC_MSG_WARN([ @@ -2442,10 +2442,10 @@ AH_VERBATIM(_AC_CHECK_JPEG, ]) ]) -AC_DEFUN(KDE_CHECK_QT_JPEG, +AC_DEFUN(KDE_CHECK_TQT_JPEG, [ if test -n "$LIBJPEG"; then -AC_MSG_CHECKING([if Qt needs $LIBJPEG]) +AC_MSG_CHECKING([if TQt needs $LIBJPEG]) AC_CACHE_VAL(kde_cv_qt_jpeg, [ AC_LANG_SAVE @@ -2460,7 +2460,7 @@ AC_TRY_LINK( [ int argc; char** argv; - QApplication app(argc, argv);], + TQApplication app(argc, argv);], eval "kde_cv_qt_jpeg=no", eval "kde_cv_qt_jpeg=yes") LIBS="$ac_save_LIBS" @@ -2481,7 +2481,7 @@ fi AC_DEFUN(AC_FIND_ZLIB, [ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) AC_MSG_CHECKING([for libz]) AC_CACHE_VAL(ac_cv_lib_z, [ @@ -2501,7 +2501,7 @@ LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" ])dnl if test ! "$ac_cv_lib_z" = no; then - AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz]) + AC_DEFINE_UNTQUOTED(HAVE_LIBZ, 1, [Define if you have libz]) LIBZ="$ac_cv_lib_z" AC_SUBST(LIBZ) AC_MSG_RESULT($ac_cv_lib_z) @@ -2552,7 +2552,7 @@ if test "$kde_cv_libtiff_$1" = "no"; then else LIBTIFF="$kde_cv_libtiff_$1" AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff]) + AC_DEFINE_UNTQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff]) $2 fi @@ -2560,10 +2560,10 @@ fi AC_DEFUN(AC_FIND_TIFF, [ -AC_REQUIRE([K_PATH_X]) -AC_REQUIRE([AC_FIND_ZLIB]) -AC_REQUIRE([AC_FIND_JPEG]) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([K_PATH_X]) +AC_RETQUIRE([AC_FIND_ZLIB]) +AC_RETQUIRE([AC_FIND_JPEG]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) KDE_TRY_TIFFLIB(tiff, [], KDE_TRY_TIFFLIB(tiff34)) @@ -2574,8 +2574,8 @@ AC_SUBST(LIBTIFF) AC_DEFUN(AC_FIND_PNG, [ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_REQUIRE([AC_FIND_ZLIB]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([AC_FIND_ZLIB]) AC_MSG_CHECKING([for libpng]) AC_CACHE_VAL(ac_cv_lib_png, [ @@ -2604,7 +2604,7 @@ LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" ])dnl if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then - AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng]) + AC_DEFINE_UNTQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng]) LIBPNG="$ac_cv_lib_png" AC_SUBST(LIBPNG) AC_MSG_RESULT($ac_cv_lib_png) @@ -2618,8 +2618,8 @@ fi AC_DEFUN(AC_FIND_JASPER, [ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_REQUIRE([AC_FIND_JPEG]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([AC_FIND_JPEG]) AC_MSG_CHECKING([for jasper 1.600]) AC_CACHE_VAL(ac_cv_jasper, [ @@ -2642,7 +2642,7 @@ LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" ])dnl if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then - AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper]) + AC_DEFINE_UNTQUOTED(HAVE_JASPER, 1, [Define if you have jasper]) LIB_JASPER="$ac_cv_jasper" AC_MSG_RESULT($ac_cv_jasper) else @@ -2654,7 +2654,7 @@ AC_SUBST(LIB_JASPER) AC_DEFUN(AC_CHECK_BOOL, [ - AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) + AC_DEFINE_UNTQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) ]) AC_DEFUN(AC_CHECK_GNU_EXTENSIONS, @@ -2681,7 +2681,7 @@ fi AC_MSG_RESULT($ac_cv_gnu_extensions) if test "$ac_cv_gnu_extensions" = "yes"; then - AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions]) + AC_DEFINE_UNTQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions]) fi ]) @@ -2901,7 +2901,7 @@ AC_DEFUN(AC_CHECK_COMPILERS, fi if test "$CXX" = "KCC"; then dnl unfortunately we currently cannot disable exception support in KCC - dnl because doing so is binary incompatible and Qt by default links with exceptions :-( + dnl because doing so is binary incompatible and TQt by default links with exceptions :-( dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"]) dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= ) @@ -2971,7 +2971,7 @@ AC_DEFUN(AC_CHECK_COMPILERS, KDE_CHECK_CLOSURE KDE_CHECK_NMCHECK - ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), []) + ifdef([AM_DEPENDENCIES], AC_RETQUIRE([KDE_ADD_DEPENDENCIES]), []) ]) AC_DEFUN(KDE_ADD_DEPENDENCIES, @@ -2983,12 +2983,12 @@ AC_DEFUN(KDE_ADD_DEPENDENCIES, dnl just a wrapper to clean up configure.in AC_DEFUN(KDE_PROG_LIBTOOL, [ -AC_REQUIRE([AC_CHECK_COMPILERS]) -AC_REQUIRE([AC_ENABLE_SHARED]) -AC_REQUIRE([AC_ENABLE_STATIC]) +AC_RETQUIRE([AC_CHECK_COMPILERS]) +AC_RETQUIRE([AC_ENABLE_SHARED]) +AC_RETQUIRE([AC_ENABLE_STATIC]) -AC_REQUIRE([AC_LIBTOOL_DLOPEN]) -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([AC_LIBTOOL_DLOPEN]) +AC_RETQUIRE([KDE_CHECK_LIB64]) AC_LANG_SAVE AC_LANG_C @@ -3038,7 +3038,7 @@ AC_DEFUN(KDE_CHECK_LIB64, libdir="$libdir${kdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories) + AC_DEFINE_UNTQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories) AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) fi ]) @@ -3119,10 +3119,10 @@ getsockname(0,(struct sockaddr*)0, &a); AC_MSG_RESULT($ac_cv_socklen_t) if test "$ac_cv_socklen_t" != "socklen_t"; then - AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t, + AC_DEFINE_UNTQUOTED(socklen_t, $ac_cv_socklen_t, [Define the real type of socklen_t]) fi - AC_DEFINE_UNQUOTED(ksize_t, socklen_t, [Compatibility define]) + AC_DEFINE_UNTQUOTED(ksize_t, socklen_t, [Compatibility define]) ]) @@ -3274,14 +3274,14 @@ AC_DEFUN([AM_FUNC_ERROR_AT_LINE], # Stephan Kulow: I put a KDE in it to avoid name conflicts AC_DEFUN(AM_KDE_GNU_GETTEXT, - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([AM_KDE_WITH_NLS])dnl + [AC_RETQUIRE([AC_PROG_MAKE_SET])dnl + AC_RETQUIRE([AC_PROG_RANLIB])dnl + AC_RETQUIRE([AC_HEADER_STDC])dnl + AC_RETQUIRE([AC_TYPE_OFF_T])dnl + AC_RETQUIRE([AC_TYPE_SIZE_T])dnl + AC_RETQUIRE([AC_FUNC_ALLOCA])dnl + AC_RETQUIRE([AC_FUNC_MMAP])dnl + AC_RETQUIRE([AM_KDE_WITH_NLS])dnl AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h]) AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \ __argz_count __argz_stringify __argz_next]) @@ -3336,8 +3336,8 @@ __argz_count __argz_stringify __argz_next]) ]) AC_DEFUN(AC_HAVE_XPM, - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) + [AC_RETQUIRE_CPP()dnl + AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) test -z "$XPM_LDFLAGS" && XPM_LDFLAGS= test -z "$XPM_INCLUDE" && XPM_INCLUDE= @@ -3392,8 +3392,8 @@ AC_DEFUN(AC_HAVE_XPM, ]) AC_DEFUN(AC_HAVE_DPMS, - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) + [AC_RETQUIRE_CPP()dnl + AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS= test -z "$DPMS_INCLUDE" && DPMS_INCLUDE= @@ -3480,8 +3480,8 @@ AC_DEFUN(AC_HAVE_DPMS, ]) AC_DEFUN(AC_HAVE_GL, - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) + [AC_RETQUIRE_CPP()dnl + AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) test -z "$GL_LDFLAGS" && GL_LDFLAGS= test -z "$GL_INCLUDE" && GL_INCLUDE= @@ -3489,7 +3489,7 @@ AC_DEFUN(AC_HAVE_GL, AC_ARG_WITH(gl, [ --without-gl disable 3D GL modes], gl_test=$withval, gl_test="yes") if test "x$kde_use_qt_emb" = "xyes"; then - # GL and Qt Embedded is a no-go for now. + # GL and TQt Embedded is a no-go for now. ac_cv_have_gl=no elif test "x$gl_test" = xno; then ac_cv_have_gl=no @@ -3563,7 +3563,7 @@ AC_DEFUN(AC_HAVE_GL, dnl shadow password and PAM magic - maintained by ossi@kde.org AC_DEFUN(KDE_PAM, [ - AC_REQUIRE([KDE_CHECK_LIBDL]) + AC_RETQUIRE([KDE_CHECK_LIBDL]) AC_ARG_WITH(pam, [ --with-pam[=ARG] enable support for PAM: ARG=[yes|no|service name]], @@ -3630,13 +3630,13 @@ You may want to enforce it by using --with-pam.]) ]) if test -n "$$3_PAM_SERVICE"; then AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE]) - AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2]) + AC_DEFINE_UNTQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2]) fi AC_SUBST($3_PAM_SERVICE) ]) AC_DEFUN(KDE_SHADOWPASSWD, [ - AC_REQUIRE([KDE_PAM]) + AC_RETQUIRE([KDE_PAM]) AC_CHECK_LIB(shadow, getspent, [ LIBSHADOW="-lshadow" @@ -3693,9 +3693,9 @@ AC_DEFUN(KDE_SHADOWPASSWD, [ ]) AC_DEFUN(KDE_PASSWDLIBS, [ - AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT - AC_REQUIRE([KDE_PAM]) - AC_REQUIRE([KDE_SHADOWPASSWD]) + AC_RETQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT + AC_RETQUIRE([KDE_PAM]) + AC_RETQUIRE([KDE_SHADOWPASSWD]) if test "x$use_pam" = "xyes"; then PASSWDLIBS="$PAMLIBS" @@ -3758,11 +3758,11 @@ if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then fi if test "$ac_cv_have_dlfcn" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn]) + AC_DEFINE_UNTQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn]) fi if test "$ac_cv_have_shload" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload]) + AC_DEFINE_UNTQUOTED(HAVE_SHLOAD, 1, [Define if you have shload]) fi if test "$enable_dlopen" = no ; then @@ -3781,7 +3781,7 @@ AC_MSG_CHECKING([dynamic loading]) eval "`egrep '^build_libtool_libs=' libtool`" if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then dynamic_loading=yes - AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING) + AC_DEFINE_UNTQUOTED(HAVE_DYNAMIC_LOADING) else dynamic_loading=no fi @@ -3833,8 +3833,8 @@ fi AC_DEFUN(KDE_CHECK_MICO, [ -AC_REQUIRE([KDE_CHECK_LIBDL]) -AC_REQUIRE([KDE_MISC_TESTS]) +AC_RETQUIRE([KDE_CHECK_LIBDL]) +AC_RETQUIRE([KDE_MISC_TESTS]) AC_MSG_CHECKING(for MICO) if test -z "$MICODIR"; then @@ -3942,7 +3942,7 @@ AC_SUBST(idldir) AC_DEFUN(KDE_CHECK_MINI_STL, [ -AC_REQUIRE([KDE_CHECK_MICO]) +AC_RETQUIRE([KDE_CHECK_MICO]) AC_MSG_CHECKING(if we use mico's mini-STL) AC_CACHE_VAL(kde_cv_have_mini_stl, @@ -4047,8 +4047,8 @@ AC_DEFUN(KDE_CHECK_PTHREAD_OPTION, AC_DEFUN(KDE_CHECK_THREADING, [ - AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) - AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION]) + AC_RETQUIRE([KDE_CHECK_LIBPTHREAD]) + AC_RETQUIRE([KDE_CHECK_PTHREAD_OPTION]) dnl default is yes if libpthread is found and no if no libpthread is available if test -z "$LIBPTHREAD"; then if test -z "$USE_THREADS"; then @@ -4143,9 +4143,9 @@ AC_MSG_RESULT($ac_python_dir) AC_DEFUN(KDE_CHECK_PYTHON_INTERN, [ -AC_REQUIRE([KDE_CHECK_LIBDL]) -AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) -AC_REQUIRE([KDE_CHECK_PYTHON_DIR]) +AC_RETQUIRE([KDE_CHECK_LIBDL]) +AC_RETQUIRE([KDE_CHECK_LIBPTHREAD]) +AC_RETQUIRE([KDE_CHECK_PYTHON_DIR]) if test -z "$1"; then version="1.5" @@ -4257,7 +4257,7 @@ using namespace std; AC_MSG_RESULT($kde_cv_stl_type_sgi) if test "$kde_cv_stl_type_sgi" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI]) + AC_DEFINE_UNTQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI]) fi ]) @@ -4279,7 +4279,7 @@ using namespace std; AC_MSG_RESULT($kde_cv_stl_type_hp) if test "$kde_cv_stl_type_hp" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP]) + AC_DEFINE_UNTQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP]) fi ]) @@ -4303,9 +4303,9 @@ AC_DEFUN(KDE_CHECK_STL, AC_LANG_RESTORE ]) -AC_DEFUN(AC_FIND_QIMGIO, - [AC_REQUIRE([AC_FIND_JPEG]) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_DEFUN(AC_FIND_TQIMGIO, + [AC_RETQUIRE([AC_FIND_JPEG]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) AC_MSG_CHECKING([for qimgio]) AC_CACHE_VAL(ac_cv_lib_qimgio, [ @@ -4320,7 +4320,7 @@ AC_TRY_RUN(dnl #include <qimageio.h> #include <qstring.h> int main() { - QString t = "hallo"; + TQString t = "hallo"; t.fill('t'); qInitImageIO(); } @@ -4333,10 +4333,10 @@ CXXFLAGS="$ac_save_CXXFLAGS" AC_LANG_RESTORE ])dnl if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then - LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG" + LIBTQIMGIO="-lqimgio -lpng -lz $LIBJPEG" AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available]) - AC_SUBST(LIBQIMGIO) + AC_DEFINE_UNTQUOTED(HAVE_TQIMGIO, 1, [Define if you have the TQt extension qimgio available]) + AC_SUBST(LIBTQIMGIO) else AC_MSG_RESULT(not found) fi @@ -4395,7 +4395,7 @@ AC_DEFUN(AC_CHECK_UTMP_FILE, ]) if test "$kde_cv_utmp_file" != "no"; then - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) + AC_DEFINE_UNTQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) $1 AC_MSG_RESULT($kde_cv_utmp_file) else @@ -4507,7 +4507,7 @@ AC_LANG_RESTORE ]) AC_MSG_RESULT($ac_cv_have_s_issock) if test "$ac_cv_have_s_issock" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.]) + AC_DEFINE_UNTQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.]) fi AH_VERBATIM(_ISSOCK, @@ -4556,7 +4556,7 @@ rm conftest.* ]) AC_MSG_RESULT($ac_cv_maxpathlen) -AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] ) +AC_DEFINE_UNTQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] ) ]) AC_DEFUN(KDE_CHECK_HEADER, @@ -4923,12 +4923,12 @@ if test "x$kde_java_bindir" != "xno"; then JAVAC=$kde_java_bindir/javac JAVAH=$kde_java_bindir/javah JAR=$kde_java_bindir/jar - AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) + AC_DEFINE_UNTQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" AC_MSG_RESULT([java JDK in $kde_java_bindir]) else - AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) + AC_DEFINE_UNTQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_MSG_RESULT([java JRE in $kde_java_bindir]) fi else # no @@ -4974,7 +4974,7 @@ fi AC_SUBST(LEXLIB) ]) -AC_DEFUN(AC_PATH_QTOPIA, +AC_DEFUN(AC_PATH_TQTOPIA, [ dnl TODO: use AC_CACHE_VAL @@ -4991,19 +4991,19 @@ 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_RETQUIRE([AC_PATH_QT]) - AC_MSG_CHECKING([for Qtopia]) + AC_MSG_CHECKING([for TQtopia]) - LIB_QTOPIA="-lqpe" - AC_SUBST(LIB_QTOPIA) + LIB_TQTOPIA="-lqpe" + AC_SUBST(LIB_TQTOPIA) - kde_qtopia_dirs="$QPEDIR /opt/Qtopia" + kde_qtopia_dirs="$TQPEDIR /opt/TQtopia" ac_qtopia_incdir=NO AC_ARG_WITH(qtopia-dir, - [ --with-qtopia-dir=DIR where the root of Qtopia is installed ], + [ --with-qtopia-dir=DIR where the root of TQtopia is installed ], [ ac_qtopia_incdir="$withval"/include] ) qtopia_incdirs="" @@ -5020,17 +5020,17 @@ AC_DEFUN(AC_PATH_QTOPIA, ac_qtopia_incdir="$qtopia_incdir" if test -z "$qtopia_incdir"; then - AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.]) + AC_MSG_ERROR([Cannot find TQtopia headers. Please check your installation.]) fi - qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`; - qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`; - qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`; + qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*TQPE_VERSION "\(.*\)\..*\..*".*,\1,p'`; + qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*TQPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`; + qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*TQPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`; qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat" qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat" if test "$qtopia_ver" -lt "$qtopia_minver"; then - AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr + AC_MSG_ERROR([found TQtopia version $qtopia_verstr but version $qtopia_minverstr is required.]) fi @@ -5042,8 +5042,8 @@ is required.]) ac_libs_safe="$LIBS" CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" - LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_QTOPIA $LIBQT" + LDFLAGS="$LDFLAGS $TQT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" + LIBS="$LIBS $LIB_TQTOPIA $LIBQT" cat > conftest.$ac_ext <<EOF #include "confdefs.h" @@ -5052,7 +5052,7 @@ is required.]) int main( int argc, char **argv ) { - QPEApplication app( argc, argv ); + TQPEApplication app( argc, argv ); return 0; } EOF @@ -5061,7 +5061,7 @@ EOF rm -f conftest* else rm -f conftest* - AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at + AC_MSG_ERROR([Cannot link small TQtopia Application. For more details look at the end of config.log]) fi @@ -5071,8 +5071,8 @@ the end of config.log]) AC_LANG_RESTORE - QTOPIA_INCLUDES="-I$qtopia_incdir" - AC_SUBST(QTOPIA_INCLUDES) + TQTOPIA_INCLUDES="-I$qtopia_incdir" + AC_SUBST(TQTOPIA_INCLUDES) AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir]) ]) @@ -5080,16 +5080,16 @@ the end of config.log]) AC_DEFUN(KDE_INIT_DOXYGEN, [ -AC_MSG_CHECKING([for Qt docs]) +AC_MSG_CHECKING([for TQt docs]) kde_qtdir= if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html ], QTDOCDIR) -AC_MSG_RESULT($QTDOCDIR) +AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html ], TQTDOCDIR) +AC_MSG_RESULT($TQTDOCDIR) -AC_SUBST(QTDOCDIR) +AC_SUBST(TQTDOCDIR) KDE_FIND_PATH(dot, DOT, [], []) if test -n "$DOT"; then @@ -5107,7 +5107,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME) AC_SUBST(DOXYGEN_PROJECT_NUMBER) KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then +if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/qsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) @@ -5203,7 +5203,7 @@ dnl AC_DEFUN(KDE_CHECK_SSL, [ LIBSSL="-lssl -lcrypto" -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([KDE_CHECK_LIB64]) ac_ssl_includes=NO ac_ssl_libraries=NO ssl_libraries="" @@ -5387,8 +5387,8 @@ AC_SUBST(LIBSSL) AC_DEFUN(KDE_CHECK_STRLCPY, [ - AC_REQUIRE([AC_CHECK_STRLCAT]) - AC_REQUIRE([AC_CHECK_STRLCPY]) + AC_RETQUIRE([AC_CHECK_STRLCAT]) + AC_RETQUIRE([AC_CHECK_STRLCPY]) AC_CHECK_SIZEOF(size_t) AC_CHECK_SIZEOF(unsigned long) @@ -5441,7 +5441,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)]) # AC_PROG_LIBTOOL # --------------- AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +[AC_RETQUIRE([_AC_PROG_LIBTOOL])dnl dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. AC_PROVIDE_IFELSE([AC_PROG_CXX], @@ -5471,7 +5471,7 @@ dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. # _AC_PROG_LIBTOOL # ---------------- AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +[AC_RETQUIRE([AC_LIBTOOL_SETUP])dnl AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl @@ -5491,29 +5491,29 @@ define([AC_PROG_LIBTOOL], []) # ---------------- AC_DEFUN([AC_LIBTOOL_SETUP], [AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl -AC_REQUIRE([LT_AC_PROG_SED])dnl - -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +AC_RETQUIRE([AC_ENABLE_SHARED])dnl +AC_RETQUIRE([AC_ENABLE_STATIC])dnl +AC_RETQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_RETQUIRE([AC_CANONICAL_HOST])dnl +AC_RETQUIRE([AC_CANONICAL_BUILD])dnl +AC_RETQUIRE([AC_PROG_CC])dnl +AC_RETQUIRE([AC_PROG_LD])dnl +AC_RETQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_RETQUIRE([AC_PROG_NM])dnl +AC_RETQUIRE([LT_AC_PROG_SED])dnl + +AC_RETQUIRE([AC_PROG_LN_S])dnl +AC_RETQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl +AC_RETQUIRE([AC_OBJEXT])dnl +AC_RETQUIRE([AC_EXEEXT])dnl dnl AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +AC_RETQUIRE([_LT_AC_SYS_COMPILER])dnl _LT_AC_PROG_ECHO_BACKSLASH case $host_os in @@ -5632,7 +5632,7 @@ _LT_AC_TAGCONFIG # _LT_AC_SYS_COMPILER # ------------------- AC_DEFUN([_LT_AC_SYS_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl +[AC_RETQUIRE([AC_PROG_CC])dnl # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} @@ -6063,7 +6063,7 @@ AC_DEFUN([_LT_AC_CHECK_DLFCN], # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +[AC_RETQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : [$4] else @@ -6151,7 +6151,7 @@ rm -fr conftest* # AC_LIBTOOL_DLOPEN_SELF # ------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +[AC_RETQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -6250,7 +6250,7 @@ fi # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_RETQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -6301,7 +6301,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], # ----------------------------------------- # Check to see if we can do hard links to lock some files if needed AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -[AC_REQUIRE([_LT_AC_LOCK])dnl +[AC_RETQUIRE([_LT_AC_LOCK])dnl hard_links="nottested" if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then @@ -6891,7 +6891,7 @@ if test -f "$ltmain" && test -n "$tagnames"; then for tagname in $tagnames; do IFS="$lt_save_ifs" # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in + case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in "") ;; *) AC_MSG_ERROR([invalid tag name: $tagname]) ;; @@ -7171,9 +7171,9 @@ AC_DEFUN([AC_PROG_LD], [assume the C compiler uses GNU ld @<:@default=no@:>@])], [test "$withval" = no || with_gnu_ld=yes], [with_gnu_ld=no]) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_RETQUIRE([AC_PROG_CC])dnl +AC_RETQUIRE([AC_CANONICAL_HOST])dnl +AC_RETQUIRE([AC_CANONICAL_BUILD])dnl ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -7510,7 +7510,7 @@ NM="$lt_cv_path_NM" # ------------- # check for math library AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl +[AC_RETQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in *-*-beos* | *-*-cygwin* | *-*-pw32*) @@ -7600,15 +7600,15 @@ ifdef([AC_PROVIDE_IFELSE], # -------------- # enable support for C++ libraries AC_DEFUN([AC_LIBTOOL_CXX], -[AC_REQUIRE([_LT_AC_LANG_CXX]) +[AC_RETQUIRE([_LT_AC_LANG_CXX]) ])# AC_LIBTOOL_CXX # _LT_AC_LANG_CXX # --------------- AC_DEFUN([_LT_AC_LANG_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) +[AC_RETQUIRE([AC_PROG_CXX]) +AC_RETQUIRE([AC_PROG_CXXCPP]) ])# _LT_AC_LANG_CXX @@ -7616,7 +7616,7 @@ AC_REQUIRE([AC_PROG_CXXCPP]) # -------------- # enable support for GCJ libraries AC_DEFUN([AC_LIBTOOL_GCJ], -[AC_REQUIRE([_LT_AC_LANG_GCJ]) +[AC_RETQUIRE([_LT_AC_LANG_GCJ]) ])# AC_LIBTOOL_GCJ @@ -7626,9 +7626,9 @@ AC_DEFUN([_LT_AC_LANG_GCJ], [AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) + [ifdef([AC_PROG_GCJ],[AC_RETQUIRE([AC_PROG_GCJ])], + [ifdef([A][M_PROG_GCJ],[AC_RETQUIRE([A][M_PROG_GCJ])], + [AC_RETQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) ])# _LT_AC_LANG_GCJ @@ -7636,7 +7636,7 @@ AC_DEFUN([_LT_AC_LANG_GCJ], # -------------- # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], -[AC_REQUIRE([AC_PROG_RC]) +[AC_RETQUIRE([AC_PROG_RC]) ])# AC_LIBTOOL_RC @@ -7752,8 +7752,8 @@ CC="$lt_save_CC" AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], [AC_LANG_PUSH(C++) -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) +AC_RETQUIRE([AC_PROG_CXX]) +AC_RETQUIRE([AC_PROG_CXXCPP]) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -9112,7 +9112,7 @@ fi # AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) # ------------------------------------------- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_RETQUIRE([_LT_AC_SYS_COMPILER])dnl _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= @@ -9130,9 +9130,9 @@ fi # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE # --------------------------------- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([AC_PROG_NM]) -AC_REQUIRE([AC_OBJEXT]) +[AC_RETQUIRE([AC_CANONICAL_HOST]) +AC_RETQUIRE([AC_PROG_NM]) +AC_RETQUIRE([AC_OBJEXT]) # Check for command to grab the raw symbol name followed by C symbol from nm. AC_MSG_CHECKING([command to parse $NM output from $compiler object]) AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], @@ -10893,8 +10893,8 @@ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl +[AC_RETQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_RETQUIRE([AC_PROG_INSTALL])dnl # test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then @@ -10922,12 +10922,12 @@ m4_ifval([$2], AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNTQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNTQUOTED(VERSION, "$VERSION", [Version number of package])])dnl # Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl +AC_RETQUIRE([AM_SANITY_CHECK])dnl +AC_RETQUIRE([AC_ARG_PROGRAM])dnl AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) AM_MISSING_PROG(AUTOCONF, autoconf) AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) @@ -10938,8 +10938,8 @@ AM_PROG_INSTALL_SH AM_PROG_INSTALL_STRIP # We need awk for the "check" target. The system "awk" is bad on # some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_RETQUIRE([AC_PROG_AWK])dnl +AC_RETQUIRE([AC_PROG_MAKE_SET])dnl _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], @@ -10990,7 +10990,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# This function is AC_RETQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.7.2])]) @@ -11127,7 +11127,7 @@ AC_MSG_RESULT(yes)]) # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) +[AC_RETQUIRE([AM_MISSING_HAS_RUN]) $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) @@ -11137,7 +11137,7 @@ AC_SUBST($1)]) # Define MISSING if not defined so far and test if it supports --run. # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +[AC_RETQUIRE([AM_AUX_DIR_EXPAND])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -11235,7 +11235,7 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # 02111-1307, USA. AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +[AC_RETQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) @@ -11266,7 +11266,7 @@ AC_SUBST(install_sh)]) # always use install-sh in `make install-strip', and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +[AC_RETQUIRE([AM_PROG_INSTALL_SH])dnl # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right # tool to use in cross-compilation environments, therefore Automake @@ -11312,15 +11312,15 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # NAME is "CC", "CXX", "GCJ", or "OBJC". # We try a few techniques and use that to set a single cache variable. # -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# We don't AC_RETQUIRE the corresponding AC_PROG_CC since the latter was # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular # dependency, and given that the user is not expected to run this macro, # just rely on AC_PROG_CC. AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl +[AC_RETQUIRE([AM_SET_DEPDIR])dnl +AC_RETQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_RETQUIRE([AM_MAKE_INCLUDE])dnl +AC_RETQUIRE([AM_DEP_TRACK])dnl ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], @@ -11396,7 +11396,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_RETQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], [rm -f .deps 2>/dev/null mkdir .deps 2>/dev/null @@ -11498,7 +11498,7 @@ done # AM_OUTPUT_DEPENDENCY_COMMANDS # ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. +# This macro should only be invoked once -- use via AC_RETQUIRE. # # This code is only required when automatic dependency tracking # is enabled. FIXME. This creates each `.P' file that we will @@ -11598,8 +11598,8 @@ AC_PREREQ(2.50) # Autoconf leaves LEX=: if lex or flex can't be found. Change that to a # "missing" invocation, for better error output. AC_DEFUN([AM_PROG_LEX], -[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl -AC_REQUIRE([AC_PROG_LEX])dnl +[AC_RETQUIRE([AM_MISSING_HAS_RUN])dnl +AC_RETQUIRE([AC_PROG_LEX])dnl if test "$LEX" = :; then LEX=${am_missing_run}flex fi]) |