[BACK]Return to aclocal.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / pcre

Diff for /embedaddon/pcre/aclocal.m4 between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2013/07/22 08:25:55 version 1.1.1.4, 2014/06/15 19:46:03
Line 1 Line 1
# generated automatically by aclocal 1.13.2 -*- Autoconf -*-# generated automatically by aclocal 1.14 -*- Autoconf -*-
   
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.  # Copyright (C) 1996-2013 Free Software Foundation, Inc.
   
Line 247  AS_VAR_IF([$1], [""], [$5], [$4])dnl Line 247  AS_VAR_IF([$1], [""], [$5], [$4])dnl
 # generated from the m4 files accompanying Automake X.Y.  # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)  # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],  AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.13'[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to  dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.  dnl require some minimum version.  Point them to the right macro.
m4_if([$1], [1.13.2], [],m4_if([$1], [1.14], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])  ])
   
Line 266  m4_define([_AM_AUTOCONF_VERSION], []) Line 266  m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.  # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.13.2])dnl[AM_AUTOMAKE_VERSION([1.14])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],  m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
Line 291  AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false]) Line 291  AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
 : ${AR=ar}  : ${AR=ar}
   
 AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],  AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
  [am_cv_ar_interface=ar  [AC_LANG_PUSH([C])
    am_cv_ar_interface=ar
    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],     AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
      [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'       [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
       AC_TRY_EVAL([am_ar_try])        AC_TRY_EVAL([am_ar_try])
Line 308  AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ Line 309  AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_
       fi        fi
       rm -f conftest.lib libconftest.a        rm -f conftest.lib libconftest.a
      ])       ])
   ])   AC_LANG_POP([C])])
   
 case $am_cv_ar_interface in  case $am_cv_ar_interface in
 ar)  ar)
Line 692  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], Line 693  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much.  Some checks are only needed if  # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.  # your package does certain things.  But this isn't really a big deal.
   
   dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
   m4_define([AC_PROG_CC],
   m4_defn([AC_PROG_CC])
   [_AM_PROG_CC_C_O
   ])
   
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])  # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])  # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------  # -----------------------------------------------
Line 800  dnl macro is hooked onto _AC_COMPILER_EXEEXT early, se Line 807  dnl macro is hooked onto _AC_COMPILER_EXEEXT early, se
 AC_CONFIG_COMMANDS_PRE(dnl  AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],  [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl    [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
 ])  
   
   # POSIX will say in a future version that running "rm -f" with no argument
   # is OK; and we want to be able to make that assumption in our Makefile
   # recipes.  So use an aggressive probe to check that the usage we want is
   # actually supported "in the wild" to an acceptable degree.
   # See automake bug#10828.
   # To make any issue more visible, cause the running configure to be aborted
   # by default if the 'rm' program in use doesn't match our expectations; the
   # user can still override this though.
   if rm -f && rm -fr && rm -rf; then : OK; else
     cat >&2 <<'END'
   Oops!
   
   Your 'rm' program seems unable to run without file operands specified
   on the command line, even when the '-f' option is present.  This is contrary
   to the behaviour of most rm programs out there, and not conforming with
   the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
   
   Please tell bug-automake@gnu.org about your system, including the value
   of your $PATH and any error possibly output before this message.  This
   can help us improve future automake versions.
   
   END
     if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
       echo 'Configuration will proceed anyway, since you have set the' >&2
       echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
       echo >&2
     else
       cat >&2 <<'END'
   Aborting the configuration process, to ensure you take notice of the issue.
   
   You can download and install GNU coreutils to get an 'rm' implementation
   that behaves properly: <http://www.gnu.org/software/coreutils/>.
   
   If you want to complete the configuration process using your problematic
   'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
   to "yes", and re-run configure.
   
   END
       AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
     fi
   fi])
   
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not  dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further  dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.  dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],  m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])  m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
   
   
 # When config.status generates a header, we must update the stamp-h file.  # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header  # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.  # that is generated.  The stamp files are numbered to have different names.
Line 920  AC_MSG_RESULT([$_am_result]) Line 967  AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf  rm -f confinc confmf
 ])  ])
   
 # Copyright (C) 1999-2013 Free Software Foundation, Inc.  
 #  
 # This file is free software; the Free Software Foundation  
 # gives unlimited permission to copy and/or distribute it,  
 # with or without modifications, as long as this notice is preserved.  
   
 # AM_PROG_CC_C_O  
 # --------------  
 # Like AC_PROG_CC_C_O, but changed for automake.  
 AC_DEFUN([AM_PROG_CC_C_O],  
 [AC_REQUIRE([AC_PROG_CC_C_O])dnl  
 AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl  
 AC_REQUIRE_AUX_FILE([compile])dnl  
 # FIXME: we rely on the cache variable name because  
 # there is no other way.  
 set dummy $CC  
 am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`  
 eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o  
 if test "$am_t" != yes; then  
    # Losing compiler, so override with the script.  
    # FIXME: It is wrong to rewrite CC.  
    # But if we don't then we get into trouble of one sort or another.  
    # A longer-term fix would be to have automake use am__CC in this case,  
    # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"  
    CC="$am_aux_dir/compile $CC"  
 fi  
 dnl Make sure AC_PROG_CC is never called again, or it will override our  
 dnl setting of CC.  
 m4_define([AC_PROG_CC],  
           [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])  
 ])  
   
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-  # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
   
 # Copyright (C) 1997-2013 Free Software Foundation, Inc.  # Copyright (C) 1997-2013 Free Software Foundation, Inc.
Line 1021  AC_DEFUN([_AM_SET_OPTIONS], Line 1036  AC_DEFUN([_AM_SET_OPTIONS],
 # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.  # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
 AC_DEFUN([_AM_IF_OPTION],  AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])  [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
   
   # Copyright (C) 1999-2013 Free Software Foundation, Inc.
   #
   # This file is free software; the Free Software Foundation
   # gives unlimited permission to copy and/or distribute it,
   # with or without modifications, as long as this notice is preserved.
   
   # _AM_PROG_CC_C_O
   # ---------------
   # Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
   # to automatically call this.
   AC_DEFUN([_AM_PROG_CC_C_O],
   [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
   AC_REQUIRE_AUX_FILE([compile])dnl
   AC_LANG_PUSH([C])dnl
   AC_CACHE_CHECK(
     [whether $CC understands -c and -o together],
     [am_cv_prog_cc_c_o],
     [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
     # Make sure it works both with $CC and with simple cc.
     # Following AC_PROG_CC_C_O, we do the test twice because some
     # compilers refuse to overwrite an existing .o file with -o,
     # though they will create one.
     am_cv_prog_cc_c_o=yes
     for am_i in 1 2; do
       if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
            && test -f conftest2.$ac_objext; then
         : OK
       else
         am_cv_prog_cc_c_o=no
         break
       fi
     done
     rm -f core conftest*
     unset am_i])
   if test "$am_cv_prog_cc_c_o" != yes; then
      # Losing compiler, so override with the script.
      # FIXME: It is wrong to rewrite CC.
      # But if we don't then we get into trouble of one sort or another.
      # A longer-term fix would be to have automake use am__CC in this case,
      # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
      CC="$am_aux_dir/compile $CC"
   fi
   AC_LANG_POP([C])])
   
   # For backward compatibility.
   AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
   
   # Copyright (C) 2001-2013 Free Software Foundation, Inc.
   #
   # This file is free software; the Free Software Foundation
   # gives unlimited permission to copy and/or distribute it,
   # with or without modifications, as long as this notice is preserved.
   
   # AM_RUN_LOG(COMMAND)
   # -------------------
   # Run COMMAND, save the exit status in ac_status, and log it.
   # (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
   AC_DEFUN([AM_RUN_LOG],
   [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
      ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
      ac_status=$?
      echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
      (exit $ac_status); }])
   
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-  # Check to make sure that the build environment is sane.    -*- Autoconf -*-
   
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>