diff options
Diffstat (limited to 'lib/make/configure.in')
| -rw-r--r-- | lib/make/configure.in | 96 |
1 files changed, 55 insertions, 41 deletions
diff --git a/lib/make/configure.in b/lib/make/configure.in index 7e5a90d1..5ebcfb60 100644 --- a/lib/make/configure.in +++ b/lib/make/configure.in @@ -162,44 +162,6 @@ cat >> cctk_Archdefs.h <<EOF EOF -######################################################################### -#Check for extra stuff -######################################################################### -cat > cctk_Extradefs.h <<EOF -/* Stuff from extra packages */ -#ifndef _CCTK_EXTRADEFS_H_ -#define _CCTK_EXTRADEFS_H_ -EOF - -cat > make.extra.defn <<EOF -# Stuff from extra packages -EOF - -for extra in `ls $srcdir/extras` -do - if test -d $srcdir/extras/$extra ; then - if test -x $srcdir/extras/$extra/setup.sh ; then - # Put some comment lines in the files. - CCTK_WriteLine cctk_Extradefs.h "" - CCTK_WriteLine cctk_Extradefs.h "/*$extra definitions*/" - CCTK_WriteLine make.extra.defn "" - CCTK_WriteLine make.extra.defn "# $extra definitions" - # Call the setup script - . $srcdir/extras/$extra/setup.sh - # Put some more comments in - CCTK_WriteLine make.extra.defn "#End of $extra definitions" - CCTK_WriteLine make.extra.defn "" - fi - fi -done - -# Finish the cctk_Extradefs.h file -cat >> cctk_Extradefs.h <<EOF -#endif /*_CCTK_EXTRADEFS_H_*/ -EOF - - - ########################################################################## ######################################################################### @@ -360,10 +322,8 @@ AC_SUBST(F77FLAGS) #: ${F90FLAGS="$CFLAGS"} #: ${F77FLAGS="$CFLAGS"} -dnl Checks for library functions. -# Do we have mkdir(2) ? -CCTK_CHECK_FUNCS(mkdir) +dnl Checks for library functions. # Do we have scandir(3) ? # For Solaris we should search in /usr/ucblib/libucb.a @@ -554,6 +514,22 @@ CCTK_CHECK_FUNC(crypt, , CCTK_CHECK_LIB_FUNC(crypt, crypt)) +dnl Checks for availability of pthreads library. + +if test "X$PTHREADS" = "Xyes"; then + PTHREAD_LIBS= + CCTK_CHECK_LIB(c_r, main,[PTHREAD_LIBS="c_r" LIBS="$LIBS c_r"],,) + CCTK_CHECK_LIB(pthread, + main, + PTHREAD_LIBS="pthread $PTHREAD_LIBS", + CCTK_CHECK_LIB(pthreads, + main, + PTHREAD_LIBS="pthreads $PTHREAD_LIBS", + ,) + ,) +fi + + AC_SUBST(LIBDIRS) AC_SUBST(PACKAGE_DIR) @@ -1082,6 +1058,44 @@ AC_SUBST(PERL_BACKUP_NECESSARY) AC_DEFINE_UNQUOTED(CCTK_L2_CACHELINE_BYTES, $L2_CACHELINE_BYTES) AC_DEFINE_UNQUOTED(CCTK_L2_CACHE_SIZE, $L2_CACHE_SIZE) +######################################################################### +#Check for extra stuff +######################################################################### +cat > cctk_Extradefs.h <<EOF +/* Stuff from extra packages */ +#ifndef _CCTK_EXTRADEFS_H_ +#define _CCTK_EXTRADEFS_H_ +EOF + +cat > make.extra.defn <<EOF +# Stuff from extra packages +EOF + +for extra in `ls $srcdir/extras` +do + if test -d $srcdir/extras/$extra ; then + if test -x $srcdir/extras/$extra/setup.sh ; then + # Put some comment lines in the files. + CCTK_WriteLine cctk_Extradefs.h "" + CCTK_WriteLine cctk_Extradefs.h "/*$extra definitions*/" + CCTK_WriteLine make.extra.defn "" + CCTK_WriteLine make.extra.defn "# $extra definitions" + # Call the setup script + . $srcdir/extras/$extra/setup.sh + # Put some more comments in + CCTK_WriteLine make.extra.defn "#End of $extra definitions" + CCTK_WriteLine make.extra.defn "" + fi + fi +done + +# Finish the cctk_Extradefs.h file +cat >> cctk_Extradefs.h <<EOF +#endif /*_CCTK_EXTRADEFS_H_*/ +EOF + + + dnl Run any other scripts necessary AC_OUTPUT_COMMANDS(,$PERL -s $PERL_CONFIGURE_SCRIPT -compiler_f77="$F77" -opts_f77="$F77FLAGS" -compiler_f90="$F90" -opts_f90="$F90FLAGS" .) |