Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rob Latham
MPICH-BlueGene
Commits
3c89dfe2
Commit
3c89dfe2
authored
Aug 03, 2010
by
Anthony Chan
Browse files
[svn-r6988] replaced ac_objext/ac_exeext by OBJEXT/EXEEXT and _AC_DO by PAC_RUNLOG.
parent
7cab96af
Changes
8
Hide whitespace changes
Inline
Side-by-side
confdb/aclocal_attr_alias.m4
View file @
3c89dfe2
...
...
@@ -30,7 +30,7 @@ AC_PATH_PROGS_FEATURE_CHECK(NM_G, nm, [
AC_LANG_SOURCE([int iglobal;])
],[
changequote(,)
case `${ac_path_NM_G} -B conftest.$
ac_objext
| sed -e 's|[0-9][0-9]* *[A-Z] *iglobal|XXXX|g'` in
case `${ac_path_NM_G} -B conftest.$
OBJEXT
| sed -e 's|[0-9][0-9]* *[A-Z] *iglobal|XXXX|g'` in
*XXXX*)
pac_path_NM_G="${ac_path_NM_G} -B"
pac_path_NM_G_type="BSD"
...
...
@@ -47,7 +47,7 @@ AC_PATH_PROGS_FEATURE_CHECK(NM_G, nm, [
AC_LANG_SOURCE([int iglobal;])
],[
changequote(,)
case `${ac_path_NM_G} -P conftest.$
ac_objext
| sed -e 's|iglobal *[A-Z] *[0-9][0-9]*|XXXX|g'` in
case `${ac_path_NM_G} -P conftest.$
OBJEXT
| sed -e 's|iglobal *[A-Z] *[0-9][0-9]*|XXXX|g'` in
*XXXX*)
pac_path_NM_G="${ac_path_NM_G} -P"
pac_path_NM_G_type="POSIX"
...
...
@@ -145,13 +145,13 @@ int same_addrs2( void *ptr )
])
],[
rm -f pac_conftest_other.$
ac_objext
_
AC_
DO(
cp conftest.$
ac_objext
pac_conftest_other.$
ac_objext
)
test -s pac_conftest_other.$
ac_objext
&& pac_c_attr_alias_other=yes
rm -f pac_conftest_other.$
OBJEXT
P
AC_
RUNLOG([
cp conftest.$
OBJEXT
pac_conftest_other.$
OBJEXT]
)
test -s pac_conftest_other.$
OBJEXT
&& pac_c_attr_alias_other=yes
dnl cp conftest.$ac_ext pac_conftest_other.$ac_ext
dnl echo
dnl echo "pac_conftest_other.$
ac_objext
"
dnl nm -P -g pac_conftest_other.$
ac_objext
| grep -i "mpifcmb"
dnl echo "pac_conftest_other.$
OBJEXT
"
dnl nm -P -g pac_conftest_other.$
OBJEXT
| grep -i "mpifcmb"
],[
pac_c_attr_alias_other=no
]) dnl Endof AC_COMPILE_IFELSE
...
...
@@ -161,7 +161,7 @@ if test "$pac_c_attr_alias_other" = "yes" ; then
# Save LIBS for later restoration.
saved_LIBS="$LIBS"
LIBS="pac_conftest_other.$
ac_objext
$LIBS"
LIBS="pac_conftest_other.$
OBJEXT
$LIBS"
# Link the "other" __attribute__ object file.
AC_LINK_IFELSE([
...
...
@@ -193,13 +193,13 @@ extern int same_addrs2( void *ptr );
fprintf( file, "%d\n", iaddr );
])
],[
rm -f pac_conftest_main$
ac_exeext
_
AC_
DO
([cp conftest$
ac_exeext
pac_conftest_main$
ac_exeext
])
test -x pac_conftest_main$
ac_exeext
&& pac_c_attr_alias_main=yes
rm -f pac_conftest_main$
EXEEXT
P
AC_
RUNLOG
([cp conftest$
EXEEXT
pac_conftest_main$
EXEEXT
])
test -x pac_conftest_main$
EXEEXT
&& pac_c_attr_alias_main=yes
dnl cp conftest.$ac_ext pac_conftest_main.$ac_ext
dnl echo
dnl echo "pac_conftest_main$
ac_exeext
"
dnl nm -P -g pac_conftest_main$
ac_exeext
| grep -i "mpifcmb"
dnl echo "pac_conftest_main$
EXEEXT
"
dnl nm -P -g pac_conftest_main$
EXEEXT
| grep -i "mpifcmb"
],[
pac_c_attr_alias_main=no
dnl cp conftest.$ac_ext pac_conftest_main.$ac_ext
...
...
@@ -207,7 +207,7 @@ dnl cp conftest.$ac_ext pac_conftest_main.$ac_ext
# Restore the previously saved LIBS
LIBS="$saved_LIBS"
rm -f pac_conftest_other.$
ac_objext
rm -f pac_conftest_other.$
OBJEXT
fi dnl Endof if test "$pac_c_attr_alias_other" = "yes"
if test "$pac_c_attr_alias_main" = "yes" ; then
...
...
@@ -216,12 +216,12 @@ if test "$pac_c_attr_alias_main" = "yes" ; then
# echo "PAC CROSS-COMPILING" dnl
# POSIX NM = nm -P format dnl
if test "$pac_path_NM_G_type" = "POSIX" ; then
addrs=`${pac_path_NM_G} ./pac_conftest_main$
ac_exeext
| grep -i mpifcmb | sed -e 's% *[a-zA-Z][a-zA-Z]* *[a-zA-Z] *\([0-9abcdef][0-9abcdef]*\).*%\1%g'`
addrs=`${pac_path_NM_G} ./pac_conftest_main$
EXEEXT
| grep -i mpifcmb | sed -e 's% *[a-zA-Z][a-zA-Z]* *[a-zA-Z] *\([0-9abcdef][0-9abcdef]*\).*%\1%g'`
fi
# BSD NM = nm -B format dnl
if test "$pac_path_NM_G_type" = "BSD" ; then
addrs=`${pac_path_NM_G} -g ./pac_conftest_main$
ac_exeext
| grep -i mpifcmb | sed -e "s% *\([0-9abcdef][0-9abcdef]*\) *[a-zA-Z] *[a-zA-Z][a-zA-A]*.*%\1%g"`
addrs=`${pac_path_NM_G} -g ./pac_conftest_main$
EXEEXT
| grep -i mpifcmb | sed -e "s% *\([0-9abcdef][0-9abcdef]*\) *[a-zA-Z] *[a-zA-Z][a-zA-A]*.*%\1%g"`
fi
changequote([,])
...
...
@@ -252,7 +252,7 @@ if test "$pac_c_attr_alias_main" = "yes" ; then
else # if test "$cross_compiling" != "yes"
rm -f pac_conftestval
ac_try="./pac_conftest_main$
ac_exeext
"
ac_try="./pac_conftest_main$
EXEEXT
"
if AC_TRY_EVAL(ac_try) ; then
pac_c_attr_alias_val=0
if test -s pac_conftestval ; then
...
...
@@ -271,7 +271,7 @@ if test "$pac_c_attr_alias_main" = "yes" ; then
fi
fi
dnl Endof if test "$cross_compiling" = "yes"
rm -f pac_conftest_main$
ac_exeext
rm -f pac_conftest_main$
EXEEXT
else
AC_MSG_RESULT(no! link failure)
pac_c_multi_attr_alias=no
...
...
confdb/aclocal_fc.m4
View file @
3c89dfe2
...
...
@@ -371,10 +371,10 @@ AC_COMPILE_IFELSE([
])
],[
# pac_f77compile_ok=yes
mv conftest.$
ac_objext
pac_f77conftest.$
ac_objext
mv conftest.$
OBJEXT
pac_f77conftest.$
OBJEXT
# Save original LIBS, prepend previously generated object file to LIBS
saved_LIBS="$LIBS"
LIBS="pac_f77conftest.$
ac_objext
$LIBS"
LIBS="pac_f77conftest.$
OBJEXT
$LIBS"
AC_LANG_PUSH(Fortran)
AC_LINK_IFELSE([
AC_LANG_SOURCE([
...
...
@@ -391,7 +391,7 @@ AC_COMPILE_IFELSE([
LIBS="$saved_LIBS"
AC_LANG_POP(Fortran)
# remove previously generated object file.
rm -f pac_f77conftest.$
ac_objext
rm -f pac_f77conftest.$
OBJEXT
], [
# pac_f77compile_ok=no
pac_cv_fc_and_f77=no
...
...
@@ -467,10 +467,10 @@ int $confname( int a )
])
],[
pac_compile_ok=yes
mv conftest.$
ac_objext
pac_conftest.$
ac_objext
mv conftest.$
OBJEXT
pac_conftest.$
OBJEXT
# Save LIBS and prepend object file to LIBS
saved_LIBS="$LIBS"
LIBS="pac_conftest.$
ac_objext
$LIBS"
LIBS="pac_conftest.$
OBJEXT
$LIBS"
AC_LANG_PUSH(Fortran)
AC_LINK_IFELSE([
AC_LANG_PROGRAM([],[call conf1(0)])
...
...
@@ -485,7 +485,7 @@ int $confname( int a )
])
LIBS="$saved_LIBS"
AC_LANG_POP(Fortran)
rm -f pac_conftest.$
ac_objext
rm -f pac_conftest.$
OBJEXT
])
AC_LANG_POP(C)
dnl
...
...
@@ -581,9 +581,9 @@ if test "$pac_result" = "yes" ; then
end
])
],[
mv conftest.$
ac_objext
pac_conftest.$
ac_objext
mv conftest.$
OBJEXT
pac_conftest.$
OBJEXT
saved_LIBS="$LIBS"
LIBS="pac_conftest.$
ac_objext
$LIBS"
LIBS="pac_conftest.$
OBJEXT
$LIBS"
FCFLAGS="$FCFLAGS_opt"
pac_logfile="pac_test4.log"
...
...
@@ -596,7 +596,7 @@ if test "$pac_result" = "yes" ; then
pac_result=no
])
LIBS="$saved_LIBS"
rm -f pac_conftest.$
ac_objext
rm -f pac_conftest.$
OBJEXT
],[
pac_result=no
])
...
...
@@ -774,7 +774,7 @@ AC_LINK_IFELSE([
])
],[
rm -f pac_conftest.out
PAC_RUNLOG([./conftest$
{ac_exeext}
> pac_conftest.out])
PAC_RUNLOG([./conftest$
EXEEXT
> pac_conftest.out])
if test -s pac_conftest.out ; then
pac_fc_num_model="`cat pac_conftest.out | sed -e 's/ */ /g'`"
AC_MSG_RESULT([$pac_fc_num_model])
...
...
@@ -809,7 +809,7 @@ AC_LINK_IFELSE([
])
],[
rm -f pac_conftest.out
PAC_RUNLOG([./conftest$
{ac_exeext}
> pac_conftest.out])
PAC_RUNLOG([./conftest$
EXEEXT
> pac_conftest.out])
if test -s pac_conftest.out ; then
pac_fc_num_model="`cat pac_conftest.out | sed -e 's/ */ /g'`"
AC_MSG_RESULT([$pac_fc_num_model])
...
...
@@ -855,7 +855,7 @@ AC_LINK_IFELSE([
])
],[
rm -f pac_conftest.out
PAC_RUNLOG([./conftest$
{ac_exeext}
> pac_conftest.out])
PAC_RUNLOG([./conftest$
EXEEXT
> pac_conftest.out])
if test -s pac_conftest.out ; then
pac_flag=`cat pac_conftest.out | sed -e 's/ */ /g'| tr '\012' ','`
AC_MSG_RESULT([$pac_flag])
...
...
@@ -904,7 +904,7 @@ int cisize_(char *i1p, char *i2p)
}
])
],[
PAC_RUNLOG([mv conftest.$
ac_objext
pac_conftest.$
ac_objext
])
PAC_RUNLOG([mv conftest.$
OBJEXT
pac_conftest.$
OBJEXT
])
pac_ccompile_ok=yes
],[
pac_ccompile_ok=no
...
...
@@ -913,7 +913,7 @@ AC_LANG_POP([C])
dnl
if test "$pac_ccompile_ok" = "yes" ; then
saved_LIBS="$LIBS"
LIBS="pac_conftest.$
ac_objext
$LIBS"
LIBS="pac_conftest.$
OBJEXT
$LIBS"
saved_IFS=$IFS
IFS=:
AC_LANG_PUSH([Fortran])
...
...
@@ -933,7 +933,7 @@ if test "$pac_ccompile_ok" = "yes" ; then
IFS=$saved_IFS
AC_LINK_IFELSE([],[
rm -f pac_conftest.out
PAC_RUNLOG([./conftest$
{ac_exeext}
> pac_conftest.out])
PAC_RUNLOG([./conftest$
EXEEXT
> pac_conftest.out])
if test -s pac_conftest.out ; then
sizes="`cat pac_conftest.out | sed -e 's/ */ /g'`"
pac_flag="$pac_flag { $sizes },"
...
...
@@ -951,6 +951,6 @@ if test "$pac_ccompile_ok" = "yes" ; then
ifelse([$1],[],[PAC_FC_INTEGER_MODEL_MAP=$pac_flag],[$1=$pac_flag])
AC_LANG_POP([Fortran])
LIBS="$saved_LIBS"
rm -f pac_conftest.$
ac_objext
rm -f pac_conftest.$
OBJEXT
fi
])
src/mpi/romio/confdb/aclocal_attr_alias.m4
View file @
3c89dfe2
...
...
@@ -30,7 +30,7 @@ AC_PATH_PROGS_FEATURE_CHECK(NM_G, nm, [
AC_LANG_SOURCE([int iglobal;])
],[
changequote(,)
case `${ac_path_NM_G} -B conftest.$
ac_objext
| sed -e 's|[0-9][0-9]* *[A-Z] *iglobal|XXXX|g'` in
case `${ac_path_NM_G} -B conftest.$
OBJEXT
| sed -e 's|[0-9][0-9]* *[A-Z] *iglobal|XXXX|g'` in
*XXXX*)
pac_path_NM_G="${ac_path_NM_G} -B"
pac_path_NM_G_type="BSD"
...
...
@@ -47,7 +47,7 @@ AC_PATH_PROGS_FEATURE_CHECK(NM_G, nm, [
AC_LANG_SOURCE([int iglobal;])
],[
changequote(,)
case `${ac_path_NM_G} -P conftest.$
ac_objext
| sed -e 's|iglobal *[A-Z] *[0-9][0-9]*|XXXX|g'` in
case `${ac_path_NM_G} -P conftest.$
OBJEXT
| sed -e 's|iglobal *[A-Z] *[0-9][0-9]*|XXXX|g'` in
*XXXX*)
pac_path_NM_G="${ac_path_NM_G} -P"
pac_path_NM_G_type="POSIX"
...
...
@@ -145,13 +145,13 @@ int same_addrs2( void *ptr )
])
],[
rm -f pac_conftest_other.$
ac_objext
_
AC_
DO(
cp conftest.$
ac_objext
pac_conftest_other.$
ac_objext
)
test -s pac_conftest_other.$
ac_objext
&& pac_c_attr_alias_other=yes
rm -f pac_conftest_other.$
OBJEXT
P
AC_
RUNLOG([
cp conftest.$
OBJEXT
pac_conftest_other.$
OBJEXT]
)
test -s pac_conftest_other.$
OBJEXT
&& pac_c_attr_alias_other=yes
dnl cp conftest.$ac_ext pac_conftest_other.$ac_ext
dnl echo
dnl echo "pac_conftest_other.$
ac_objext
"
dnl nm -P -g pac_conftest_other.$
ac_objext
| grep -i "mpifcmb"
dnl echo "pac_conftest_other.$
OBJEXT
"
dnl nm -P -g pac_conftest_other.$
OBJEXT
| grep -i "mpifcmb"
],[
pac_c_attr_alias_other=no
]) dnl Endof AC_COMPILE_IFELSE
...
...
@@ -161,7 +161,7 @@ if test "$pac_c_attr_alias_other" = "yes" ; then
# Save LIBS for later restoration.
saved_LIBS="$LIBS"
LIBS="pac_conftest_other.$
ac_objext
$LIBS"
LIBS="pac_conftest_other.$
OBJEXT
$LIBS"
# Link the "other" __attribute__ object file.
AC_LINK_IFELSE([
...
...
@@ -193,13 +193,13 @@ extern int same_addrs2( void *ptr );
fprintf( file, "%d\n", iaddr );
])
],[
rm -f pac_conftest_main$
ac_exeext
_
AC_
DO
([cp conftest$
ac_exeext
pac_conftest_main$
ac_exeext
])
test -x pac_conftest_main$
ac_exeext
&& pac_c_attr_alias_main=yes
rm -f pac_conftest_main$
EXEEXT
P
AC_
RUNLOG
([cp conftest$
EXEEXT
pac_conftest_main$
EXEEXT
])
test -x pac_conftest_main$
EXEEXT
&& pac_c_attr_alias_main=yes
dnl cp conftest.$ac_ext pac_conftest_main.$ac_ext
dnl echo
dnl echo "pac_conftest_main$
ac_exeext
"
dnl nm -P -g pac_conftest_main$
ac_exeext
| grep -i "mpifcmb"
dnl echo "pac_conftest_main$
EXEEXT
"
dnl nm -P -g pac_conftest_main$
EXEEXT
| grep -i "mpifcmb"
],[
pac_c_attr_alias_main=no
dnl cp conftest.$ac_ext pac_conftest_main.$ac_ext
...
...
@@ -207,7 +207,7 @@ dnl cp conftest.$ac_ext pac_conftest_main.$ac_ext
# Restore the previously saved LIBS
LIBS="$saved_LIBS"
rm -f pac_conftest_other.$
ac_objext
rm -f pac_conftest_other.$
OBJEXT
fi dnl Endof if test "$pac_c_attr_alias_other" = "yes"
if test "$pac_c_attr_alias_main" = "yes" ; then
...
...
@@ -216,12 +216,12 @@ if test "$pac_c_attr_alias_main" = "yes" ; then
# echo "PAC CROSS-COMPILING" dnl
# POSIX NM = nm -P format dnl
if test "$pac_path_NM_G_type" = "POSIX" ; then
addrs=`${pac_path_NM_G} ./pac_conftest_main$
ac_exeext
| grep -i mpifcmb | sed -e 's% *[a-zA-Z][a-zA-Z]* *[a-zA-Z] *\([0-9abcdef][0-9abcdef]*\).*%\1%g'`
addrs=`${pac_path_NM_G} ./pac_conftest_main$
EXEEXT
| grep -i mpifcmb | sed -e 's% *[a-zA-Z][a-zA-Z]* *[a-zA-Z] *\([0-9abcdef][0-9abcdef]*\).*%\1%g'`
fi
# BSD NM = nm -B format dnl
if test "$pac_path_NM_G_type" = "BSD" ; then
addrs=`${pac_path_NM_G} -g ./pac_conftest_main$
ac_exeext
| grep -i mpifcmb | sed -e "s% *\([0-9abcdef][0-9abcdef]*\) *[a-zA-Z] *[a-zA-Z][a-zA-A]*.*%\1%g"`
addrs=`${pac_path_NM_G} -g ./pac_conftest_main$
EXEEXT
| grep -i mpifcmb | sed -e "s% *\([0-9abcdef][0-9abcdef]*\) *[a-zA-Z] *[a-zA-Z][a-zA-A]*.*%\1%g"`
fi
changequote([,])
...
...
@@ -252,7 +252,7 @@ if test "$pac_c_attr_alias_main" = "yes" ; then
else # if test "$cross_compiling" != "yes"
rm -f pac_conftestval
ac_try="./pac_conftest_main$
ac_exeext
"
ac_try="./pac_conftest_main$
EXEEXT
"
if AC_TRY_EVAL(ac_try) ; then
pac_c_attr_alias_val=0
if test -s pac_conftestval ; then
...
...
@@ -271,7 +271,7 @@ if test "$pac_c_attr_alias_main" = "yes" ; then
fi
fi
dnl Endof if test "$cross_compiling" = "yes"
rm -f pac_conftest_main$
ac_exeext
rm -f pac_conftest_main$
EXEEXT
else
AC_MSG_RESULT(no! link failure)
pac_c_multi_attr_alias=no
...
...
src/mpi/romio/confdb/aclocal_fc.m4
View file @
3c89dfe2
...
...
@@ -371,10 +371,10 @@ AC_COMPILE_IFELSE([
])
],[
# pac_f77compile_ok=yes
mv conftest.$
ac_objext
pac_f77conftest.$
ac_objext
mv conftest.$
OBJEXT
pac_f77conftest.$
OBJEXT
# Save original LIBS, prepend previously generated object file to LIBS
saved_LIBS="$LIBS"
LIBS="pac_f77conftest.$
ac_objext
$LIBS"
LIBS="pac_f77conftest.$
OBJEXT
$LIBS"
AC_LANG_PUSH(Fortran)
AC_LINK_IFELSE([
AC_LANG_SOURCE([
...
...
@@ -391,7 +391,7 @@ AC_COMPILE_IFELSE([
LIBS="$saved_LIBS"
AC_LANG_POP(Fortran)
# remove previously generated object file.
rm -f pac_f77conftest.$
ac_objext
rm -f pac_f77conftest.$
OBJEXT
], [
# pac_f77compile_ok=no
pac_cv_fc_and_f77=no
...
...
@@ -467,10 +467,10 @@ int $confname( int a )
])
],[
pac_compile_ok=yes
mv conftest.$
ac_objext
pac_conftest.$
ac_objext
mv conftest.$
OBJEXT
pac_conftest.$
OBJEXT
# Save LIBS and prepend object file to LIBS
saved_LIBS="$LIBS"
LIBS="pac_conftest.$
ac_objext
$LIBS"
LIBS="pac_conftest.$
OBJEXT
$LIBS"
AC_LANG_PUSH(Fortran)
AC_LINK_IFELSE([
AC_LANG_PROGRAM([],[call conf1(0)])
...
...
@@ -485,7 +485,7 @@ int $confname( int a )
])
LIBS="$saved_LIBS"
AC_LANG_POP(Fortran)
rm -f pac_conftest.$
ac_objext
rm -f pac_conftest.$
OBJEXT
])
AC_LANG_POP(C)
dnl
...
...
@@ -581,9 +581,9 @@ if test "$pac_result" = "yes" ; then
end
])
],[
mv conftest.$
ac_objext
pac_conftest.$
ac_objext
mv conftest.$
OBJEXT
pac_conftest.$
OBJEXT
saved_LIBS="$LIBS"
LIBS="pac_conftest.$
ac_objext
$LIBS"
LIBS="pac_conftest.$
OBJEXT
$LIBS"
FCFLAGS="$FCFLAGS_opt"
pac_logfile="pac_test4.log"
...
...
@@ -596,7 +596,7 @@ if test "$pac_result" = "yes" ; then
pac_result=no
])
LIBS="$saved_LIBS"
rm -f pac_conftest.$
ac_objext
rm -f pac_conftest.$
OBJEXT
],[
pac_result=no
])
...
...
@@ -774,7 +774,7 @@ AC_LINK_IFELSE([
])
],[
rm -f pac_conftest.out
PAC_RUNLOG([./conftest$
{ac_exeext}
> pac_conftest.out])
PAC_RUNLOG([./conftest$
EXEEXT
> pac_conftest.out])
if test -s pac_conftest.out ; then
pac_fc_num_model="`cat pac_conftest.out | sed -e 's/ */ /g'`"
AC_MSG_RESULT([$pac_fc_num_model])
...
...
@@ -809,7 +809,7 @@ AC_LINK_IFELSE([
])
],[
rm -f pac_conftest.out
PAC_RUNLOG([./conftest$
{ac_exeext}
> pac_conftest.out])
PAC_RUNLOG([./conftest$
EXEEXT
> pac_conftest.out])
if test -s pac_conftest.out ; then
pac_fc_num_model="`cat pac_conftest.out | sed -e 's/ */ /g'`"
AC_MSG_RESULT([$pac_fc_num_model])
...
...
@@ -855,7 +855,7 @@ AC_LINK_IFELSE([
])
],[
rm -f pac_conftest.out
PAC_RUNLOG([./conftest$
{ac_exeext}
> pac_conftest.out])
PAC_RUNLOG([./conftest$
EXEEXT
> pac_conftest.out])
if test -s pac_conftest.out ; then
pac_flag=`cat pac_conftest.out | sed -e 's/ */ /g'| tr '\012' ','`
AC_MSG_RESULT([$pac_flag])
...
...
@@ -904,7 +904,7 @@ int cisize_(char *i1p, char *i2p)
}
])
],[
PAC_RUNLOG([mv conftest.$
ac_objext
pac_conftest.$
ac_objext
])
PAC_RUNLOG([mv conftest.$
OBJEXT
pac_conftest.$
OBJEXT
])
pac_ccompile_ok=yes
],[
pac_ccompile_ok=no
...
...
@@ -913,7 +913,7 @@ AC_LANG_POP([C])
dnl
if test "$pac_ccompile_ok" = "yes" ; then
saved_LIBS="$LIBS"
LIBS="pac_conftest.$
ac_objext
$LIBS"
LIBS="pac_conftest.$
OBJEXT
$LIBS"
saved_IFS=$IFS
IFS=:
AC_LANG_PUSH([Fortran])
...
...
@@ -933,7 +933,7 @@ if test "$pac_ccompile_ok" = "yes" ; then
IFS=$saved_IFS
AC_LINK_IFELSE([],[
rm -f pac_conftest.out
PAC_RUNLOG([./conftest$
{ac_exeext}
> pac_conftest.out])
PAC_RUNLOG([./conftest$
EXEEXT
> pac_conftest.out])
if test -s pac_conftest.out ; then
sizes="`cat pac_conftest.out | sed -e 's/ */ /g'`"
pac_flag="$pac_flag { $sizes },"
...
...
@@ -951,6 +951,6 @@ if test "$pac_ccompile_ok" = "yes" ; then
ifelse([$1],[],[PAC_FC_INTEGER_MODEL_MAP=$pac_flag],[$1=$pac_flag])
AC_LANG_POP([Fortran])
LIBS="$saved_LIBS"
rm -f pac_conftest.$
ac_objext
rm -f pac_conftest.$
OBJEXT
fi
])
src/mpl/confdb/aclocal_attr_alias.m4
View file @
3c89dfe2
...
...
@@ -30,7 +30,7 @@ AC_PATH_PROGS_FEATURE_CHECK(NM_G, nm, [
AC_LANG_SOURCE([int iglobal;])
],[
changequote(,)
case `${ac_path_NM_G} -B conftest.$
ac_objext
| sed -e 's|[0-9][0-9]* *[A-Z] *iglobal|XXXX|g'` in
case `${ac_path_NM_G} -B conftest.$
OBJEXT
| sed -e 's|[0-9][0-9]* *[A-Z] *iglobal|XXXX|g'` in
*XXXX*)
pac_path_NM_G="${ac_path_NM_G} -B"
pac_path_NM_G_type="BSD"
...
...
@@ -47,7 +47,7 @@ AC_PATH_PROGS_FEATURE_CHECK(NM_G, nm, [
AC_LANG_SOURCE([int iglobal;])
],[
changequote(,)
case `${ac_path_NM_G} -P conftest.$
ac_objext
| sed -e 's|iglobal *[A-Z] *[0-9][0-9]*|XXXX|g'` in
case `${ac_path_NM_G} -P conftest.$
OBJEXT
| sed -e 's|iglobal *[A-Z] *[0-9][0-9]*|XXXX|g'` in
*XXXX*)
pac_path_NM_G="${ac_path_NM_G} -P"
pac_path_NM_G_type="POSIX"
...
...
@@ -145,13 +145,13 @@ int same_addrs2( void *ptr )
])
],[
rm -f pac_conftest_other.$
ac_objext
_
AC_
DO(
cp conftest.$
ac_objext
pac_conftest_other.$
ac_objext
)
test -s pac_conftest_other.$
ac_objext
&& pac_c_attr_alias_other=yes
rm -f pac_conftest_other.$
OBJEXT
P
AC_
RUNLOG([
cp conftest.$
OBJEXT
pac_conftest_other.$
OBJEXT]
)
test -s pac_conftest_other.$
OBJEXT
&& pac_c_attr_alias_other=yes
dnl cp conftest.$ac_ext pac_conftest_other.$ac_ext
dnl echo
dnl echo "pac_conftest_other.$
ac_objext
"
dnl nm -P -g pac_conftest_other.$
ac_objext
| grep -i "mpifcmb"
dnl echo "pac_conftest_other.$
OBJEXT
"
dnl nm -P -g pac_conftest_other.$
OBJEXT
| grep -i "mpifcmb"
],[
pac_c_attr_alias_other=no
]) dnl Endof AC_COMPILE_IFELSE
...
...
@@ -161,7 +161,7 @@ if test "$pac_c_attr_alias_other" = "yes" ; then
# Save LIBS for later restoration.
saved_LIBS="$LIBS"
LIBS="pac_conftest_other.$
ac_objext
$LIBS"
LIBS="pac_conftest_other.$
OBJEXT
$LIBS"
# Link the "other" __attribute__ object file.
AC_LINK_IFELSE([
...
...
@@ -193,13 +193,13 @@ extern int same_addrs2( void *ptr );
fprintf( file, "%d\n", iaddr );
])
],[
rm -f pac_conftest_main$
ac_exeext
_
AC_
DO
([cp conftest$
ac_exeext
pac_conftest_main$
ac_exeext
])
test -x pac_conftest_main$
ac_exeext
&& pac_c_attr_alias_main=yes
rm -f pac_conftest_main$
EXEEXT
P
AC_
RUNLOG
([cp conftest$
EXEEXT
pac_conftest_main$
EXEEXT
])
test -x pac_conftest_main$
EXEEXT
&& pac_c_attr_alias_main=yes
dnl cp conftest.$ac_ext pac_conftest_main.$ac_ext
dnl echo
dnl echo "pac_conftest_main$
ac_exeext
"
dnl nm -P -g pac_conftest_main$
ac_exeext
| grep -i "mpifcmb"
dnl echo "pac_conftest_main$
EXEEXT
"
dnl nm -P -g pac_conftest_main$
EXEEXT
| grep -i "mpifcmb"
],[
pac_c_attr_alias_main=no
dnl cp conftest.$ac_ext pac_conftest_main.$ac_ext
...
...
@@ -207,7 +207,7 @@ dnl cp conftest.$ac_ext pac_conftest_main.$ac_ext
# Restore the previously saved LIBS
LIBS="$saved_LIBS"
rm -f pac_conftest_other.$
ac_objext
rm -f pac_conftest_other.$
OBJEXT
fi dnl Endof if test "$pac_c_attr_alias_other" = "yes"
if test "$pac_c_attr_alias_main" = "yes" ; then
...
...
@@ -216,12 +216,12 @@ if test "$pac_c_attr_alias_main" = "yes" ; then
# echo "PAC CROSS-COMPILING" dnl
# POSIX NM = nm -P format dnl
if test "$pac_path_NM_G_type" = "POSIX" ; then
addrs=`${pac_path_NM_G} ./pac_conftest_main$
ac_exeext
| grep -i mpifcmb | sed -e 's% *[a-zA-Z][a-zA-Z]* *[a-zA-Z] *\([0-9abcdef][0-9abcdef]*\).*%\1%g'`
addrs=`${pac_path_NM_G} ./pac_conftest_main$
EXEEXT
| grep -i mpifcmb | sed -e 's% *[a-zA-Z][a-zA-Z]* *[a-zA-Z] *\([0-9abcdef][0-9abcdef]*\).*%\1%g'`
fi
# BSD NM = nm -B format dnl
if test "$pac_path_NM_G_type" = "BSD" ; then
addrs=`${pac_path_NM_G} -g ./pac_conftest_main$
ac_exeext
| grep -i mpifcmb | sed -e "s% *\([0-9abcdef][0-9abcdef]*\) *[a-zA-Z] *[a-zA-Z][a-zA-A]*.*%\1%g"`
addrs=`${pac_path_NM_G} -g ./pac_conftest_main$
EXEEXT
| grep -i mpifcmb | sed -e "s% *\([0-9abcdef][0-9abcdef]*\) *[a-zA-Z] *[a-zA-Z][a-zA-A]*.*%\1%g"`
fi
changequote([,])
...
...
@@ -252,7 +252,7 @@ if test "$pac_c_attr_alias_main" = "yes" ; then
else # if test "$cross_compiling" != "yes"
rm -f pac_conftestval
ac_try="./pac_conftest_main$
ac_exeext
"
ac_try="./pac_conftest_main$
EXEEXT
"
if AC_TRY_EVAL(ac_try) ; then
pac_c_attr_alias_val=0
if test -s pac_conftestval ; then
...
...
@@ -271,7 +271,7 @@ if test "$pac_c_attr_alias_main" = "yes" ; then
fi
fi
dnl Endof if test "$cross_compiling" = "yes"
rm -f pac_conftest_main$
ac_exeext
rm -f pac_conftest_main$
EXEEXT
else
AC_MSG_RESULT(no! link failure)
pac_c_multi_attr_alias=no
...
...
src/mpl/confdb/aclocal_fc.m4
View file @
3c89dfe2
...
...
@@ -371,10 +371,10 @@ AC_COMPILE_IFELSE([
])
],[
# pac_f77compile_ok=yes
mv conftest.$
ac_objext
pac_f77conftest.$
ac_objext
mv conftest.$
OBJEXT
pac_f77conftest.$
OBJEXT
# Save original LIBS, prepend previously generated object file to LIBS
saved_LIBS="$LIBS"
LIBS="pac_f77conftest.$
ac_objext
$LIBS"
LIBS="pac_f77conftest.$
OBJEXT
$LIBS"
AC_LANG_PUSH(Fortran)
AC_LINK_IFELSE([
AC_LANG_SOURCE([
...
...
@@ -391,7 +391,7 @@ AC_COMPILE_IFELSE([
LIBS="$saved_LIBS"
AC_LANG_POP(Fortran)
# remove previously generated object file.
rm -f pac_f77conftest.$
ac_objext
rm -f pac_f77conftest.$
OBJEXT
], [
# pac_f77compile_ok=no
pac_cv_fc_and_f77=no
...
...
@@ -467,10 +467,10 @@ int $confname( int a )
])
],[
pac_compile_ok=yes
mv conftest.$
ac_objext
pac_conftest.$
ac_objext
mv conftest.$
OBJEXT
pac_conftest.$
OBJEXT
# Save LIBS and prepend object file to LIBS
saved_LIBS="$LIBS"
LIBS="pac_conftest.$
ac_objext
$LIBS"
LIBS="pac_conftest.$
OBJEXT
$LIBS"
AC_LANG_PUSH(Fortran)
AC_LINK_IFELSE([
AC_LANG_PROGRAM([],[call conf1(0)])
...
...
@@ -485,7 +485,7 @@ int $confname( int a )
])
LIBS="$saved_LIBS"
AC_LANG_POP(Fortran)
rm -f pac_conftest.$
ac_objext
rm -f pac_conftest.$
OBJEXT
])
AC_LANG_POP(C)
dnl
...
...
@@ -581,9 +581,9 @@ if test "$pac_result" = "yes" ; then
end
])
],[
mv conftest.$
ac_objext
pac_conftest.$
ac_objext
mv conftest.$
OBJEXT
pac_conftest.$
OBJEXT
saved_LIBS="$LIBS"
LIBS="pac_conftest.$
ac_objext
$LIBS"
LIBS="pac_conftest.$
OBJEXT
$LIBS"
FCFLAGS="$FCFLAGS_opt"
pac_logfile="pac_test4.log"
...
...
@@ -596,7 +596,7 @@ if test "$pac_result" = "yes" ; then
pac_result=no
])
LIBS="$saved_LIBS"
rm -f pac_conftest.$
ac_objext
rm -f pac_conftest.$
OBJEXT
],[
pac_result=no
])
...
...
@@ -774,7 +774,7 @@ AC_LINK_IFELSE([
])
],[
rm -f pac_conftest.out
PAC_RUNLOG([./conftest$
{ac_exeext}
> pac_conftest.out])
PAC_RUNLOG([./conftest$
EXEEXT
> pac_conftest.out])
if test -s pac_conftest.out ; then
pac_fc_num_model="`cat pac_conftest.out | sed -e 's/ */ /g'`"
AC_MSG_RESULT([$pac_fc_num_model])
...
...
@@ -809,7 +809,7 @@ AC_LINK_IFELSE([
])
],[
rm -f pac_conftest.out
PAC_RUNLOG([./conftest$
{ac_exeext}
> pac_conftest.out])
PAC_RUNLOG([./conftest$
EXEEXT
> pac_conftest.out])
if test -s pac_conftest.out ; then
pac_fc_num_model="`cat pac_conftest.out | sed -e 's/ */ /g'`"
AC_MSG_RESULT([$pac_fc_num_model])
...
...
@@ -855,7 +855,7 @@ AC_LINK_IFELSE([
])
],[
rm -f pac_conftest.out
PAC_RUNLOG([./conftest$
{ac_exeext}
> pac_conftest.out])
PAC_RUNLOG([./conftest$
EXEEXT
> pac_conftest.out])
if test -s pac_conftest.out ; then
pac_flag=`cat pac_conftest.out | sed -e 's/ */ /g'| tr '\012' ','`
AC_MSG_RESULT([$pac_flag])
...
...
@@ -904,7 +904,7 @@ int cisize_(char *i1p, char *i2p)
}
])
],[
PAC_RUNLOG([mv conftest.$
ac_objext
pac_conftest.$
ac_objext
])
PAC_RUNLOG([mv conftest.$
OBJEXT
pac_conftest.$
OBJEXT
])
pac_ccompile_ok=yes
],[
pac_ccompile_ok=no
...
...
@@ -913,7 +913,7 @@ AC_LANG_POP([C])
dnl
if test "$pac_ccompile_ok" = "yes" ; then
saved_LIBS="$LIBS"
LIBS="pac_conftest.$
ac_objext
$LIBS"
LIBS="pac_conftest.$
OBJEXT
$LIBS"
saved_IFS=$IFS
IFS=:
AC_LANG_PUSH([Fortran])
...
...
@@ -933,7 +933,7 @@ if test "$pac_ccompile_ok" = "yes" ; then
IFS=$saved_IFS
AC_LINK_IFELSE([],[