From c18e4341138228879077f3cc0f049622ef6d77c4 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Thu, 14 Dec 2000 12:25:31 -0500 Subject: [svn-r3144] Purpose: Install Fix Description: Fortran modules need to be installed. Solution: I check for the extension modules are created with and use that during the install... Platforms tested: Linux --- fortran/acsite.m4 | 18 ++++++-- fortran/config/commence.in | 1 + fortran/config/conclude.in | 3 ++ fortran/configure | 105 +++++++++++++++++++++++++-------------------- 4 files changed, 76 insertions(+), 51 deletions(-) diff --git a/fortran/acsite.m4 b/fortran/acsite.m4 index f953c01..23e8409 100644 --- a/fortran/acsite.m4 +++ b/fortran/acsite.m4 @@ -197,9 +197,18 @@ EOF eval $ac_compile modfiles="" +F9XMODEXT="" -for f in conftest.o module.mod MODULE.mod; do - test -f $f && modfiles="$f" +for f in conftest.o module.mod MODULE.mod module.M MODULE.M; do + if test -f "$f" ; then + modfiles="$f" + + case "$f" in + *.o) F9XMODEXT="o" ;; + *.mod) F9XMODEXT="mod" ;; + *.M) F9XMODEXT="M" ;; + esac + fi done echo $modfiles 6>&1 @@ -209,10 +218,10 @@ if test "$modfiles" = file.o; then FFLAGS="$FFLAGS -em" eval $ac_compile modfiles="" - for f in file.o module.mod MODULE.mod; do + for f in file.o module.mod MODULE.mod module.M MODULE.M; do test -f $f && modfiles="$f" done - if test "$modfiles" = file.o;then + if test "$modfiles" = "file.o"; then FFLAGS=$OLD_FFLAGS echo no 6>&1 else @@ -244,6 +253,7 @@ else echo unknown 1>&6 fi AC_SUBST(F9XMODFLAG) +AC_SUBST(F9XMODEXT) rm -rf conftest*]) dnl ------------------------------------------------------------------------- diff --git a/fortran/config/commence.in b/fortran/config/commence.in index ae4cdff..50105e0 100644 --- a/fortran/config/commence.in +++ b/fortran/config/commence.in @@ -16,6 +16,7 @@ SHELL=/bin/sh CC=@CC@ F9X=@F9X@ +F9XMODEXT=@F9XMODEXT@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ FFLAGS=@FFLAGS@ diff --git a/fortran/config/conclude.in b/fortran/config/conclude.in index 2c1fa34..fb78874 100644 --- a/fortran/config/conclude.in +++ b/fortran/config/conclude.in @@ -66,6 +66,9 @@ install: $(PUB_LIB) $(PUB_HDR) $(PUB_PROGS) $(libdir) $(includedir) $(bindir) ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ fi; \ done + @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ + ($(LT_INSTALL_LIB) *.$(F9XMODEXT) $(libdir)/. || exit 1); \ + fi @if test -f libhdf5.settings; then \ (set -x; $(INSTALL_DATA) libhdf5.settings $(libdir)/. || exit 1); \ fi diff --git a/fortran/configure b/fortran/configure index 7642386..005c144 100755 --- a/fortran/configure +++ b/fortran/configure @@ -1899,9 +1899,18 @@ EOF eval $ac_compile modfiles="" +F9XMODEXT="" -for f in conftest.o module.mod MODULE.mod; do - test -f $f && modfiles="$f" +for f in conftest.o module.mod MODULE.mod module.M MODULE.M; do + if test -f "$f" ; then + modfiles="$f" + + case "$f" in + *.o) F9XMODEXT="o" ;; + *.mod) F9XMODEXT="mod" ;; + *.M) F9XMODEXT="M" ;; + esac + fi done echo $modfiles 6>&1 @@ -1911,10 +1920,10 @@ if test "$modfiles" = file.o; then FFLAGS="$FFLAGS -em" eval $ac_compile modfiles="" - for f in file.o module.mod MODULE.mod; do + for f in file.o module.mod MODULE.mod module.M MODULE.M; do test -f $f && modfiles="$f" done - if test "$modfiles" = file.o;then + if test "$modfiles" = "file.o"; then FFLAGS=$OLD_FFLAGS echo no 6>&1 else @@ -1924,7 +1933,7 @@ fi cd .. echo $ac_n "checking how $F9X finds modules""... $ac_c" 1>&6 -echo "configure:1928: checking how $F9X finds modules" >&5 +echo "configure:1937: checking how $F9X finds modules" >&5 for flag in "-M" "-I" "-p"; do cat >conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then F9XMODFLAG=$flag break fi @@ -1947,6 +1956,7 @@ else echo unknown 1>&6 fi + rm -rf conftest* ac_ext=c @@ -1972,17 +1982,17 @@ case "$withval" in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1976: checking for $ac_hdr" >&5 +echo "configure:1986: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2009,7 +2019,7 @@ fi done echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:2013: checking for compress in -lz" >&5 +echo "configure:2023: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2017,7 +2027,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2058,7 +2068,7 @@ fi ;; no) echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6 -echo "configure:2062: checking for GNU zlib" >&5 +echo "configure:2072: checking for GNU zlib" >&5 echo "$ac_t""suppressed" 1>&6 ;; *) @@ -2070,17 +2080,17 @@ echo "configure:2062: checking for GNU zlib" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2074: checking for $ac_hdr" >&5 +echo "configure:2084: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2112,17 +2122,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2116: checking for $ac_hdr" >&5 +echo "configure:2126: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2156,7 +2166,7 @@ done LDFLAGS="$LDFLAGS -L$zlib_lib" ZLIB_DIR=$zlib_lib echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:2160: checking for compress in -lz" >&5 +echo "configure:2170: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2164,7 +2174,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2205,7 +2215,7 @@ fi else echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:2209: checking for compress in -lz" >&5 +echo "configure:2219: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2213,7 +2223,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2313,7 +2323,7 @@ case "$CC_BASENAME" in mpicc) PARALLEL=mpicc echo $ac_n "checking for mpirun""... $ac_c" 1>&6 -echo "configure:2317: checking for mpirun" >&5 +echo "configure:2327: checking for mpirun" >&5 cmd=`echo $CC |cut -f1 -d' '` if (echo $cmd |grep / >/dev/null); then @@ -2353,7 +2363,7 @@ fi echo $ac_n "checking for parallel support files""... $ac_c" 1>&6 -echo "configure:2357: checking for parallel support files" >&5 +echo "configure:2367: checking for parallel support files" >&5 case "X-$enable_parallel" in X-|X-no|X-none) echo "$ac_t""skipped" 1>&6 @@ -2364,21 +2374,21 @@ case "X-$enable_parallel" in PARALLEL=yes cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo $ac_n "checking for MPI_Init in -lmpi""... $ac_c" 1>&6 -echo "configure:2382: checking for MPI_Init in -lmpi" >&5 +echo "configure:2392: checking for MPI_Init in -lmpi" >&5 ac_lib_var=`echo mpi'_'MPI_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2386,7 +2396,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpi $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2430,21 +2440,21 @@ rm -f conftest* if test "X$PARALLEL" = "Xyes"; then cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo $ac_n "checking for MPI_File_open in -lmpio""... $ac_c" 1>&6 -echo "configure:2448: checking for MPI_File_open in -lmpio" >&5 +echo "configure:2458: checking for MPI_File_open in -lmpio" >&5 ac_lib_var=`echo mpio'_'MPI_File_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2452,7 +2462,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpio $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2506,7 +2516,7 @@ rm -f conftest* PARALLEL=mpich echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6 -echo "configure:2510: checking for MPI_Init in -lmpich" >&5 +echo "configure:2520: checking for MPI_Init in -lmpich" >&5 ac_lib_var=`echo mpich'_'MPI_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2514,7 +2524,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpich $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2573,23 +2583,23 @@ EOF echo $ac_n "checking prefix for running on one processor""... $ac_c" 1>&6 -echo "configure:2577: checking prefix for running on one processor" >&5 +echo "configure:2587: checking prefix for running on one processor" >&5 echo "$ac_t""$RUNSERIAL" 1>&6 echo $ac_n "checking prefix for running in parallel""... $ac_c" 1>&6 -echo "configure:2580: checking prefix for running in parallel" >&5 +echo "configure:2590: checking prefix for running in parallel" >&5 echo "$ac_t""$RUNPARALLEL" 1>&6 echo $ac_n "checking whether a simple MPI-IO program can be linked""... $ac_c" 1>&6 -echo "configure:2584: checking whether a simple MPI-IO program can be linked" >&5 +echo "configure:2594: checking whether a simple MPI-IO program can be linked" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2617,7 +2627,7 @@ fi echo $ac_n "checking make""... $ac_c" 1>&6 -echo "configure:2621: checking make" >&5 +echo "configure:2631: checking make" >&5 if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\ sed -n 1p|cut -c1-8`" = "GNU Make"; then @@ -2634,7 +2644,7 @@ fi if test -z "$DEPEND"; then echo $ac_n "checking how to include a makefile""... $ac_c" 1>&6 -echo "configure:2638: checking how to include a makefile" >&5 +echo "configure:2648: checking how to include a makefile" >&5 cat >makeinc <