diff options
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 230 |
1 files changed, 115 insertions, 115 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8b26963..f100dae 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -41,7 +41,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. @@ -598,7 +598,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="" @@ -808,8 +808,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, @@ -1015,7 +1015,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> @@ -1151,7 +1151,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, [ @@ -1214,9 +1214,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. @@ -1320,13 +1320,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 @@ -1514,7 +1514,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 @@ -1624,8 +1624,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]) @@ -1762,7 +1762,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" @@ -1924,13 +1924,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 @@ -1955,9 +1955,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") @@ -2469,7 +2469,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, [ @@ -2548,10 +2548,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)) @@ -2562,8 +2562,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, [ @@ -2606,8 +2606,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, [ @@ -2959,7 +2959,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, @@ -2971,12 +2971,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 @@ -3262,14 +3262,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]) @@ -3324,8 +3324,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= @@ -3380,8 +3380,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= @@ -3468,8 +3468,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= @@ -3551,7 +3551,7 @@ AC_DEFUN(AC_HAVE_GL, dnl shadow password and PAM magic - maintained by [email protected] 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]], @@ -3624,7 +3624,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" @@ -3681,9 +3681,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" @@ -3821,8 +3821,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 @@ -3930,7 +3930,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, @@ -4035,8 +4035,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 @@ -4131,9 +4131,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" @@ -4292,8 +4292,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, [ @@ -4979,7 +4979,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]) @@ -5191,7 +5191,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="" @@ -5375,8 +5375,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) @@ -5451,7 +5451,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], @@ -5481,7 +5481,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 @@ -5501,29 +5501,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 @@ -5642,7 +5642,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"} @@ -6073,7 +6073,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 @@ -6161,7 +6161,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 @@ -6260,7 +6260,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 @@ -6311,7 +6311,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 @@ -7181,9 +7181,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. @@ -7520,7 +7520,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*) @@ -7610,15 +7610,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 @@ -7626,7 +7626,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 @@ -7636,9 +7636,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 @@ -7646,7 +7646,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 @@ -7766,8 +7766,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)= @@ -9134,7 +9134,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)= @@ -9152,9 +9152,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], |