diff options
| -rwxr-xr-x | configure | 64 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 41 insertions, 31 deletions
@@ -2103,6 +2103,10 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` DEFAULT_LIBS="" +if test "x" = "x$FC"; then + FC=${F9X} +fi + echo "$as_me:$LINENO: checking shell variables initial values" >&5 @@ -3400,7 +3404,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then FCFLAGS="${FCFLAGS} ${FFLAGS}" - FC=${F9X} + @@ -3496,7 +3500,7 @@ fi # Provide some information about the compiler. -echo "$as_me:3499:" \ +echo "$as_me:3503:" \ "checking for Fortran compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -5544,7 +5548,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5547 "configure"' > conftest.$ac_ext + echo '#line 5551 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6658,7 +6662,7 @@ fi # Provide some information about the compiler. -echo "$as_me:6661:" \ +echo "$as_me:6665:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -7727,11 +7731,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7730: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7734: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7734: \$? = $ac_status" >&5 + echo "$as_me:7738: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -7982,11 +7986,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7985: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7989: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7989: \$? = $ac_status" >&5 + echo "$as_me:7993: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -8042,11 +8046,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8045: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8049: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8049: \$? = $ac_status" >&5 + echo "$as_me:8053: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10242,7 +10246,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10245 "configure" +#line 10249 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10340,7 +10344,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10343 "configure" +#line 10347 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12560,11 +12564,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12563: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12567: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12567: \$? = $ac_status" >&5 + echo "$as_me:12571: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12620,11 +12624,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12623: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12627: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12627: \$? = $ac_status" >&5 + echo "$as_me:12631: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13983,7 +13987,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 13986 "configure" +#line 13990 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14081,7 +14085,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 14084 "configure" +#line 14088 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14936,11 +14940,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14939: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14943: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14943: \$? = $ac_status" >&5 + echo "$as_me:14947: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14996,11 +15000,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14999: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15003: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15003: \$? = $ac_status" >&5 + echo "$as_me:15007: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17052,11 +17056,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17055: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17059: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17059: \$? = $ac_status" >&5 + echo "$as_me:17063: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -17307,11 +17311,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17310: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17314: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17314: \$? = $ac_status" >&5 + echo "$as_me:17318: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -17367,11 +17371,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17370: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17374: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17374: \$? = $ac_status" >&5 + echo "$as_me:17378: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19567,7 +19571,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 19570 "configure" +#line 19574 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19665,7 +19669,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 19668 "configure" +#line 19672 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/configure.in b/configure.in index ecbdcdf..6ba1d00 100644 --- a/configure.in +++ b/configure.in @@ -67,6 +67,12 @@ dnl set by the code which follows... dnl DEFAULT_LIBS="" +dnl Support F9X variable to define Fortran compiler if FC variable is +dnl not used. This should be depreciated in the future. +if test "x" = "x$FC"; then + FC=${F9X} +fi + dnl ---------------------------------------------------------------------- dnl Set prefix default (install directory) to a directory in the build area. dnl This allows multiple src-dir builds within one host. @@ -273,7 +279,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then dnl General Fortran flags dnl FCFLAGS="${FCFLAGS} ${FFLAGS}" - FC=${F9X} + AC_SUBST([F9XSUFFIXFLAG]) AC_SUBST([FSEARCH_DIRS]) |