Fix RETQUIRE

1 files changed, 135 insertions, 135 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 35666bc..a6ec6f4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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_RETQUIRE([KDE_CHECK_LIB64])
+AC_REQUIRE([KDE_CHECK_LIB64])
 
 if test "$ac_x_includes" = NO; then
   # Guess where to find include files, by looking for this one X11 .h file.
@@ -610,7 +610,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
 
 AC_DEFUN(AC_CREATE_KFSSTND,
 [
-AC_RETQUIRE([AC_CHECK_RPATH])
+AC_REQUIRE([AC_CHECK_RPATH])
 
 AC_MSG_CHECKING([for KDE paths])
 kde_result=""
@@ -820,8 +820,8 @@ dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN(K_PATH_X,
 [
-AC_RETQUIRE([KDE_MISC_TESTS])dnl
-AC_RETQUIRE([KDE_CHECK_LIB64])
+AC_REQUIRE([KDE_MISC_TESTS])dnl
+AC_REQUIRE([KDE_CHECK_LIB64])
 
 AC_ARG_ENABLE(
   embedded,
@@ -1027,7 +1027,7 @@ AC_LANG_RESTORE
 
 AC_DEFUN(KDE_PRINT_TQT_PROGRAM,
 [
-AC_RETQUIRE([KDE_USE_QT])
+AC_REQUIRE([KDE_USE_QT])
 cat > conftest.$ac_ext <<EOF
 #include "confdefs.h"
 #include <qglobal.h>
@@ -1163,7 +1163,7 @@ fi
 
 AC_DEFUN(KDE_CHECK_TQT_DIRECT,
 [
-AC_RETQUIRE([KDE_USE_QT])
+AC_REQUIRE([KDE_USE_QT])
 AC_MSG_CHECKING([if TQt compiles without flags])
 AC_CACHE_VAL(kde_cv_qt_direct,
 [
@@ -1226,9 +1226,9 @@ dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN(AC_PATH_TQT_1_3,
 [
-AC_RETQUIRE([K_PATH_X])
-AC_RETQUIRE([KDE_USE_QT])
-AC_RETQUIRE([KDE_CHECK_LIB64])
+AC_REQUIRE([K_PATH_X])
+AC_REQUIRE([KDE_USE_QT])
+AC_REQUIRE([KDE_CHECK_LIB64])
 
 dnl ------------------------------------------------------------------------
 dnl Add configure flag to enable linking to MT version of TQt library.
@@ -1332,13 +1332,13 @@ fi
 
 if test $kde_qtver != 1; then
 
-  AC_RETQUIRE([AC_FIND_PNG])
-  AC_RETQUIRE([AC_FIND_JPEG])
+  AC_REQUIRE([AC_FIND_PNG])
+  AC_REQUIRE([AC_FIND_JPEG])
   LIBQT="$LIBQT $LIBPNG $LIBJPEG"
 fi
 
 if test $kde_qtver = 3; then
-  AC_RETQUIRE([KDE_CHECK_LIBDL])
+  AC_REQUIRE([KDE_CHECK_LIBDL])
   LIBQT="$LIBQT $LIBDL"
   kde_int_qt="$kde_int_qt $LIBDL"
 fi
@@ -1526,7 +1526,7 @@ AC_PATH_TQT_1_3
 
 AC_DEFUN(KDE_CHECK_UIC_PLUGINS,
 [
-AC_RETQUIRE([AC_PATH_TQT_TQMOC_UIC])
+AC_REQUIRE([AC_PATH_TQT_TQMOC_UIC])
 
 if test x$ac_uic_supports_libpath = xyes; then
 
@@ -1636,8 +1636,8 @@ dnl
 AC_DEFUN(AC_BASE_PATH_KDE,
 [
 AC_PREREQ([2.13])
-AC_RETQUIRE([AC_PATH_QT])dnl
-AC_RETQUIRE([KDE_CHECK_LIB64])
+AC_REQUIRE([AC_PATH_QT])dnl
+AC_REQUIRE([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_RETQUIRE([KDE_CHECK_EXTRA_LIBS])
+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 
 all_libraries="$all_libraries $USER_LDFLAGS"
 all_includes="$all_includes $USER_INCLUDES"
@@ -1936,13 +1936,13 @@ fi
 
 AC_DEFUN(KDE_CHECK_KIMGIO,
 [
-   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])
+   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])
 
    if test "$1" = "existance"; then
      AC_LANG_SAVE
@@ -1967,9 +1967,9 @@ AC_DEFUN(KDE_CHECK_KIMGIO,
 
 AC_DEFUN(KDE_CREATE_LIBS_ALIASES,
 [
-   AC_RETQUIRE([KDE_MISC_TESTS])
-   AC_RETQUIRE([KDE_CHECK_LIBDL])
-   AC_RETQUIRE([K_PATH_X])
+   AC_REQUIRE([KDE_MISC_TESTS])
+   AC_REQUIRE([KDE_CHECK_LIBDL])
+   AC_REQUIRE([K_PATH_X])
 
 if test $kde_qtver = 3; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
@@ -2481,7 +2481,7 @@ fi
 
 AC_DEFUN(AC_FIND_ZLIB,
 [
-AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS])
+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 AC_MSG_CHECKING([for libz])
 AC_CACHE_VAL(ac_cv_lib_z,
 [
@@ -2560,10 +2560,10 @@ fi
 
 AC_DEFUN(AC_FIND_TIFF,
 [
-AC_RETQUIRE([K_PATH_X])
-AC_RETQUIRE([AC_FIND_ZLIB])
-AC_RETQUIRE([AC_FIND_JPEG])
-AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS])
+AC_REQUIRE([K_PATH_X])
+AC_REQUIRE([AC_FIND_ZLIB])
+AC_REQUIRE([AC_FIND_JPEG])
+AC_REQUIRE([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_RETQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_RETQUIRE([AC_FIND_ZLIB])
+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
+AC_REQUIRE([AC_FIND_ZLIB])
 AC_MSG_CHECKING([for libpng])
 AC_CACHE_VAL(ac_cv_lib_png,
 [
@@ -2618,8 +2618,8 @@ fi
 
 AC_DEFUN(AC_FIND_JASPER,
 [
-AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_RETQUIRE([AC_FIND_JPEG])
+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
+AC_REQUIRE([AC_FIND_JPEG])
 AC_MSG_CHECKING([for jasper 1.600])
 AC_CACHE_VAL(ac_cv_jasper,
 [
@@ -2971,7 +2971,7 @@ AC_DEFUN(AC_CHECK_COMPILERS,
   KDE_CHECK_CLOSURE
   KDE_CHECK_NMCHECK
 
-  ifdef([AM_DEPENDENCIES], AC_RETQUIRE([KDE_ADD_DEPENDENCIES]), [])
+  ifdef([AM_DEPENDENCIES], AC_REQUIRE([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_RETQUIRE([AC_CHECK_COMPILERS])
-AC_RETQUIRE([AC_ENABLE_SHARED])
-AC_RETQUIRE([AC_ENABLE_STATIC])
+AC_REQUIRE([AC_CHECK_COMPILERS])
+AC_REQUIRE([AC_ENABLE_SHARED])
+AC_REQUIRE([AC_ENABLE_STATIC])
 
-AC_RETQUIRE([AC_LIBTOOL_DLOPEN])
-AC_RETQUIRE([KDE_CHECK_LIB64])
+AC_REQUIRE([AC_LIBTOOL_DLOPEN])
+AC_REQUIRE([KDE_CHECK_LIB64])
 
 AC_LANG_SAVE
 AC_LANG_C
@@ -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_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_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_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_RETQUIRE_CPP()dnl
-  AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS])
+ [AC_REQUIRE_CPP()dnl
+  AC_REQUIRE([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_RETQUIRE_CPP()dnl
-  AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS])
+ [AC_REQUIRE_CPP()dnl
+  AC_REQUIRE([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_RETQUIRE_CPP()dnl
-  AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS])
+ [AC_REQUIRE_CPP()dnl
+  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 
  test -z "$GL_LDFLAGS" && GL_LDFLAGS=
  test -z "$GL_INCLUDE" && GL_INCLUDE=
@@ -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_RETQUIRE([KDE_CHECK_LIBDL])
+  AC_REQUIRE([KDE_CHECK_LIBDL])
 
   AC_ARG_WITH(pam,
     [  --with-pam[=ARG]        enable support for PAM: ARG=[yes|no|service name]],
@@ -3636,7 +3636,7 @@ You may want to enforce it by using --with-pam.])
 ])
 
 AC_DEFUN(KDE_SHADOWPASSWD, [
-  AC_RETQUIRE([KDE_PAM])
+  AC_REQUIRE([KDE_PAM])
 
   AC_CHECK_LIB(shadow, getspent,
     [ LIBSHADOW="-lshadow"
@@ -3693,9 +3693,9 @@ AC_DEFUN(KDE_SHADOWPASSWD, [
 ])
 
 AC_DEFUN(KDE_PASSWDLIBS, [
-  AC_RETQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
-  AC_RETQUIRE([KDE_PAM])
-  AC_RETQUIRE([KDE_SHADOWPASSWD])
+  AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
+  AC_REQUIRE([KDE_PAM])
+  AC_REQUIRE([KDE_SHADOWPASSWD])
 
   if test "x$use_pam" = "xyes"; then 
     PASSWDLIBS="$PAMLIBS"
@@ -3833,8 +3833,8 @@ fi
 
 AC_DEFUN(KDE_CHECK_MICO,
 [
-AC_RETQUIRE([KDE_CHECK_LIBDL])
-AC_RETQUIRE([KDE_MISC_TESTS])
+AC_REQUIRE([KDE_CHECK_LIBDL])
+AC_REQUIRE([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_RETQUIRE([KDE_CHECK_MICO])
+AC_REQUIRE([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_RETQUIRE([KDE_CHECK_LIBPTHREAD])
-  AC_RETQUIRE([KDE_CHECK_PTHREAD_OPTION])
+  AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
+  AC_REQUIRE([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_RETQUIRE([KDE_CHECK_LIBDL])
-AC_RETQUIRE([KDE_CHECK_LIBPTHREAD])
-AC_RETQUIRE([KDE_CHECK_PYTHON_DIR])
+AC_REQUIRE([KDE_CHECK_LIBDL])
+AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
+AC_REQUIRE([KDE_CHECK_PYTHON_DIR])
 
 if test -z "$1"; then
   version="1.5"
@@ -4304,8 +4304,8 @@ AC_DEFUN(KDE_CHECK_STL,
 ])
 
 AC_DEFUN(AC_FIND_TQIMGIO,
-   [AC_RETQUIRE([AC_FIND_JPEG])
-AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS])
+   [AC_REQUIRE([AC_FIND_JPEG])
+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 AC_MSG_CHECKING([for qimgio])
 AC_CACHE_VAL(ac_cv_lib_qimgio,
 [
@@ -4991,7 +4991,7 @@ AC_DEFUN(AC_PATH_TQTOPIA,
   qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
   qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat"
 
-  AC_RETQUIRE([AC_PATH_QT])
+  AC_REQUIRE([AC_PATH_QT])
 
   AC_MSG_CHECKING([for TQtopia])
 
@@ -5203,7 +5203,7 @@ dnl
 AC_DEFUN(KDE_CHECK_SSL,
 [
 LIBSSL="-lssl -lcrypto"
-AC_RETQUIRE([KDE_CHECK_LIB64])
+AC_REQUIRE([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_RETQUIRE([AC_CHECK_STRLCAT])
-  AC_RETQUIRE([AC_CHECK_STRLCPY])
+  AC_REQUIRE([AC_CHECK_STRLCAT])
+  AC_REQUIRE([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_RETQUIRE([_AC_PROG_LIBTOOL])dnl
+[AC_REQUIRE([_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_RETQUIRE([AC_LIBTOOL_SETUP])dnl
+[AC_REQUIRE([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_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
+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
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_RETQUIRE([AC_OBJEXT])dnl
-AC_RETQUIRE([AC_EXEEXT])dnl
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
 AC_LIBTOOL_SYS_MAX_CMD_LEN
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 AC_LIBTOOL_OBJDIR
 
-AC_RETQUIRE([_LT_AC_SYS_COMPILER])dnl
+AC_REQUIRE([_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_RETQUIRE([AC_PROG_CC])dnl
+[AC_REQUIRE([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_RETQUIRE([_LT_AC_CHECK_DLFCN])dnl
+[AC_REQUIRE([_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_RETQUIRE([_LT_AC_CHECK_DLFCN])dnl
+[AC_REQUIRE([_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_RETQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([_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_RETQUIRE([_LT_AC_LOCK])dnl
+[AC_REQUIRE([_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
@@ -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_RETQUIRE([AC_PROG_CC])dnl
-AC_RETQUIRE([AC_CANONICAL_HOST])dnl
-AC_RETQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([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_RETQUIRE([AC_CANONICAL_HOST])dnl
+[AC_REQUIRE([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_RETQUIRE([_LT_AC_LANG_CXX])
+[AC_REQUIRE([_LT_AC_LANG_CXX])
 ])# AC_LIBTOOL_CXX
 
 
 # _LT_AC_LANG_CXX
 # ---------------
 AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_RETQUIRE([AC_PROG_CXX])
-AC_RETQUIRE([AC_PROG_CXXCPP])
+[AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([AC_PROG_CXXCPP])
 ])# _LT_AC_LANG_CXX
 
 
@@ -7616,7 +7616,7 @@ AC_RETQUIRE([AC_PROG_CXXCPP])
 # --------------
 # enable support for GCJ libraries
 AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_RETQUIRE([_LT_AC_LANG_GCJ])
+[AC_REQUIRE([_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_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])])])])])])
+      [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])])])])])])
 ])# _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_RETQUIRE([AC_PROG_RC])
+[AC_REQUIRE([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_RETQUIRE([AC_PROG_CXX])
-AC_RETQUIRE([AC_PROG_CXXCPP])
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([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_RETQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([_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_RETQUIRE([AC_CANONICAL_HOST])
-AC_RETQUIRE([AC_PROG_NM])
-AC_RETQUIRE([AC_OBJEXT])
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([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_RETQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_RETQUIRE([AC_PROG_INSTALL])dnl
+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
 # test to see if srcdir already configured
 if test "`cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
@@ -10926,8 +10926,8 @@ _AM_IF_OPTION([no-define],,
  AC_DEFINE_UNTQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
 
 # Some tools Automake needs.
-AC_RETQUIRE([AM_SANITY_CHECK])dnl
-AC_RETQUIRE([AC_ARG_PROGRAM])dnl
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([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_RETQUIRE([AC_PROG_AWK])dnl
-AC_RETQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([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_RETQUIREd by AC_INIT_AUTOMAKE.
+# This function is AC_REQUIREd 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_RETQUIRE([AM_MISSING_HAS_RUN])
+[AC_REQUIRE([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_RETQUIRE([AM_AUX_DIR_EXPAND])dnl
+[AC_REQUIRE([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_RETQUIRE([AM_AUX_DIR_EXPAND])dnl
+[AC_REQUIRE([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_RETQUIRE([AM_PROG_INSTALL_SH])dnl
+[AC_REQUIRE([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_RETQUIRE the corresponding AC_PROG_CC since the latter was
+# We don't AC_REQUIRE 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_RETQUIRE([AM_SET_DEPDIR])dnl
-AC_RETQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_RETQUIRE([AM_MAKE_INCLUDE])dnl
-AC_RETQUIRE([AM_DEP_TRACK])dnl
+[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
 
 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_RETQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd 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_RETQUIRE.
+# This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # 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_RETQUIRE([AM_MISSING_HAS_RUN])dnl
-AC_RETQUIRE([AC_PROG_LEX])dnl
+[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+AC_REQUIRE([AC_PROG_LEX])dnl
 if test "$LEX" = :; then
   LEX=${am_missing_run}flex
 fi])