Commit a98f6c1115aa94b4834a17dcd48f230c63503fde

Authored by Kevin Greenan
1 parent a97563f0
Exists in master and in 3 other branches v1, v2, v3

Added entry to configure.ac to avoid running autotools during normal build.

Makefile.in
... ... @@ -241,6 +241,7 @@ LIBTOOL = @LIBTOOL@
241 241 LIPO = @LIPO@
242 242 LN_S = @LN_S@
243 243 LTLIBOBJS = @LTLIBOBJS@
  244 +MAINT = @MAINT@
244 245 MAKEINFO = @MAKEINFO@
245 246 MANIFEST_TOOL = @MANIFEST_TOOL@
246 247 MKDIR_P = @MKDIR_P@
... ... @@ -323,7 +324,7 @@ all: all-recursive
323 324 .SUFFIXES:
324 325 am--refresh: Makefile
325 326 @:
326   -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
  327 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
327 328 @for dep in $?; do \
328 329 case '$(am__configure_deps)' in \
329 330 *$$dep*) \
... ... @@ -350,9 +351,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
350 351 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
351 352 $(SHELL) ./config.status --recheck
352 353  
353   -$(top_srcdir)/configure: $(am__configure_deps)
  354 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
354 355 $(am__cd) $(srcdir) && $(AUTOCONF)
355   -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
  356 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
356 357 $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
357 358 $(am__aclocal_m4_deps):
358 359  
... ... @@ -363,7 +364,7 @@ include/config.h: include/stamp-h1
363 364 include/stamp-h1: $(top_srcdir)/include/config.h.in $(top_builddir)/config.status
364 365 @rm -f include/stamp-h1
365 366 cd $(top_builddir) && $(SHELL) ./config.status include/config.h
366   -$(top_srcdir)/include/config.h.in: $(am__configure_deps)
  367 +$(top_srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
367 368 ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
368 369 rm -f include/stamp-h1
369 370 touch $@
... ...
aclocal.m4
... ... @@ -331,6 +331,42 @@ fi
331 331 rmdir .tst 2>/dev/null
332 332 AC_SUBST([am__leading_dot])])
333 333  
  334 +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
  335 +# From Jim Meyering
  336 +
  337 +# Copyright (C) 1996-2013 Free Software Foundation, Inc.
  338 +#
  339 +# This file is free software; the Free Software Foundation
  340 +# gives unlimited permission to copy and/or distribute it,
  341 +# with or without modifications, as long as this notice is preserved.
  342 +
  343 +# AM_MAINTAINER_MODE([DEFAULT-MODE])
  344 +# ----------------------------------
  345 +# Control maintainer-specific portions of Makefiles.
  346 +# Default is to disable them, unless 'enable' is passed literally.
  347 +# For symmetry, 'disable' may be passed as well. Anyway, the user
  348 +# can override the default with the --enable/--disable switch.
  349 +AC_DEFUN([AM_MAINTAINER_MODE],
  350 +[m4_case(m4_default([$1], [disable]),
  351 + [enable], [m4_define([am_maintainer_other], [disable])],
  352 + [disable], [m4_define([am_maintainer_other], [enable])],
  353 + [m4_define([am_maintainer_other], [enable])
  354 + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
  355 +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
  356 + dnl maintainer-mode's default is 'disable' unless 'enable' is passed
  357 + AC_ARG_ENABLE([maintainer-mode],
  358 + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
  359 + am_maintainer_other[ make rules and dependencies not useful
  360 + (and sometimes confusing) to the casual installer])],
  361 + [USE_MAINTAINER_MODE=$enableval],
  362 + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
  363 + AC_MSG_RESULT([$USE_MAINTAINER_MODE])
  364 + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
  365 + MAINT=$MAINTAINER_MODE_TRUE
  366 + AC_SUBST([MAINT])dnl
  367 +]
  368 +)
  369 +
334 370 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
335 371  
336 372 # Copyright (C) 1997-2013 Free Software Foundation, Inc.
... ...
configure
... ... @@ -633,6 +633,9 @@ am__EXEEXT_TRUE
633 633 LTLIBOBJS
634 634 LIBOBJS
635 635 SIMD_FLAGS
  636 +MAINT
  637 +MAINTAINER_MODE_FALSE
  638 +MAINTAINER_MODE_TRUE
636 639 CPP
637 640 OTOOL64
638 641 OTOOL
... ... @@ -746,6 +749,7 @@ enable_fast_install
746 749 with_gnu_ld
747 750 with_sysroot
748 751 enable_libtool_lock
  752 +enable_maintainer_mode
749 753 '
750 754 ac_precious_vars='build_alias
751 755 host_alias
... ... @@ -1381,6 +1385,9 @@ Optional Features:
1381 1385 --enable-fast-install[=PKGS]
1382 1386 optimize for fast installation [default=yes]
1383 1387 --disable-libtool-lock avoid locking (might break parallel builds)
  1388 + --enable-maintainer-mode
  1389 + enable make rules and dependencies not useful (and
  1390 + sometimes confusing) to the casual installer
1384 1391  
1385 1392 Optional Packages:
1386 1393 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
... ... @@ -11034,6 +11041,31 @@ ac_config_headers="$ac_config_headers include/config.h"
11034 11041  
11035 11042  
11036 11043  
  11044 +# This prevents './configure; make' from trying to run autotools.
  11045 +
  11046 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
  11047 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
  11048 + # Check whether --enable-maintainer-mode was given.
  11049 +if test "${enable_maintainer_mode+set}" = set; then :
  11050 + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
  11051 +else
  11052 + USE_MAINTAINER_MODE=no
  11053 +fi
  11054 +
  11055 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
  11056 +$as_echo "$USE_MAINTAINER_MODE" >&6; }
  11057 + if test $USE_MAINTAINER_MODE = yes; then
  11058 + MAINTAINER_MODE_TRUE=
  11059 + MAINTAINER_MODE_FALSE='#'
  11060 +else
  11061 + MAINTAINER_MODE_TRUE='#'
  11062 + MAINTAINER_MODE_FALSE=
  11063 +fi
  11064 +
  11065 + MAINT=$MAINTAINER_MODE_TRUE
  11066 +
  11067 +
  11068 +
11037 11069 # Override default CFLAGS
11038 11070 CFLAGS="-O3 -g"
11039 11071 CXXFLAGS="-O3 -g"
... ... @@ -12597,6 +12629,10 @@ else
12597 12629 am__EXEEXT_FALSE=
12598 12630 fi
12599 12631  
  12632 +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
  12633 + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
  12634 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
  12635 +fi
12600 12636  
12601 12637 : "${CONFIG_STATUS=./config.status}"
12602 12638 ac_write_fail=0
... ...
configure.ac
... ... @@ -13,6 +13,9 @@ AC_CONFIG_HEADER(include/config.h)
13 13 dnl Needed when reconfiguring with 'autoreconf -i -s'
14 14 AC_CONFIG_MACRO_DIR([m4])
15 15  
  16 +# This prevents './configure; make' from trying to run autotools.
  17 +AM_MAINTAINER_MODE([disable])
  18 +
16 19 # Override default CFLAGS
17 20 CFLAGS="-O3 -g"
18 21 CXXFLAGS="-O3 -g"
... ...
examples/Makefile.in
... ... @@ -202,6 +202,7 @@ LIBTOOL = @LIBTOOL@
202 202 LIPO = @LIPO@
203 203 LN_S = @LN_S@
204 204 LTLIBOBJS = @LTLIBOBJS@
  205 +MAINT = @MAINT@
205 206 MAKEINFO = @MAKEINFO@
206 207 MANIFEST_TOOL = @MANIFEST_TOOL@
207 208 MKDIR_P = @MKDIR_P@
... ... @@ -303,7 +304,7 @@ all: all-am
303 304  
304 305 .SUFFIXES:
305 306 .SUFFIXES: .c .lo .o .obj
306   -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
  307 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
307 308 @for dep in $?; do \
308 309 case '$(am__configure_deps)' in \
309 310 *$$dep*) \
... ... @@ -328,9 +329,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
328 329 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
329 330 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
330 331  
331   -$(top_srcdir)/configure: $(am__configure_deps)
  332 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
332 333 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
333   -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
  334 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
334 335 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
335 336 $(am__aclocal_m4_deps):
336 337 install-binPROGRAMS: $(bin_PROGRAMS)
... ...
include/config.h.in~
... ... @@ -18,6 +18,9 @@
18 18 /* Support mmx instructions */
19 19 #undef HAVE_MMX
20 20  
  21 +/* Support (PCLMULDQ) Carry-Free Muliplication */
  22 +#undef HAVE_PCLMULDQ
  23 +
21 24 /* Support SSE (Streaming SIMD Extensions) instructions */
22 25 #undef HAVE_SSE
23 26  
... ...
src/Makefile.in
... ... @@ -208,6 +208,7 @@ LIBTOOL = @LIBTOOL@
208 208 LIPO = @LIPO@
209 209 LN_S = @LN_S@
210 210 LTLIBOBJS = @LTLIBOBJS@
  211 +MAINT = @MAINT@
211 212 MAKEINFO = @MAKEINFO@
212 213 MANIFEST_TOOL = @MANIFEST_TOOL@
213 214 MKDIR_P = @MKDIR_P@
... ... @@ -293,7 +294,7 @@ all: all-am
293 294  
294 295 .SUFFIXES:
295 296 .SUFFIXES: .c .lo .o .obj
296   -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
  297 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
297 298 @for dep in $?; do \
298 299 case '$(am__configure_deps)' in \
299 300 *$$dep*) \
... ... @@ -318,9 +319,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
318 319 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
319 320 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
320 321  
321   -$(top_srcdir)/configure: $(am__configure_deps)
  322 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
322 323 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
323   -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
  324 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
324 325 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
325 326 $(am__aclocal_m4_deps):
326 327  
... ...
test/Makefile.in
... ... @@ -175,6 +175,7 @@ LIBTOOL = @LIBTOOL@
175 175 LIPO = @LIPO@
176 176 LN_S = @LN_S@
177 177 LTLIBOBJS = @LTLIBOBJS@
  178 +MAINT = @MAINT@
178 179 MAKEINFO = @MAKEINFO@
179 180 MANIFEST_TOOL = @MANIFEST_TOOL@
180 181 MKDIR_P = @MKDIR_P@
... ... @@ -258,7 +259,7 @@ all: all-am
258 259  
259 260 .SUFFIXES:
260 261 .SUFFIXES: .c .lo .o .obj
261   -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
  262 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
262 263 @for dep in $?; do \
263 264 case '$(am__configure_deps)' in \
264 265 *$$dep*) \
... ... @@ -283,9 +284,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
283 284 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
284 285 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
285 286  
286   -$(top_srcdir)/configure: $(am__configure_deps)
  287 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
287 288 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
288   -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
  289 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
289 290 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
290 291 $(am__aclocal_m4_deps):
291 292 install-binPROGRAMS: $(bin_PROGRAMS)
... ...
tools/Makefile.in
... ... @@ -199,6 +199,7 @@ LIBTOOL = @LIBTOOL@
199 199 LIPO = @LIPO@
200 200 LN_S = @LN_S@
201 201 LTLIBOBJS = @LTLIBOBJS@
  202 +MAINT = @MAINT@
202 203 MAKEINFO = @MAKEINFO@
203 204 MANIFEST_TOOL = @MANIFEST_TOOL@
204 205 MKDIR_P = @MKDIR_P@
... ... @@ -300,7 +301,7 @@ all: all-am
300 301  
301 302 .SUFFIXES:
302 303 .SUFFIXES: .c .lo .o .obj
303   -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
  304 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
304 305 @for dep in $?; do \
305 306 case '$(am__configure_deps)' in \
306 307 *$$dep*) \
... ... @@ -325,9 +326,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
325 326 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
326 327 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
327 328  
328   -$(top_srcdir)/configure: $(am__configure_deps)
  329 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
329 330 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
330   -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
  331 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
331 332 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
332 333 $(am__aclocal_m4_deps):
333 334 install-binPROGRAMS: $(bin_PROGRAMS)
... ...