Skip to content

Commit bc89926

Browse files
author
bjoo
committed
Checked regressions pass with new QIO. Added autoconf magic for BAGEL Generated Clover Term apply. Passes those regressions too. Robert still has a few things to add and then itll be a new release.
1 parent 3fb8993 commit bc89926

20 files changed

+914
-498
lines changed

Makefile.in

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Makefile.in generated by automake 1.9.2 from Makefile.am.
1+
# Makefile.in generated by automake 1.9.6 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-
# 2003, 2004 Free Software Foundation, Inc.
5+
# 2003, 2004, 2005 Free Software Foundation, Inc.
66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
88
# with or without modifications, as long as this notice is preserved.
@@ -91,12 +91,21 @@ AUTOCONF = @AUTOCONF@
9191
AUTOHEADER = @AUTOHEADER@
9292
AUTOMAKE = @AUTOMAKE@
9393
AWK = @AWK@
94+
BAGEL_CLOVER_CONFIG = @BAGEL_CLOVER_CONFIG@
95+
BAGEL_CLOVER_CXXFLAGS = @BAGEL_CLOVER_CXXFLAGS@
96+
BAGEL_CLOVER_DSLASH_CXXFLAGS = @BAGEL_CLOVER_DSLASH_CXXFLAGS@
97+
BAGEL_CLOVER_DSLASH_LDFLAGS = @BAGEL_CLOVER_DSLASH_LDFLAGS@
98+
BAGEL_CLOVER_DSLASH_LIBS = @BAGEL_CLOVER_DSLASH_LIBS@
99+
BAGEL_CLOVER_LDFLAGS = @BAGEL_CLOVER_LDFLAGS@
100+
BAGEL_CLOVER_LIBS = @BAGEL_CLOVER_LIBS@
94101
BAGEL_WILSON_DSLASH_CONFIG = @BAGEL_WILSON_DSLASH_CONFIG@
95102
BAGEL_WILSON_DSLASH_CXXFLAGS = @BAGEL_WILSON_DSLASH_CXXFLAGS@
96103
BAGEL_WILSON_DSLASH_LDFLAGS = @BAGEL_WILSON_DSLASH_LDFLAGS@
97104
BAGEL_WILSON_DSLASH_LIBS = @BAGEL_WILSON_DSLASH_LIBS@
98105
BUILD_ASQTAD_CPS_INVERTER_WRAPPER_FALSE = @BUILD_ASQTAD_CPS_INVERTER_WRAPPER_FALSE@
99106
BUILD_ASQTAD_CPS_INVERTER_WRAPPER_TRUE = @BUILD_ASQTAD_CPS_INVERTER_WRAPPER_TRUE@
107+
BUILD_BAGEL_CLOVER_APPLY_FALSE = @BUILD_BAGEL_CLOVER_APPLY_FALSE@
108+
BUILD_BAGEL_CLOVER_APPLY_TRUE = @BUILD_BAGEL_CLOVER_APPLY_TRUE@
100109
BUILD_CG_DWF_ALTIVEC_FALSE = @BUILD_CG_DWF_ALTIVEC_FALSE@
101110
BUILD_CG_DWF_ALTIVEC_TRUE = @BUILD_CG_DWF_ALTIVEC_TRUE@
102111
BUILD_CG_DWF_BLUELIGHT_FALSE = @BUILD_CG_DWF_BLUELIGHT_FALSE@
@@ -299,7 +308,13 @@ uninstall-info-am:
299308
# (which will cause the Makefiles to be regenerated when you run `make');
300309
# (2) otherwise, pass the desired values on the `make' command line.
301310
$(RECURSIVE_TARGETS):
302-
@set fnord $$MAKEFLAGS; amf=$$2; \
311+
@failcom='exit 1'; \
312+
for f in x $$MAKEFLAGS; do \
313+
case $$f in \
314+
*=* | --[!k]*);; \
315+
*k*) failcom='fail=yes';; \
316+
esac; \
317+
done; \
303318
dot_seen=no; \
304319
target=`echo $@ | sed s/-recursive//`; \
305320
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -311,15 +326,21 @@ $(RECURSIVE_TARGETS):
311326
local_target="$$target"; \
312327
fi; \
313328
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
314-
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
329+
|| eval $$failcom; \
315330
done; \
316331
if test "$$dot_seen" = "no"; then \
317332
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
318333
fi; test -z "$$fail"
319334

320335
mostlyclean-recursive clean-recursive distclean-recursive \
321336
maintainer-clean-recursive:
322-
@set fnord $$MAKEFLAGS; amf=$$2; \
337+
@failcom='exit 1'; \
338+
for f in x $$MAKEFLAGS; do \
339+
case $$f in \
340+
*=* | --[!k]*);; \
341+
*k*) failcom='fail=yes';; \
342+
esac; \
343+
done; \
323344
dot_seen=no; \
324345
case "$@" in \
325346
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -340,7 +361,7 @@ maintainer-clean-recursive:
340361
local_target="$$target"; \
341362
fi; \
342363
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
343-
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
364+
|| eval $$failcom; \
344365
done && test -z "$$fail"
345366
tags-recursive:
346367
list='$(SUBDIRS)'; for subdir in $$list; do \

acinclude.m4

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,4 +159,45 @@ dnl - set the parallel compiler environment
159159
]
160160
)
161161

162+
AC_DEFUN(
163+
PAC_BAGEL_CLOVER_LINK_CXX_FUNC,
164+
[
165+
dnl - set local parallel compiler environments
166+
dnl so input variables can be CFLAGS, LDFLAGS or LIBS
167+
pac_BAGEL_CLOVER_CFLAGS="$1"
168+
pac_BAGEL_CLOVER_LDFLAGS="$2"
169+
pac_BAGEL_CLOVER_LIBS="$3"
170+
AC_LANG_SAVE
171+
AC_LANG_CPLUSPLUS
172+
dnl - save the original environment
173+
pac_saved_CXXFLAGS="$CXXFLAGS"
174+
pac_saved_LDFLAGS="$LDFLAGS"
175+
pac_saved_LIBS="$LIBS"
176+
dnl - set the parallel compiler environment
177+
CXXFLAGS="$CXXFLAGS $pac_BAGEL_CLOVER_CFLAGS"
178+
LDFLAGS="$LDFLAGS $pac_BAGEL_CLOVER_LDFLAGS"
179+
LIBS="$LIBS $pac_BAGEL_CLOVER_LIBS"
180+
AC_TRY_LINK(
181+
[
182+
#include <bagel_clover.h>
183+
],
184+
[
185+
int argc ; char **argv ;
186+
$4
187+
$5
188+
],
189+
[pac_bagel_clover_working=yes],
190+
[pac_bagel_clover_working=no]
191+
)
192+
CXXFLAGS="$pac_saved_CXXFLAGS"
193+
LDFLAGS="$pac_saved_LDFLAGS"
194+
LIBS="$pac_saved_LIBS"
195+
AC_LANG_RESTORE
196+
if test "X${pac_bagel_clover_working}X" = "XyesX" ; then
197+
ifelse([$6],,:,[$6])
198+
else
199+
ifelse([$7],,:,[$7])
200+
fi
201+
]
202+
)
162203

0 commit comments

Comments
 (0)