Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Side by Side Diff: third_party/yasm/patched-yasm/configure.ac

Issue 6170009: Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Process this file with autoconf to produce a configure script. 1 # Process this file with autoconf to produce a configure script.
2 # $Id: configure.ac 2195 2009-04-10 05:34:14Z peter $ 2 # $Id: configure.ac 2353 2010-08-07 16:37:52Z peter $
3 3
4 # 4 #
5 # autoconf setup 5 # autoconf setup
6 # 6 #
7 AC_PREREQ(2.53) 7 AC_PREREQ(2.53)
8 AC_INIT([yasm], [0.8.0], [bug-yasm@tortall.net]) 8 AC_INIT([yasm], [1.1.0], [bug-yasm@tortall.net])
9 #AC_CONFIG_SRCDIR([src/main.c]) 9 #AC_CONFIG_SRCDIR([src/main.c])
10 AC_CONFIG_AUX_DIR(config) 10 AC_CONFIG_AUX_DIR(config)
11 AM_CONFIG_HEADER([config.h]) 11 AC_CONFIG_HEADER([config.h])
12 12
13 AM_INIT_AUTOMAKE(yasm, [0.8.0]) 13 AM_INIT_AUTOMAKE([1.9.6 foreign])
14 AM_MAINTAINER_MODE 14 AM_MAINTAINER_MODE
15 15
16 AC_DEFINE(PACKAGE_INTVER, ["0.8.0"], 16 AC_DEFINE(PACKAGE_INTVER, ["1.1.0"],
17 [Define to internal version of this package.]) 17 [Define to internal version of this package.])
18 AC_DEFINE(PACKAGE_BUILD, ["2194"], [Define to build version of this package.]) 18 AC_DEFINE(PACKAGE_BUILD, ["2352"], [Define to build version of this package.])
19 19
20 # 20 #
21 # autoconf command-line options 21 # autoconf command-line options
22 # 22 #
23 AC_ARG_ENABLE(debug, 23 AC_ARG_ENABLE(debug,
24 AC_HELP_STRING([--enable-debug], 24 AC_HELP_STRING([--enable-debug],
25 [Turn on debugging and compile time warnings]), 25 [Turn on debugging and compile time warnings]),
26 [case "${enableval}" in 26 [case "${enableval}" in
27 yes) debugging="yes" ;; 27 yes) debugging="yes" ;;
28 no) debugging="no" ;; 28 no) debugging="no" ;;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 [case "${enableval}" in 66 [case "${enableval}" in
67 yes) enable_python_bindings="yes" ;; 67 yes) enable_python_bindings="yes" ;;
68 no) enable_python_bindings="no" ;; 68 no) enable_python_bindings="no" ;;
69 *) AC_MSG_ERROR([bad value ${enableval} for --enable-python-bindings]) ;; 69 *) AC_MSG_ERROR([bad value ${enableval} for --enable-python-bindings]) ;;
70 esac], enable_python_bindings="no") 70 esac], enable_python_bindings="no")
71 71
72 # 72 #
73 # Checks for programs. 73 # Checks for programs.
74 # 74 #
75 AC_PROG_CPP 75 AC_PROG_CPP
76 AC_DEFINE_UNQUOTED([CPP_PROG], "${CPP}", [Command name to run C preprocessor])
77 AC_PROG_CC_STDC 76 AC_PROG_CC_STDC
78 AC_PROG_INSTALL 77 AC_PROG_INSTALL
79 AC_PROG_LN_S 78 AC_PROG_LN_S
79 #automake default ARFLAGS to "cru"
80 AC_CHECK_TOOLS(AR,[$AR ar],[ar])
80 AC_PROG_RANLIB 81 AC_PROG_RANLIB
81 82
82 # REQUIRE a standard (ANSI/ISO) C compiler 83 # REQUIRE a standard (ANSI/ISO) C compiler
83 if test "$ac_cv_prog_cc_stdc" = no; then 84 if test "$ac_cv_prog_cc_stdc" = no; then
84 AC_MSG_ERROR([A standard (ANSI/ISO C89) C compiler is required.]) 85 AC_MSG_ERROR([A standard (ANSI/ISO C89) C compiler is required.])
85 fi 86 fi
86 87
87 # Check for xmlto (for rendering manpages, needed only for development) 88 # Check for xmlto (for rendering manpages, needed only for development)
88 AC_CHECK_PROGS([XMLTO], [$XMLTO xmlto], [:]) 89 AC_CHECK_PROGS([XMLTO], [$XMLTO xmlto], [:])
89 if test "$XMLTO" = ":"; then 90 if test "$XMLTO" = ":"; then
90 AC_MSG_WARN([xmlto not found, manpages will not be rebuilt.]) 91 AC_MSG_WARN([xmlto not found, manpages will not be rebuilt.])
91 fi 92 fi
92 AM_CONDITIONAL(BUILD_MAN, test "$XMLTO" != ":") 93 AM_CONDITIONAL(BUILD_MAN, test "$XMLTO" != ":")
93 94
94 # Check for compiler output filename suffixes. 95 # Check for compiler output filename suffixes.
95 AC_OBJEXT 96 AC_OBJEXT
96 AC_EXEEXT 97 AC_EXEEXT
97 98
98 # 99 #
99 # Checks for libraries. 100 # Checks for libraries.
100 # 101 #
101 AM_WITH_DMALLOC 102 AM_WITH_DMALLOC
102 103
103 # 104 #
104 # Checks for header files. 105 # Checks for header files.
105 # 106 #
106 AC_HEADER_STDC 107 AC_HEADER_STDC
107 AC_CHECK_HEADERS([strings.h libgen.h unistd.h direct.h]) 108 AC_CHECK_HEADERS([strings.h libgen.h unistd.h direct.h sys/stat.h])
108 109
109 # REQUIRE standard C headers 110 # REQUIRE standard C headers
110 if test "$ac_cv_header_stdc" != yes; then 111 if test "$ac_cv_header_stdc" != yes; then
111 AC_MSG_ERROR([Standard (ANSI/ISO C89) header files are required.]) 112 AC_MSG_ERROR([Standard (ANSI/ISO C89) header files are required.])
112 fi 113 fi
113 114
114 # 115 #
115 # Checks for typedefs, structures, and compiler characteristics. 116 # Checks for typedefs, structures, and compiler characteristics.
116 # 117 #
117 AC_C_CONST 118 AC_C_CONST
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 fi 227 fi
227 228
228 # If we're using GCC, then we can turn on -ansi -pedantic -Wall too. 229 # If we're using GCC, then we can turn on -ansi -pedantic -Wall too.
229 if test "$USE_MAINTAINER_MODE" = "yes"; then 230 if test "$USE_MAINTAINER_MODE" = "yes"; then
230 if test "$GCC" = yes; then 231 if test "$GCC" = yes; then
231 MORE_CFLAGS="-ansi -pedantic -Wall $MORE_CFLAGS" 232 MORE_CFLAGS="-ansi -pedantic -Wall $MORE_CFLAGS"
232 fi 233 fi
233 fi 234 fi
234 AC_SUBST(MORE_CFLAGS) 235 AC_SUBST(MORE_CFLAGS)
235 236
236 #
237 # Cross-building
238 #
239 if test "$cross_compiling" = "yes"; then
240 AC_MSG_CHECKING([cc for build])
241 CC_FOR_BUILD="${CC_FOR_BUILD-PATH=/usr/bin:$PATH cc}"
242 AC_MSG_RESULT($CC_FOR_BUILD)
243 CCLD_FOR_BUILD="$CC_FOR_BUILD"
244 else
245 CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
246 CCLD_FOR_BUILD="${CCLD_FOR_BUILD-$CC}"
247 fi
248
249 AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler]) 237 AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
250 AC_ARG_VAR(CCLD_FOR_BUILD,[build system C linker frontend]) 238 AC_ARG_VAR(CCLD_FOR_BUILD,[build system C linker frontend])
239 if test "${build}" != "${host}" ; then
240 CC_FOR_BUILD=${CC_FOR_BUILD-cc}
241 CCLD_FOR_BUILD=${CCLD_FOR_BUILD-cc}
242 else
243 CC_FOR_BUILD="\$(CC)"
244 CCLD_FOR_BUILD="\$(CC)"
245 fi
251 AC_SUBST(CC_FOR_BUILD) 246 AC_SUBST(CC_FOR_BUILD)
252 AC_SUBST(CCLD_FOR_BUILD) 247 AC_SUBST(CCLD_FOR_BUILD)
253 248
254 # libtool erroneously calls CC_FOR_BUILD HOST_CC; 249 AC_ARG_VAR(CPP_FOR_HOST,[host system C preprocessor])
255 # --host is the platform that the package is compiled for. 250 if test "$build" != "$target" || test "$build" != "$host"; then
256 HOST_CC="$CC_FOR_BUILD" 251 CPP_PROG="${CPP_FOR_HOST-cc -E}"
257 AC_SUBST(HOST_CC) 252 else
253 CPP_PROG="${CPP}"
254 fi
255 AC_DEFINE_UNQUOTED([CPP_PROG], "${CPP_PROG}", [Command name to run C preprocesso r])
258 256
259 # Detect if we have Python 257 # Detect if we have Python
260 if test x$enable_python = xno; then 258 if test x$enable_python = xno; then
261 have_python=no 259 have_python=no
262 else 260 else
263 AC_MSG_NOTICE([Checking for Python]) 261 AC_MSG_NOTICE([Checking for Python])
264 have_python=no 262 have_python=no
265 AM_PATH_PYTHON(2.4,[],[AC_MSG_WARN([Python not found])]) 263 AM_PATH_PYTHON(2.4,[],[AC_MSG_WARN([Python not found])])
266 264
267 if test -z "$PYTHON" || test "$PYTHON" = : ; then 265 if test -z "$PYTHON" || test "$PYTHON" = : ; then
268 have_python=no 266 have_python=no
269 else 267 else
270 have_python=yes 268 have_python=yes
271 fi 269 fi
272 270
273 if test x$have_python = xno ; then 271 if test x$have_python = xno ; then
274 if test x$enable_python = xyes ; then 272 if test x$enable_python = xyes ; then
275 AC_MSG_ERROR([Python explicitly requested, but a suitable Python ver sion was not found]) 273 AC_MSG_ERROR([Python explicitly requested, but a suitable Python ver sion was not found])
276 else 274 else
277 AC_MSG_WARN([Could not find a suitable version of Python]) 275 AC_MSG_WARN([Could not find a suitable version of Python])
278 fi 276 fi
279 fi 277 fi
280 fi 278 fi
281 279
282 # Detect if we can build Python bindings 280 # Detect if we can build Python bindings
283 # (needs Python, Python headers, and Pyrex) 281 # (needs Python, Python headers, and Cython)
284 if test x$enable_python_bindings = xno; then 282 if test x$enable_python_bindings = xno; then
285 have_python_bindings=no 283 have_python_bindings=no
286 else 284 else
287 AC_MSG_NOTICE([Checking to see if we can build Python bindings]) 285 AC_MSG_NOTICE([Checking to see if we can build Python bindings])
288 have_python_bindings=no 286 have_python_bindings=no
289 if test x$have_python = xyes; then 287 if test x$have_python = xyes; then
290 AC_MSG_CHECKING([for Pyrex >= 0.9.5.1]) 288 AC_MSG_CHECKING([for Cython >= 0.11.3])
291 PYREX_CHECK_VERSION(0.9.5.1, [AC_MSG_RESULT(yes) 289 CYTHON_CHECK_VERSION(0.11.3, [AC_MSG_RESULT(yes)
292 have_pyrex=yes], 290 have_cython=yes],
293 [AC_MSG_RESULT(no) 291 [AC_MSG_RESULT(no)
294 have_pyrex=no]) 292 have_cython=no])
295 293
296 AM_CHECK_PYTHON_HEADERS(have_python_headers=yes,have_python_headers=no) 294 AM_CHECK_PYTHON_HEADERS(have_python_headers=yes,have_python_headers=no)
297 295
298 if test x$have_pyrex = xyes -a x$have_python_headers = xyes ; then 296 if test x$have_cython = xyes -a x$have_python_headers = xyes ; then
299 have_python_bindings=yes 297 have_python_bindings=yes
300 fi 298 fi
301 fi 299 fi
302 300
303 if test x$have_python_bindings = xno ; then 301 if test x$have_python_bindings = xno ; then
304 if test x$enable_python_bindings = xyes ; then 302 if test x$enable_python_bindings = xyes ; then
305 AC_MSG_ERROR([Building Python bindings explicitly requested, but can 't build Python bindings because either Pyrex, Python headers or a suitable Pyth on version was not found]) 303 AC_MSG_ERROR([Building Python bindings explicitly requested, but can 't build Python bindings because either Cython, Python headers or a suitable Pyt hon version was not found])
306 else 304 else
307 AC_MSG_WARN([Couldn't find either Pyrex, the Python headers or a sui table version of Python, not building Python bindings]) 305 AC_MSG_WARN([Couldn't find either Cython, the Python headers or a su itable version of Python, not building Python bindings])
308 fi 306 fi
309 fi 307 fi
310 fi 308 fi
311 309
312 AM_CONDITIONAL(HAVE_PYTHON, test x$have_python = xyes) 310 AM_CONDITIONAL(HAVE_PYTHON, test x$have_python = xyes)
313 AM_CONDITIONAL(HAVE_PYTHON_BINDINGS, test x$have_python_bindings = xyes) 311 AM_CONDITIONAL(HAVE_PYTHON_BINDINGS, test x$have_python_bindings = xyes)
314 312
315 AC_CONFIG_FILES([Makefile 313 AC_CONFIG_FILES([Makefile
316 po/Makefile.in 314 po/Makefile.in
317 ]) 315 ])
318 AC_OUTPUT 316 AC_OUTPUT
OLDNEW
« no previous file with comments | « third_party/yasm/patched-yasm/configure ('k') | third_party/yasm/patched-yasm/frontends/Makefile.inc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698