Index: third_party/yasm/patched-yasm/aclocal.m4 |
=================================================================== |
--- third_party/yasm/patched-yasm/aclocal.m4 (revision 165590) |
+++ third_party/yasm/patched-yasm/aclocal.m4 (working copy) |
@@ -13,12 +13,64 @@ |
m4_ifndef([AC_AUTOCONF_VERSION], |
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, |
-[m4_warning([this file was generated for autoconf 2.65. |
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, |
+[m4_warning([this file was generated for autoconf 2.68. |
You have another version of autoconf. It may work, but is not guaranteed to. |
If you have problems, you may need to regenerate the build system entirely. |
To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
+# intlmacosx.m4 serial 3 (gettext-0.18) |
+dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. |
+dnl This file is free software; the Free Software Foundation |
+dnl gives unlimited permission to copy and/or distribute it, |
+dnl with or without modifications, as long as this notice is preserved. |
+dnl |
+dnl This file can can be used in projects which are not available under |
+dnl the GNU General Public License or the GNU Library General Public |
+dnl License but which still want to provide support for the GNU gettext |
+dnl functionality. |
+dnl Please note that the actual code of the GNU gettext library is covered |
+dnl by the GNU Library General Public License, and the rest of the GNU |
+dnl gettext package package is covered by the GNU General Public License. |
+dnl They are *not* in the public domain. |
+ |
+dnl Checks for special options needed on MacOS X. |
+dnl Defines INTL_MACOSX_LIBS. |
+AC_DEFUN([gt_INTL_MACOSX], |
+[ |
+ dnl Check for API introduced in MacOS X 10.2. |
+ AC_CACHE_CHECK([for CFPreferencesCopyAppValue], |
+ [gt_cv_func_CFPreferencesCopyAppValue], |
+ [gt_save_LIBS="$LIBS" |
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
+ AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], |
+ [CFPreferencesCopyAppValue(NULL, NULL)], |
+ [gt_cv_func_CFPreferencesCopyAppValue=yes], |
+ [gt_cv_func_CFPreferencesCopyAppValue=no]) |
+ LIBS="$gt_save_LIBS"]) |
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then |
+ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], |
+ [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) |
+ fi |
+ dnl Check for API introduced in MacOS X 10.3. |
+ AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], |
+ [gt_save_LIBS="$LIBS" |
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
+ AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], |
+ [gt_cv_func_CFLocaleCopyCurrent=yes], |
+ [gt_cv_func_CFLocaleCopyCurrent=no]) |
+ LIBS="$gt_save_LIBS"]) |
+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
+ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], |
+ [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) |
+ fi |
+ INTL_MACOSX_LIBS= |
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" |
+ fi |
+ AC_SUBST([INTL_MACOSX_LIBS]) |
+]) |
+ |
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
# |
# This file is free software; the Free Software Foundation |
@@ -843,7 +895,7 @@ |
dnl Find a Python interpreter. Python versions prior to 2.0 are not |
dnl supported. (2.0 was released on October 16, 2000). |
m4_define_default([_AM_PYTHON_INTERPRETER_LIST], |
- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl |
+ [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl |
python2.1 python2.0]) |
m4_if([$1],[],[ |