view src/of-gsl-1-cross-fixes.patch @ 7255:f77eb2eda6b2 default tip @

* src/llvm.mk: update to v18.1.7
author John Donoghue <john.donoghue@ieee.org>
date Sun, 16 Jun 2024 14:05:14 -0400
parents 464fa654b0b4
children
line wrap: on
line source

diff -ur gsl-2.1.1.orig/src/configure gsl-2.1.1/src/configure
--- gsl-2.1.1.orig/src/configure	2018-07-06 11:04:59.193071031 -0400
+++ gsl-2.1.1/src/configure	2018-07-06 12:16:07.882705089 -0400
@@ -623,15 +623,20 @@
 EGREP
 GREP
 CXXCPP
+ac_ct_CXX
+CXXFLAGS
+CXX
 OBJEXT
 EXEEXT
-ac_ct_CXX
+ac_ct_CC
 CPPFLAGS
 LDFLAGS
-CXXFLAGS
-CXX
+CFLAGS
+CC
+octave_include_dir
 GSL_DEFINES
-OCTAVE
+canonical_host_type
+OCTAVE_CONFIG
 MKOCTFILE
 target_alias
 host_alias
@@ -652,7 +657,6 @@
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -679,11 +683,13 @@
       ac_precious_vars='build_alias
 host_alias
 target_alias
-CXX
-CXXFLAGS
+CC
+CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
+CXX
+CXXFLAGS
 CCC
 CXXCPP'
 
@@ -724,7 +730,6 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -977,15 +982,6 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1123,7 +1119,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1276,7 +1272,6 @@
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1304,13 +1299,15 @@
   cat <<\_ACEOF
 
 Some influential environment variables:
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
+  CC          C compiler command
+  CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
   CXXCPP      C++ preprocessor
 
 Use these variables to override the choices made by `configure' or to help
@@ -1393,6 +1390,44 @@
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
 # ac_fn_cxx_try_compile LINENO
 # ----------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1628,10 +1663,10 @@
 
 } # ac_fn_cxx_check_header_compile
 
-# ac_fn_cxx_try_link LINENO
-# -------------------------
+# ac_fn_c_try_link LINENO
+# -----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
+ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   rm -f conftest.$ac_objext conftest$ac_exeext
@@ -1651,7 +1686,7 @@
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
@@ -1672,12 +1707,12 @@
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
-} # ac_fn_cxx_try_link
+} # ac_fn_c_try_link
 
-# ac_fn_cxx_check_func LINENO FUNC VAR
-# ------------------------------------
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_cxx_check_func ()
+ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -1726,7 +1761,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$3=yes"
 else
   eval "$3=no"
@@ -1739,7 +1774,7 @@
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_cxx_check_func
+} # ac_fn_c_check_func
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -2138,16 +2173,16 @@
 
 test -z "$MKOCTFILE" && as_fn_error $? "mkoctfile not found" "$LINENO" 5
 
-# Extract the first word of "octave", so it can be a program name with args.
-set dummy octave; ac_word=$2
+# Extract the first word of "octave-config", so it can be a program name with args.
+set dummy octave-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_OCTAVE+:} false; then :
+if ${ac_cv_path_OCTAVE_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $OCTAVE in
+  case $OCTAVE_CONFIG in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_OCTAVE="$OCTAVE" # Let the user override the test with a path.
+  ac_cv_path_OCTAVE_CONFIG="$OCTAVE_CONFIG" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2157,7 +2192,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_OCTAVE="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_OCTAVE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2168,30 +2203,28 @@
   ;;
 esac
 fi
-OCTAVE=$ac_cv_path_OCTAVE
-if test -n "$OCTAVE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE" >&5
-$as_echo "$OCTAVE" >&6; }
+OCTAVE_CONFIG=$ac_cv_path_OCTAVE_CONFIG
+if test -n "$OCTAVE_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_CONFIG" >&5
+$as_echo "$OCTAVE_CONFIG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-test -z "$OCTAVE" && as_fn_error $? "octave not found" "$LINENO" 5
+test -z "$OCTAVE_CONFIG" &&  as_fn_error $? "octave-config not found" "$LINENO" 5
+
+
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANONICAL_HOST_TYPE in octave-config" >&5
+$as_echo_n "checking for CANONICAL_HOST_TYPE in octave-config... " >&6; }
+canonical_host_type=`$OCTAVE_CONFIG -p CANONICAL_HOST_TYPE`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $canonical_host_type" >&5
+$as_echo "$canonical_host_type" >&6; }
+
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Octave's canonical_host_type" >&5
-$as_echo_n "checking for Octave's canonical_host_type... " >&6; }
-canonical_host_type=`$OCTAVE -qf --eval "                   \
-  if exist ('__octave_config_info__')                       \
-    disp  (__octave_config_info__ ('canonical_host_type'))  \
-  else                                                      \
-    disp  (octave_config_info ('canonical_host_type'))      \
-  end"`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${canonical_host_type}" >&5
-$as_echo "${canonical_host_type}" >&6; }
 
 
 
@@ -2203,48 +2236,222 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Octave's include directory" >&5
-$as_echo_n "checking for Octave's include directory... " >&6; }
-octave_include_dir=`$OCTAVE -qf --eval "              \
-  if exist ('__octave_config_info__')                 \
-    disp  (__octave_config_info__ ('octincludedir'))  \
-  else                                                \
-    disp  (octave_config_info ('octincludedir'))      \
-  end"`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${octave_include_dir}" >&5
-$as_echo "${octave_include_dir}" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCTINCLUDEDIR in octave-config" >&5
+$as_echo_n "checking for OCTINCLUDEDIR in octave-config... " >&6; }
+octave_include_dir=`$OCTAVE_CONFIG -p OCTINCLUDEDIR`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $octave_include_dir" >&5
+$as_echo "$octave_include_dir" >&6; }
 
-save_CPPFLAGS=${CPPFLAG}
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-CPPFLAGS="-I${octave_include_dir} ${CPPFLAGS}"
+# let configure get CC and CXX so we cant override for tests
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
   else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -2253,7 +2460,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2263,32 +2470,32 @@
 
 fi
 fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-    test -n "$CXX" && break
+    test -n "$CC" && break
   done
 fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -2297,7 +2504,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2307,21 +2514,21 @@
 
 fi
 fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$ac_ct_CXX" && break
+  test -n "$ac_ct_CC" && break
 done
 
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
+  if test "x$ac_ct_CC" = x; then
+    CC=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -2329,14 +2536,20 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    CXX=$ac_ct_CXX
+    CC=$ac_ct_CC
   fi
 fi
 
-  fi
 fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -2376,8 +2589,8 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
-$as_echo_n "checking whether the C++ compiler works... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -2447,14 +2660,14 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C++ compiler cannot create executables
+as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
-$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
@@ -2548,7 +2761,7 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C++ compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
@@ -2610,6 +2823,353 @@
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if ${ac_cv_cxx_compiler_gnu+:} false; then :
@@ -2725,6 +3285,23 @@
     CXXFLAGS=
   fi
 fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# set compiler and flags to values octave will be using
+CC=`$MKOCTFILE -p CC`
+CXX=`$MKOCTFILE -p CXX`
+CFLAGS=`$MKOCTFILE -p CFLAGS`
+CPPFLAGS=`$MKOCTFILE -p CPPFLAGS`
+LDFLAGS=`$MKOCTFILE -p LDFLAGS`
+LIBS=`$MKOCTFILE -p LIBS`
+CXXFLAGS=`$MKOCTFILE -p CXXFLAGS`
+
+save_CPPFLAGS=${CPPFLAGS}
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2732,6 +3309,9 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
+CPPFLAGS="-I${octave_include_dir} ${CPPFLAGS}"
+
+
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3179,17 +3759,18 @@
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 CPPFLAGS=${save_CPPFLAGS}
 
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
 $as_echo_n "checking for cos in -lm... " >&6; }
 if ${ac_cv_lib_m_cos+:} false; then :
@@ -3215,7 +3796,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_m_cos=yes
 else
   ac_cv_lib_m_cos=no
@@ -3262,7 +3843,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gslcblas_cblas_dgemm=yes
 else
   ac_cv_lib_gslcblas_cblas_dgemm=no
@@ -3309,7 +3890,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gsl_gsl_message=yes
 else
   ac_cv_lib_gsl_gsl_message=no
@@ -3336,7 +3917,7 @@
 # Auto-generated tests for GSL functions
 for ac_func in gsl_sf_clausen_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_clausen_e" "ac_cv_func_gsl_sf_clausen_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_clausen_e" "ac_cv_func_gsl_sf_clausen_e"
 if test "x$ac_cv_func_gsl_sf_clausen_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CLAUSEN_E 1
@@ -3349,7 +3930,7 @@
 
 for ac_func in gsl_sf_clausen_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_clausen_e" "ac_cv_func_gsl_sf_clausen_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_clausen_e" "ac_cv_func_gsl_sf_clausen_e"
 if test "x$ac_cv_func_gsl_sf_clausen_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CLAUSEN_E 1
@@ -3362,7 +3943,7 @@
 
 for ac_func in gsl_sf_dawson_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_dawson_e" "ac_cv_func_gsl_sf_dawson_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_dawson_e" "ac_cv_func_gsl_sf_dawson_e"
 if test "x$ac_cv_func_gsl_sf_dawson_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DAWSON_E 1
@@ -3375,7 +3956,7 @@
 
 for ac_func in gsl_sf_dawson_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_dawson_e" "ac_cv_func_gsl_sf_dawson_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_dawson_e" "ac_cv_func_gsl_sf_dawson_e"
 if test "x$ac_cv_func_gsl_sf_dawson_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DAWSON_E 1
@@ -3388,7 +3969,7 @@
 
 for ac_func in gsl_sf_debye_1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_debye_1_e" "ac_cv_func_gsl_sf_debye_1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_debye_1_e" "ac_cv_func_gsl_sf_debye_1_e"
 if test "x$ac_cv_func_gsl_sf_debye_1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DEBYE_1_E 1
@@ -3401,7 +3982,7 @@
 
 for ac_func in gsl_sf_debye_1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_debye_1_e" "ac_cv_func_gsl_sf_debye_1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_debye_1_e" "ac_cv_func_gsl_sf_debye_1_e"
 if test "x$ac_cv_func_gsl_sf_debye_1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DEBYE_1_E 1
@@ -3414,7 +3995,7 @@
 
 for ac_func in gsl_sf_debye_2_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_debye_2_e" "ac_cv_func_gsl_sf_debye_2_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_debye_2_e" "ac_cv_func_gsl_sf_debye_2_e"
 if test "x$ac_cv_func_gsl_sf_debye_2_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DEBYE_2_E 1
@@ -3427,7 +4008,7 @@
 
 for ac_func in gsl_sf_debye_2_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_debye_2_e" "ac_cv_func_gsl_sf_debye_2_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_debye_2_e" "ac_cv_func_gsl_sf_debye_2_e"
 if test "x$ac_cv_func_gsl_sf_debye_2_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DEBYE_2_E 1
@@ -3440,7 +4021,7 @@
 
 for ac_func in gsl_sf_debye_3_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_debye_3_e" "ac_cv_func_gsl_sf_debye_3_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_debye_3_e" "ac_cv_func_gsl_sf_debye_3_e"
 if test "x$ac_cv_func_gsl_sf_debye_3_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DEBYE_3_E 1
@@ -3453,7 +4034,7 @@
 
 for ac_func in gsl_sf_debye_3_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_debye_3_e" "ac_cv_func_gsl_sf_debye_3_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_debye_3_e" "ac_cv_func_gsl_sf_debye_3_e"
 if test "x$ac_cv_func_gsl_sf_debye_3_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DEBYE_3_E 1
@@ -3466,7 +4047,7 @@
 
 for ac_func in gsl_sf_debye_4_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_debye_4_e" "ac_cv_func_gsl_sf_debye_4_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_debye_4_e" "ac_cv_func_gsl_sf_debye_4_e"
 if test "x$ac_cv_func_gsl_sf_debye_4_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DEBYE_4_E 1
@@ -3479,7 +4060,7 @@
 
 for ac_func in gsl_sf_debye_4_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_debye_4_e" "ac_cv_func_gsl_sf_debye_4_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_debye_4_e" "ac_cv_func_gsl_sf_debye_4_e"
 if test "x$ac_cv_func_gsl_sf_debye_4_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DEBYE_4_E 1
@@ -3492,7 +4073,7 @@
 
 for ac_func in gsl_sf_debye_5_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_debye_5_e" "ac_cv_func_gsl_sf_debye_5_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_debye_5_e" "ac_cv_func_gsl_sf_debye_5_e"
 if test "x$ac_cv_func_gsl_sf_debye_5_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DEBYE_5_E 1
@@ -3505,7 +4086,7 @@
 
 for ac_func in gsl_sf_debye_6_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_debye_6_e" "ac_cv_func_gsl_sf_debye_6_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_debye_6_e" "ac_cv_func_gsl_sf_debye_6_e"
 if test "x$ac_cv_func_gsl_sf_debye_6_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DEBYE_6_E 1
@@ -3518,7 +4099,7 @@
 
 for ac_func in gsl_sf_dilog_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_dilog_e" "ac_cv_func_gsl_sf_dilog_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_dilog_e" "ac_cv_func_gsl_sf_dilog_e"
 if test "x$ac_cv_func_gsl_sf_dilog_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DILOG_E 1
@@ -3531,7 +4112,7 @@
 
 for ac_func in gsl_sf_erf_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_erf_e" "ac_cv_func_gsl_sf_erf_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_erf_e" "ac_cv_func_gsl_sf_erf_e"
 if test "x$ac_cv_func_gsl_sf_erf_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ERF_E 1
@@ -3544,7 +4125,7 @@
 
 for ac_func in gsl_sf_erf_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_erf_e" "ac_cv_func_gsl_sf_erf_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_erf_e" "ac_cv_func_gsl_sf_erf_e"
 if test "x$ac_cv_func_gsl_sf_erf_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ERF_E 1
@@ -3557,7 +4138,7 @@
 
 for ac_func in gsl_sf_erfc_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_erfc_e" "ac_cv_func_gsl_sf_erfc_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_erfc_e" "ac_cv_func_gsl_sf_erfc_e"
 if test "x$ac_cv_func_gsl_sf_erfc_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ERFC_E 1
@@ -3570,7 +4151,7 @@
 
 for ac_func in gsl_sf_erfc_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_erfc_e" "ac_cv_func_gsl_sf_erfc_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_erfc_e" "ac_cv_func_gsl_sf_erfc_e"
 if test "x$ac_cv_func_gsl_sf_erfc_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ERFC_E 1
@@ -3583,7 +4164,7 @@
 
 for ac_func in gsl_sf_log_erfc_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_log_erfc_e" "ac_cv_func_gsl_sf_log_erfc_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_log_erfc_e" "ac_cv_func_gsl_sf_log_erfc_e"
 if test "x$ac_cv_func_gsl_sf_log_erfc_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LOG_ERFC_E 1
@@ -3596,7 +4177,7 @@
 
 for ac_func in gsl_sf_log_erfc_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_log_erfc_e" "ac_cv_func_gsl_sf_log_erfc_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_log_erfc_e" "ac_cv_func_gsl_sf_log_erfc_e"
 if test "x$ac_cv_func_gsl_sf_log_erfc_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LOG_ERFC_E 1
@@ -3609,7 +4190,7 @@
 
 for ac_func in gsl_sf_erf_Z_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_erf_Z_e" "ac_cv_func_gsl_sf_erf_Z_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_erf_Z_e" "ac_cv_func_gsl_sf_erf_Z_e"
 if test "x$ac_cv_func_gsl_sf_erf_Z_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ERF_Z_E 1
@@ -3622,7 +4203,7 @@
 
 for ac_func in gsl_sf_erf_Z_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_erf_Z_e" "ac_cv_func_gsl_sf_erf_Z_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_erf_Z_e" "ac_cv_func_gsl_sf_erf_Z_e"
 if test "x$ac_cv_func_gsl_sf_erf_Z_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ERF_Z_E 1
@@ -3635,7 +4216,7 @@
 
 for ac_func in gsl_sf_erf_Q_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_erf_Q_e" "ac_cv_func_gsl_sf_erf_Q_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_erf_Q_e" "ac_cv_func_gsl_sf_erf_Q_e"
 if test "x$ac_cv_func_gsl_sf_erf_Q_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ERF_Q_E 1
@@ -3648,7 +4229,7 @@
 
 for ac_func in gsl_sf_erf_Q_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_erf_Q_e" "ac_cv_func_gsl_sf_erf_Q_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_erf_Q_e" "ac_cv_func_gsl_sf_erf_Q_e"
 if test "x$ac_cv_func_gsl_sf_erf_Q_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ERF_Q_E 1
@@ -3661,7 +4242,7 @@
 
 for ac_func in gsl_sf_hazard_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hazard_e" "ac_cv_func_gsl_sf_hazard_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hazard_e" "ac_cv_func_gsl_sf_hazard_e"
 if test "x$ac_cv_func_gsl_sf_hazard_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HAZARD_E 1
@@ -3674,7 +4255,7 @@
 
 for ac_func in gsl_sf_hazard_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hazard_e" "ac_cv_func_gsl_sf_hazard_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hazard_e" "ac_cv_func_gsl_sf_hazard_e"
 if test "x$ac_cv_func_gsl_sf_hazard_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HAZARD_E 1
@@ -3687,7 +4268,7 @@
 
 for ac_func in gsl_sf_expm1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_expm1_e" "ac_cv_func_gsl_sf_expm1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_expm1_e" "ac_cv_func_gsl_sf_expm1_e"
 if test "x$ac_cv_func_gsl_sf_expm1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPM1_E 1
@@ -3700,7 +4281,7 @@
 
 for ac_func in gsl_sf_expm1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_expm1_e" "ac_cv_func_gsl_sf_expm1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_expm1_e" "ac_cv_func_gsl_sf_expm1_e"
 if test "x$ac_cv_func_gsl_sf_expm1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPM1_E 1
@@ -3713,7 +4294,7 @@
 
 for ac_func in gsl_sf_exprel_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_exprel_e" "ac_cv_func_gsl_sf_exprel_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_exprel_e" "ac_cv_func_gsl_sf_exprel_e"
 if test "x$ac_cv_func_gsl_sf_exprel_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPREL_E 1
@@ -3726,7 +4307,7 @@
 
 for ac_func in gsl_sf_exprel_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_exprel_e" "ac_cv_func_gsl_sf_exprel_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_exprel_e" "ac_cv_func_gsl_sf_exprel_e"
 if test "x$ac_cv_func_gsl_sf_exprel_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPREL_E 1
@@ -3739,7 +4320,7 @@
 
 for ac_func in gsl_sf_exprel_2_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_exprel_2_e" "ac_cv_func_gsl_sf_exprel_2_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_exprel_2_e" "ac_cv_func_gsl_sf_exprel_2_e"
 if test "x$ac_cv_func_gsl_sf_exprel_2_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPREL_2_E 1
@@ -3752,7 +4333,7 @@
 
 for ac_func in gsl_sf_exprel_2_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_exprel_2_e" "ac_cv_func_gsl_sf_exprel_2_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_exprel_2_e" "ac_cv_func_gsl_sf_exprel_2_e"
 if test "x$ac_cv_func_gsl_sf_exprel_2_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPREL_2_E 1
@@ -3765,7 +4346,7 @@
 
 for ac_func in gsl_sf_expint_E1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_expint_E1_e" "ac_cv_func_gsl_sf_expint_E1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_expint_E1_e" "ac_cv_func_gsl_sf_expint_E1_e"
 if test "x$ac_cv_func_gsl_sf_expint_E1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPINT_E1_E 1
@@ -3778,7 +4359,7 @@
 
 for ac_func in gsl_sf_expint_E1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_expint_E1_e" "ac_cv_func_gsl_sf_expint_E1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_expint_E1_e" "ac_cv_func_gsl_sf_expint_E1_e"
 if test "x$ac_cv_func_gsl_sf_expint_E1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPINT_E1_E 1
@@ -3791,7 +4372,7 @@
 
 for ac_func in gsl_sf_expint_E2_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_expint_E2_e" "ac_cv_func_gsl_sf_expint_E2_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_expint_E2_e" "ac_cv_func_gsl_sf_expint_E2_e"
 if test "x$ac_cv_func_gsl_sf_expint_E2_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPINT_E2_E 1
@@ -3804,7 +4385,7 @@
 
 for ac_func in gsl_sf_expint_E2_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_expint_E2_e" "ac_cv_func_gsl_sf_expint_E2_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_expint_E2_e" "ac_cv_func_gsl_sf_expint_E2_e"
 if test "x$ac_cv_func_gsl_sf_expint_E2_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPINT_E2_E 1
@@ -3817,7 +4398,7 @@
 
 for ac_func in gsl_sf_expint_Ei_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_expint_Ei_e" "ac_cv_func_gsl_sf_expint_Ei_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_expint_Ei_e" "ac_cv_func_gsl_sf_expint_Ei_e"
 if test "x$ac_cv_func_gsl_sf_expint_Ei_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPINT_EI_E 1
@@ -3830,7 +4411,7 @@
 
 for ac_func in gsl_sf_expint_Ei_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_expint_Ei_e" "ac_cv_func_gsl_sf_expint_Ei_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_expint_Ei_e" "ac_cv_func_gsl_sf_expint_Ei_e"
 if test "x$ac_cv_func_gsl_sf_expint_Ei_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPINT_EI_E 1
@@ -3843,7 +4424,7 @@
 
 for ac_func in gsl_sf_Shi_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_Shi_e" "ac_cv_func_gsl_sf_Shi_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_Shi_e" "ac_cv_func_gsl_sf_Shi_e"
 if test "x$ac_cv_func_gsl_sf_Shi_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_SHI_E 1
@@ -3856,7 +4437,7 @@
 
 for ac_func in gsl_sf_Shi_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_Shi_e" "ac_cv_func_gsl_sf_Shi_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_Shi_e" "ac_cv_func_gsl_sf_Shi_e"
 if test "x$ac_cv_func_gsl_sf_Shi_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_SHI_E 1
@@ -3869,7 +4450,7 @@
 
 for ac_func in gsl_sf_Chi_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_Chi_e" "ac_cv_func_gsl_sf_Chi_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_Chi_e" "ac_cv_func_gsl_sf_Chi_e"
 if test "x$ac_cv_func_gsl_sf_Chi_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CHI_E 1
@@ -3882,7 +4463,7 @@
 
 for ac_func in gsl_sf_Chi_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_Chi_e" "ac_cv_func_gsl_sf_Chi_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_Chi_e" "ac_cv_func_gsl_sf_Chi_e"
 if test "x$ac_cv_func_gsl_sf_Chi_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CHI_E 1
@@ -3895,7 +4476,7 @@
 
 for ac_func in gsl_sf_expint_3_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_expint_3_e" "ac_cv_func_gsl_sf_expint_3_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_expint_3_e" "ac_cv_func_gsl_sf_expint_3_e"
 if test "x$ac_cv_func_gsl_sf_expint_3_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPINT_3_E 1
@@ -3908,7 +4489,7 @@
 
 for ac_func in gsl_sf_expint_3_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_expint_3_e" "ac_cv_func_gsl_sf_expint_3_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_expint_3_e" "ac_cv_func_gsl_sf_expint_3_e"
 if test "x$ac_cv_func_gsl_sf_expint_3_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPINT_3_E 1
@@ -3921,7 +4502,7 @@
 
 for ac_func in gsl_sf_Si_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_Si_e" "ac_cv_func_gsl_sf_Si_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_Si_e" "ac_cv_func_gsl_sf_Si_e"
 if test "x$ac_cv_func_gsl_sf_Si_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_SI_E 1
@@ -3934,7 +4515,7 @@
 
 for ac_func in gsl_sf_Si_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_Si_e" "ac_cv_func_gsl_sf_Si_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_Si_e" "ac_cv_func_gsl_sf_Si_e"
 if test "x$ac_cv_func_gsl_sf_Si_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_SI_E 1
@@ -3947,7 +4528,7 @@
 
 for ac_func in gsl_sf_Ci_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_Ci_e" "ac_cv_func_gsl_sf_Ci_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_Ci_e" "ac_cv_func_gsl_sf_Ci_e"
 if test "x$ac_cv_func_gsl_sf_Ci_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CI_E 1
@@ -3960,7 +4541,7 @@
 
 for ac_func in gsl_sf_Ci_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_Ci_e" "ac_cv_func_gsl_sf_Ci_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_Ci_e" "ac_cv_func_gsl_sf_Ci_e"
 if test "x$ac_cv_func_gsl_sf_Ci_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CI_E 1
@@ -3973,7 +4554,7 @@
 
 for ac_func in gsl_sf_atanint_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_atanint_e" "ac_cv_func_gsl_sf_atanint_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_atanint_e" "ac_cv_func_gsl_sf_atanint_e"
 if test "x$ac_cv_func_gsl_sf_atanint_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ATANINT_E 1
@@ -3986,7 +4567,7 @@
 
 for ac_func in gsl_sf_atanint_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_atanint_e" "ac_cv_func_gsl_sf_atanint_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_atanint_e" "ac_cv_func_gsl_sf_atanint_e"
 if test "x$ac_cv_func_gsl_sf_atanint_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ATANINT_E 1
@@ -3999,7 +4580,7 @@
 
 for ac_func in gsl_sf_fermi_dirac_mhalf_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_fermi_dirac_mhalf_e" "ac_cv_func_gsl_sf_fermi_dirac_mhalf_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_fermi_dirac_mhalf_e" "ac_cv_func_gsl_sf_fermi_dirac_mhalf_e"
 if test "x$ac_cv_func_gsl_sf_fermi_dirac_mhalf_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_FERMI_DIRAC_MHALF_E 1
@@ -4012,7 +4593,7 @@
 
 for ac_func in gsl_sf_fermi_dirac_mhalf_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_fermi_dirac_mhalf_e" "ac_cv_func_gsl_sf_fermi_dirac_mhalf_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_fermi_dirac_mhalf_e" "ac_cv_func_gsl_sf_fermi_dirac_mhalf_e"
 if test "x$ac_cv_func_gsl_sf_fermi_dirac_mhalf_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_FERMI_DIRAC_MHALF_E 1
@@ -4025,7 +4606,7 @@
 
 for ac_func in gsl_sf_fermi_dirac_half_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_fermi_dirac_half_e" "ac_cv_func_gsl_sf_fermi_dirac_half_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_fermi_dirac_half_e" "ac_cv_func_gsl_sf_fermi_dirac_half_e"
 if test "x$ac_cv_func_gsl_sf_fermi_dirac_half_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_FERMI_DIRAC_HALF_E 1
@@ -4038,7 +4619,7 @@
 
 for ac_func in gsl_sf_fermi_dirac_half_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_fermi_dirac_half_e" "ac_cv_func_gsl_sf_fermi_dirac_half_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_fermi_dirac_half_e" "ac_cv_func_gsl_sf_fermi_dirac_half_e"
 if test "x$ac_cv_func_gsl_sf_fermi_dirac_half_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_FERMI_DIRAC_HALF_E 1
@@ -4051,7 +4632,7 @@
 
 for ac_func in gsl_sf_fermi_dirac_3half_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_fermi_dirac_3half_e" "ac_cv_func_gsl_sf_fermi_dirac_3half_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_fermi_dirac_3half_e" "ac_cv_func_gsl_sf_fermi_dirac_3half_e"
 if test "x$ac_cv_func_gsl_sf_fermi_dirac_3half_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_FERMI_DIRAC_3HALF_E 1
@@ -4064,7 +4645,7 @@
 
 for ac_func in gsl_sf_fermi_dirac_3half_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_fermi_dirac_3half_e" "ac_cv_func_gsl_sf_fermi_dirac_3half_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_fermi_dirac_3half_e" "ac_cv_func_gsl_sf_fermi_dirac_3half_e"
 if test "x$ac_cv_func_gsl_sf_fermi_dirac_3half_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_FERMI_DIRAC_3HALF_E 1
@@ -4077,7 +4658,7 @@
 
 for ac_func in gsl_sf_gamma_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gamma_e" "ac_cv_func_gsl_sf_gamma_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gamma_e" "ac_cv_func_gsl_sf_gamma_e"
 if test "x$ac_cv_func_gsl_sf_gamma_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMA_E 1
@@ -4090,7 +4671,7 @@
 
 for ac_func in gsl_sf_gamma_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gamma_e" "ac_cv_func_gsl_sf_gamma_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gamma_e" "ac_cv_func_gsl_sf_gamma_e"
 if test "x$ac_cv_func_gsl_sf_gamma_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMA_E 1
@@ -4103,7 +4684,7 @@
 
 for ac_func in gsl_sf_lngamma_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lngamma_e" "ac_cv_func_gsl_sf_lngamma_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lngamma_e" "ac_cv_func_gsl_sf_lngamma_e"
 if test "x$ac_cv_func_gsl_sf_lngamma_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNGAMMA_E 1
@@ -4116,7 +4697,7 @@
 
 for ac_func in gsl_sf_lngamma_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lngamma_e" "ac_cv_func_gsl_sf_lngamma_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lngamma_e" "ac_cv_func_gsl_sf_lngamma_e"
 if test "x$ac_cv_func_gsl_sf_lngamma_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNGAMMA_E 1
@@ -4129,7 +4710,7 @@
 
 for ac_func in gsl_sf_gammastar_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gammastar_e" "ac_cv_func_gsl_sf_gammastar_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gammastar_e" "ac_cv_func_gsl_sf_gammastar_e"
 if test "x$ac_cv_func_gsl_sf_gammastar_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMASTAR_E 1
@@ -4142,7 +4723,7 @@
 
 for ac_func in gsl_sf_gammastar_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gammastar_e" "ac_cv_func_gsl_sf_gammastar_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gammastar_e" "ac_cv_func_gsl_sf_gammastar_e"
 if test "x$ac_cv_func_gsl_sf_gammastar_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMASTAR_E 1
@@ -4155,7 +4736,7 @@
 
 for ac_func in gsl_sf_gammainv_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gammainv_e" "ac_cv_func_gsl_sf_gammainv_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gammainv_e" "ac_cv_func_gsl_sf_gammainv_e"
 if test "x$ac_cv_func_gsl_sf_gammainv_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMAINV_E 1
@@ -4168,7 +4749,7 @@
 
 for ac_func in gsl_sf_gammainv_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gammainv_e" "ac_cv_func_gsl_sf_gammainv_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gammainv_e" "ac_cv_func_gsl_sf_gammainv_e"
 if test "x$ac_cv_func_gsl_sf_gammainv_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMAINV_E 1
@@ -4181,7 +4762,7 @@
 
 for ac_func in gsl_sf_lambert_W0_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lambert_W0_e" "ac_cv_func_gsl_sf_lambert_W0_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lambert_W0_e" "ac_cv_func_gsl_sf_lambert_W0_e"
 if test "x$ac_cv_func_gsl_sf_lambert_W0_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LAMBERT_W0_E 1
@@ -4194,7 +4775,7 @@
 
 for ac_func in gsl_sf_gammastar_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gammastar_e" "ac_cv_func_gsl_sf_gammastar_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gammastar_e" "ac_cv_func_gsl_sf_gammastar_e"
 if test "x$ac_cv_func_gsl_sf_gammastar_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMASTAR_E 1
@@ -4207,7 +4788,7 @@
 
 for ac_func in gsl_sf_lambert_W0_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lambert_W0_e" "ac_cv_func_gsl_sf_lambert_W0_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lambert_W0_e" "ac_cv_func_gsl_sf_lambert_W0_e"
 if test "x$ac_cv_func_gsl_sf_lambert_W0_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LAMBERT_W0_E 1
@@ -4220,7 +4801,7 @@
 
 for ac_func in gsl_sf_lambert_Wm1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lambert_Wm1_e" "ac_cv_func_gsl_sf_lambert_Wm1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lambert_Wm1_e" "ac_cv_func_gsl_sf_lambert_Wm1_e"
 if test "x$ac_cv_func_gsl_sf_lambert_Wm1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LAMBERT_WM1_E 1
@@ -4233,7 +4814,7 @@
 
 for ac_func in gsl_sf_lambert_Wm1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lambert_Wm1_e" "ac_cv_func_gsl_sf_lambert_Wm1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lambert_Wm1_e" "ac_cv_func_gsl_sf_lambert_Wm1_e"
 if test "x$ac_cv_func_gsl_sf_lambert_Wm1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LAMBERT_WM1_E 1
@@ -4246,7 +4827,7 @@
 
 for ac_func in gsl_sf_log_1plusx_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_log_1plusx_e" "ac_cv_func_gsl_sf_log_1plusx_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_log_1plusx_e" "ac_cv_func_gsl_sf_log_1plusx_e"
 if test "x$ac_cv_func_gsl_sf_log_1plusx_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LOG_1PLUSX_E 1
@@ -4259,7 +4840,7 @@
 
 for ac_func in gsl_sf_log_1plusx_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_log_1plusx_e" "ac_cv_func_gsl_sf_log_1plusx_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_log_1plusx_e" "ac_cv_func_gsl_sf_log_1plusx_e"
 if test "x$ac_cv_func_gsl_sf_log_1plusx_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LOG_1PLUSX_E 1
@@ -4272,7 +4853,7 @@
 
 for ac_func in gsl_sf_log_1plusx_mx_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_log_1plusx_mx_e" "ac_cv_func_gsl_sf_log_1plusx_mx_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_log_1plusx_mx_e" "ac_cv_func_gsl_sf_log_1plusx_mx_e"
 if test "x$ac_cv_func_gsl_sf_log_1plusx_mx_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LOG_1PLUSX_MX_E 1
@@ -4285,7 +4866,7 @@
 
 for ac_func in gsl_sf_log_1plusx_mx_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_log_1plusx_mx_e" "ac_cv_func_gsl_sf_log_1plusx_mx_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_log_1plusx_mx_e" "ac_cv_func_gsl_sf_log_1plusx_mx_e"
 if test "x$ac_cv_func_gsl_sf_log_1plusx_mx_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LOG_1PLUSX_MX_E 1
@@ -4298,7 +4879,7 @@
 
 for ac_func in gsl_sf_psi_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_psi_e" "ac_cv_func_gsl_sf_psi_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_psi_e" "ac_cv_func_gsl_sf_psi_e"
 if test "x$ac_cv_func_gsl_sf_psi_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_PSI_E 1
@@ -4311,7 +4892,7 @@
 
 for ac_func in gsl_sf_psi_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_psi_e" "ac_cv_func_gsl_sf_psi_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_psi_e" "ac_cv_func_gsl_sf_psi_e"
 if test "x$ac_cv_func_gsl_sf_psi_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_PSI_E 1
@@ -4324,7 +4905,7 @@
 
 for ac_func in gsl_sf_psi_1piy_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_psi_1piy_e" "ac_cv_func_gsl_sf_psi_1piy_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_psi_1piy_e" "ac_cv_func_gsl_sf_psi_1piy_e"
 if test "x$ac_cv_func_gsl_sf_psi_1piy_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_PSI_1PIY_E 1
@@ -4337,7 +4918,7 @@
 
 for ac_func in gsl_sf_psi_1piy_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_psi_1piy_e" "ac_cv_func_gsl_sf_psi_1piy_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_psi_1piy_e" "ac_cv_func_gsl_sf_psi_1piy_e"
 if test "x$ac_cv_func_gsl_sf_psi_1piy_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_PSI_1PIY_E 1
@@ -4350,7 +4931,7 @@
 
 for ac_func in gsl_sf_synchrotron_1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_synchrotron_1_e" "ac_cv_func_gsl_sf_synchrotron_1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_synchrotron_1_e" "ac_cv_func_gsl_sf_synchrotron_1_e"
 if test "x$ac_cv_func_gsl_sf_synchrotron_1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_SYNCHROTRON_1_E 1
@@ -4363,7 +4944,7 @@
 
 for ac_func in gsl_sf_synchrotron_1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_synchrotron_1_e" "ac_cv_func_gsl_sf_synchrotron_1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_synchrotron_1_e" "ac_cv_func_gsl_sf_synchrotron_1_e"
 if test "x$ac_cv_func_gsl_sf_synchrotron_1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_SYNCHROTRON_1_E 1
@@ -4376,7 +4957,7 @@
 
 for ac_func in gsl_sf_synchrotron_2_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_synchrotron_2_e" "ac_cv_func_gsl_sf_synchrotron_2_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_synchrotron_2_e" "ac_cv_func_gsl_sf_synchrotron_2_e"
 if test "x$ac_cv_func_gsl_sf_synchrotron_2_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_SYNCHROTRON_2_E 1
@@ -4389,7 +4970,7 @@
 
 for ac_func in gsl_sf_synchrotron_2_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_synchrotron_2_e" "ac_cv_func_gsl_sf_synchrotron_2_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_synchrotron_2_e" "ac_cv_func_gsl_sf_synchrotron_2_e"
 if test "x$ac_cv_func_gsl_sf_synchrotron_2_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_SYNCHROTRON_2_E 1
@@ -4402,7 +4983,7 @@
 
 for ac_func in gsl_sf_transport_2_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_transport_2_e" "ac_cv_func_gsl_sf_transport_2_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_transport_2_e" "ac_cv_func_gsl_sf_transport_2_e"
 if test "x$ac_cv_func_gsl_sf_transport_2_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_TRANSPORT_2_E 1
@@ -4415,7 +4996,7 @@
 
 for ac_func in gsl_sf_transport_2_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_transport_2_e" "ac_cv_func_gsl_sf_transport_2_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_transport_2_e" "ac_cv_func_gsl_sf_transport_2_e"
 if test "x$ac_cv_func_gsl_sf_transport_2_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_TRANSPORT_2_E 1
@@ -4428,7 +5009,7 @@
 
 for ac_func in gsl_sf_transport_3_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_transport_3_e" "ac_cv_func_gsl_sf_transport_3_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_transport_3_e" "ac_cv_func_gsl_sf_transport_3_e"
 if test "x$ac_cv_func_gsl_sf_transport_3_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_TRANSPORT_3_E 1
@@ -4441,7 +5022,7 @@
 
 for ac_func in gsl_sf_transport_3_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_transport_3_e" "ac_cv_func_gsl_sf_transport_3_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_transport_3_e" "ac_cv_func_gsl_sf_transport_3_e"
 if test "x$ac_cv_func_gsl_sf_transport_3_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_TRANSPORT_3_E 1
@@ -4454,7 +5035,7 @@
 
 for ac_func in gsl_sf_transport_4_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_transport_4_e" "ac_cv_func_gsl_sf_transport_4_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_transport_4_e" "ac_cv_func_gsl_sf_transport_4_e"
 if test "x$ac_cv_func_gsl_sf_transport_4_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_TRANSPORT_4_E 1
@@ -4467,7 +5048,7 @@
 
 for ac_func in gsl_sf_transport_4_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_transport_4_e" "ac_cv_func_gsl_sf_transport_4_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_transport_4_e" "ac_cv_func_gsl_sf_transport_4_e"
 if test "x$ac_cv_func_gsl_sf_transport_4_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_TRANSPORT_4_E 1
@@ -4480,7 +5061,7 @@
 
 for ac_func in gsl_sf_transport_5_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_transport_5_e" "ac_cv_func_gsl_sf_transport_5_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_transport_5_e" "ac_cv_func_gsl_sf_transport_5_e"
 if test "x$ac_cv_func_gsl_sf_transport_5_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_TRANSPORT_5_E 1
@@ -4493,7 +5074,7 @@
 
 for ac_func in gsl_sf_transport_5_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_transport_5_e" "ac_cv_func_gsl_sf_transport_5_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_transport_5_e" "ac_cv_func_gsl_sf_transport_5_e"
 if test "x$ac_cv_func_gsl_sf_transport_5_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_TRANSPORT_5_E 1
@@ -4506,7 +5087,7 @@
 
 for ac_func in gsl_sf_sinc_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_sinc_e" "ac_cv_func_gsl_sf_sinc_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_sinc_e" "ac_cv_func_gsl_sf_sinc_e"
 if test "x$ac_cv_func_gsl_sf_sinc_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_SINC_E 1
@@ -4519,7 +5100,7 @@
 
 for ac_func in gsl_sf_sinc_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_sinc_e" "ac_cv_func_gsl_sf_sinc_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_sinc_e" "ac_cv_func_gsl_sf_sinc_e"
 if test "x$ac_cv_func_gsl_sf_sinc_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_SINC_E 1
@@ -4532,7 +5113,7 @@
 
 for ac_func in gsl_sf_lnsinh_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lnsinh_e" "ac_cv_func_gsl_sf_lnsinh_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lnsinh_e" "ac_cv_func_gsl_sf_lnsinh_e"
 if test "x$ac_cv_func_gsl_sf_lnsinh_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNSINH_E 1
@@ -4545,7 +5126,7 @@
 
 for ac_func in gsl_sf_lnsinh_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lnsinh_e" "ac_cv_func_gsl_sf_lnsinh_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lnsinh_e" "ac_cv_func_gsl_sf_lnsinh_e"
 if test "x$ac_cv_func_gsl_sf_lnsinh_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNSINH_E 1
@@ -4558,7 +5139,7 @@
 
 for ac_func in gsl_sf_lncosh_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lncosh_e" "ac_cv_func_gsl_sf_lncosh_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lncosh_e" "ac_cv_func_gsl_sf_lncosh_e"
 if test "x$ac_cv_func_gsl_sf_lncosh_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNCOSH_E 1
@@ -4571,7 +5152,7 @@
 
 for ac_func in gsl_sf_lncosh_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lncosh_e" "ac_cv_func_gsl_sf_lncosh_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lncosh_e" "ac_cv_func_gsl_sf_lncosh_e"
 if test "x$ac_cv_func_gsl_sf_lncosh_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNCOSH_E 1
@@ -4584,7 +5165,7 @@
 
 for ac_func in gsl_sf_bessel_Jn_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Jn_e" "ac_cv_func_gsl_sf_bessel_Jn_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Jn_e" "ac_cv_func_gsl_sf_bessel_Jn_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Jn_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_JN_E 1
@@ -4597,7 +5178,7 @@
 
 for ac_func in gsl_sf_bessel_Jn_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Jn_e" "ac_cv_func_gsl_sf_bessel_Jn_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Jn_e" "ac_cv_func_gsl_sf_bessel_Jn_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Jn_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_JN_E 1
@@ -4610,7 +5191,7 @@
 
 for ac_func in gsl_sf_bessel_Yn_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Yn_e" "ac_cv_func_gsl_sf_bessel_Yn_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Yn_e" "ac_cv_func_gsl_sf_bessel_Yn_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Yn_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_YN_E 1
@@ -4623,7 +5204,7 @@
 
 for ac_func in gsl_sf_bessel_Yn_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Yn_e" "ac_cv_func_gsl_sf_bessel_Yn_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Yn_e" "ac_cv_func_gsl_sf_bessel_Yn_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Yn_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_YN_E 1
@@ -4636,7 +5217,7 @@
 
 for ac_func in gsl_sf_bessel_In_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_In_e" "ac_cv_func_gsl_sf_bessel_In_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_In_e" "ac_cv_func_gsl_sf_bessel_In_e"
 if test "x$ac_cv_func_gsl_sf_bessel_In_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_IN_E 1
@@ -4649,7 +5230,7 @@
 
 for ac_func in gsl_sf_bessel_In_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_In_e" "ac_cv_func_gsl_sf_bessel_In_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_In_e" "ac_cv_func_gsl_sf_bessel_In_e"
 if test "x$ac_cv_func_gsl_sf_bessel_In_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_IN_E 1
@@ -4662,7 +5243,7 @@
 
 for ac_func in gsl_sf_bessel_In_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_In_scaled_e" "ac_cv_func_gsl_sf_bessel_In_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_In_scaled_e" "ac_cv_func_gsl_sf_bessel_In_scaled_e"
 if test "x$ac_cv_func_gsl_sf_bessel_In_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_IN_SCALED_E 1
@@ -4675,7 +5256,7 @@
 
 for ac_func in gsl_sf_bessel_In_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_In_scaled_e" "ac_cv_func_gsl_sf_bessel_In_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_In_scaled_e" "ac_cv_func_gsl_sf_bessel_In_scaled_e"
 if test "x$ac_cv_func_gsl_sf_bessel_In_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_IN_SCALED_E 1
@@ -4688,7 +5269,7 @@
 
 for ac_func in gsl_sf_bessel_Kn_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Kn_e" "ac_cv_func_gsl_sf_bessel_Kn_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Kn_e" "ac_cv_func_gsl_sf_bessel_Kn_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Kn_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KN_E 1
@@ -4701,7 +5282,7 @@
 
 for ac_func in gsl_sf_bessel_Kn_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Kn_e" "ac_cv_func_gsl_sf_bessel_Kn_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Kn_e" "ac_cv_func_gsl_sf_bessel_Kn_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Kn_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KN_E 1
@@ -4714,7 +5295,7 @@
 
 for ac_func in gsl_sf_bessel_Kn_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Kn_scaled_e" "ac_cv_func_gsl_sf_bessel_Kn_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Kn_scaled_e" "ac_cv_func_gsl_sf_bessel_Kn_scaled_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Kn_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KN_SCALED_E 1
@@ -4727,7 +5308,7 @@
 
 for ac_func in gsl_sf_bessel_Kn_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Kn_scaled_e" "ac_cv_func_gsl_sf_bessel_Kn_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Kn_scaled_e" "ac_cv_func_gsl_sf_bessel_Kn_scaled_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Kn_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KN_SCALED_E 1
@@ -4740,7 +5321,7 @@
 
 for ac_func in gsl_sf_bessel_jl_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_jl_e" "ac_cv_func_gsl_sf_bessel_jl_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_jl_e" "ac_cv_func_gsl_sf_bessel_jl_e"
 if test "x$ac_cv_func_gsl_sf_bessel_jl_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_JL_E 1
@@ -4753,7 +5334,7 @@
 
 for ac_func in gsl_sf_bessel_jl_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_jl_e" "ac_cv_func_gsl_sf_bessel_jl_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_jl_e" "ac_cv_func_gsl_sf_bessel_jl_e"
 if test "x$ac_cv_func_gsl_sf_bessel_jl_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_JL_E 1
@@ -4766,7 +5347,7 @@
 
 for ac_func in gsl_sf_bessel_yl_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_yl_e" "ac_cv_func_gsl_sf_bessel_yl_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_yl_e" "ac_cv_func_gsl_sf_bessel_yl_e"
 if test "x$ac_cv_func_gsl_sf_bessel_yl_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_YL_E 1
@@ -4779,7 +5360,7 @@
 
 for ac_func in gsl_sf_bessel_yl_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_yl_e" "ac_cv_func_gsl_sf_bessel_yl_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_yl_e" "ac_cv_func_gsl_sf_bessel_yl_e"
 if test "x$ac_cv_func_gsl_sf_bessel_yl_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_YL_E 1
@@ -4792,7 +5373,7 @@
 
 for ac_func in gsl_sf_bessel_il_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_il_scaled_e" "ac_cv_func_gsl_sf_bessel_il_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_il_scaled_e" "ac_cv_func_gsl_sf_bessel_il_scaled_e"
 if test "x$ac_cv_func_gsl_sf_bessel_il_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_IL_SCALED_E 1
@@ -4805,7 +5386,7 @@
 
 for ac_func in gsl_sf_bessel_il_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_il_scaled_e" "ac_cv_func_gsl_sf_bessel_il_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_il_scaled_e" "ac_cv_func_gsl_sf_bessel_il_scaled_e"
 if test "x$ac_cv_func_gsl_sf_bessel_il_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_IL_SCALED_E 1
@@ -4818,7 +5399,7 @@
 
 for ac_func in gsl_sf_bessel_kl_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_kl_scaled_e" "ac_cv_func_gsl_sf_bessel_kl_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_kl_scaled_e" "ac_cv_func_gsl_sf_bessel_kl_scaled_e"
 if test "x$ac_cv_func_gsl_sf_bessel_kl_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KL_SCALED_E 1
@@ -4831,7 +5412,7 @@
 
 for ac_func in gsl_sf_bessel_kl_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_kl_scaled_e" "ac_cv_func_gsl_sf_bessel_kl_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_kl_scaled_e" "ac_cv_func_gsl_sf_bessel_kl_scaled_e"
 if test "x$ac_cv_func_gsl_sf_bessel_kl_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KL_SCALED_E 1
@@ -4844,7 +5425,7 @@
 
 for ac_func in gsl_sf_exprel_n_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_exprel_n_e" "ac_cv_func_gsl_sf_exprel_n_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_exprel_n_e" "ac_cv_func_gsl_sf_exprel_n_e"
 if test "x$ac_cv_func_gsl_sf_exprel_n_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPREL_N_E 1
@@ -4857,7 +5438,7 @@
 
 for ac_func in gsl_sf_exprel_n_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_exprel_n_e" "ac_cv_func_gsl_sf_exprel_n_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_exprel_n_e" "ac_cv_func_gsl_sf_exprel_n_e"
 if test "x$ac_cv_func_gsl_sf_exprel_n_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXPREL_N_E 1
@@ -4870,7 +5451,7 @@
 
 for ac_func in gsl_sf_fermi_dirac_int_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_fermi_dirac_int_e" "ac_cv_func_gsl_sf_fermi_dirac_int_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_fermi_dirac_int_e" "ac_cv_func_gsl_sf_fermi_dirac_int_e"
 if test "x$ac_cv_func_gsl_sf_fermi_dirac_int_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_FERMI_DIRAC_INT_E 1
@@ -4883,7 +5464,7 @@
 
 for ac_func in gsl_sf_fermi_dirac_int_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_fermi_dirac_int_e" "ac_cv_func_gsl_sf_fermi_dirac_int_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_fermi_dirac_int_e" "ac_cv_func_gsl_sf_fermi_dirac_int_e"
 if test "x$ac_cv_func_gsl_sf_fermi_dirac_int_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_FERMI_DIRAC_INT_E 1
@@ -4896,7 +5477,7 @@
 
 for ac_func in gsl_sf_taylorcoeff_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_taylorcoeff_e" "ac_cv_func_gsl_sf_taylorcoeff_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_taylorcoeff_e" "ac_cv_func_gsl_sf_taylorcoeff_e"
 if test "x$ac_cv_func_gsl_sf_taylorcoeff_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_TAYLORCOEFF_E 1
@@ -4909,7 +5490,7 @@
 
 for ac_func in gsl_sf_taylorcoeff_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_taylorcoeff_e" "ac_cv_func_gsl_sf_taylorcoeff_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_taylorcoeff_e" "ac_cv_func_gsl_sf_taylorcoeff_e"
 if test "x$ac_cv_func_gsl_sf_taylorcoeff_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_TAYLORCOEFF_E 1
@@ -4922,7 +5503,7 @@
 
 for ac_func in gsl_sf_legendre_Pl_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_Pl_e" "ac_cv_func_gsl_sf_legendre_Pl_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_Pl_e" "ac_cv_func_gsl_sf_legendre_Pl_e"
 if test "x$ac_cv_func_gsl_sf_legendre_Pl_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_PL_E 1
@@ -4933,7 +5514,7 @@
 
 for ac_func in gsl_sf_legendre_Pl_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_Pl_e" "ac_cv_func_gsl_sf_legendre_Pl_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_Pl_e" "ac_cv_func_gsl_sf_legendre_Pl_e"
 if test "x$ac_cv_func_gsl_sf_legendre_Pl_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_PL_E 1
@@ -4944,7 +5525,7 @@
 
 for ac_func in gsl_sf_legendre_Ql_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_Ql_e" "ac_cv_func_gsl_sf_legendre_Ql_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_Ql_e" "ac_cv_func_gsl_sf_legendre_Ql_e"
 if test "x$ac_cv_func_gsl_sf_legendre_Ql_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_QL_E 1
@@ -4957,7 +5538,7 @@
 
 for ac_func in gsl_sf_legendre_Ql_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_Ql_e" "ac_cv_func_gsl_sf_legendre_Ql_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_Ql_e" "ac_cv_func_gsl_sf_legendre_Ql_e"
 if test "x$ac_cv_func_gsl_sf_legendre_Ql_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_QL_E 1
@@ -4970,7 +5551,7 @@
 
 for ac_func in gsl_sf_mathieu_a_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_mathieu_a_e" "ac_cv_func_gsl_sf_mathieu_a_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_mathieu_a_e" "ac_cv_func_gsl_sf_mathieu_a_e"
 if test "x$ac_cv_func_gsl_sf_mathieu_a_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_MATHIEU_A_E 1
@@ -4983,7 +5564,7 @@
 
 for ac_func in gsl_sf_mathieu_b_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_mathieu_b_e" "ac_cv_func_gsl_sf_mathieu_b_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_mathieu_b_e" "ac_cv_func_gsl_sf_mathieu_b_e"
 if test "x$ac_cv_func_gsl_sf_mathieu_b_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_MATHIEU_B_E 1
@@ -4996,7 +5577,7 @@
 
 for ac_func in gsl_sf_psi_n_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_psi_n_e" "ac_cv_func_gsl_sf_psi_n_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_psi_n_e" "ac_cv_func_gsl_sf_psi_n_e"
 if test "x$ac_cv_func_gsl_sf_psi_n_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_PSI_N_E 1
@@ -5009,7 +5590,7 @@
 
 for ac_func in gsl_sf_psi_n_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_psi_n_e" "ac_cv_func_gsl_sf_psi_n_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_psi_n_e" "ac_cv_func_gsl_sf_psi_n_e"
 if test "x$ac_cv_func_gsl_sf_psi_n_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_PSI_N_E 1
@@ -5022,7 +5603,7 @@
 
 for ac_func in gsl_sf_bessel_Jnu_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Jnu_e" "ac_cv_func_gsl_sf_bessel_Jnu_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Jnu_e" "ac_cv_func_gsl_sf_bessel_Jnu_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Jnu_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_JNU_E 1
@@ -5035,7 +5616,7 @@
 
 for ac_func in gsl_sf_bessel_Jnu_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Jnu_e" "ac_cv_func_gsl_sf_bessel_Jnu_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Jnu_e" "ac_cv_func_gsl_sf_bessel_Jnu_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Jnu_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_JNU_E 1
@@ -5048,7 +5629,7 @@
 
 for ac_func in gsl_sf_bessel_Ynu_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Ynu_e" "ac_cv_func_gsl_sf_bessel_Ynu_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Ynu_e" "ac_cv_func_gsl_sf_bessel_Ynu_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Ynu_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_YNU_E 1
@@ -5061,7 +5642,7 @@
 
 for ac_func in gsl_sf_bessel_Ynu_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Ynu_e" "ac_cv_func_gsl_sf_bessel_Ynu_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Ynu_e" "ac_cv_func_gsl_sf_bessel_Ynu_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Ynu_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_YNU_E 1
@@ -5074,7 +5655,7 @@
 
 for ac_func in gsl_sf_bessel_Inu_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Inu_e" "ac_cv_func_gsl_sf_bessel_Inu_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Inu_e" "ac_cv_func_gsl_sf_bessel_Inu_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Inu_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_INU_E 1
@@ -5087,7 +5668,7 @@
 
 for ac_func in gsl_sf_bessel_Inu_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Inu_e" "ac_cv_func_gsl_sf_bessel_Inu_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Inu_e" "ac_cv_func_gsl_sf_bessel_Inu_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Inu_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_INU_E 1
@@ -5100,7 +5681,7 @@
 
 for ac_func in gsl_sf_bessel_Inu_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Inu_scaled_e" "ac_cv_func_gsl_sf_bessel_Inu_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Inu_scaled_e" "ac_cv_func_gsl_sf_bessel_Inu_scaled_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Inu_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_INU_SCALED_E 1
@@ -5113,7 +5694,7 @@
 
 for ac_func in gsl_sf_bessel_Inu_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Inu_scaled_e" "ac_cv_func_gsl_sf_bessel_Inu_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Inu_scaled_e" "ac_cv_func_gsl_sf_bessel_Inu_scaled_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Inu_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_INU_SCALED_E 1
@@ -5126,7 +5707,7 @@
 
 for ac_func in gsl_sf_bessel_Knu_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Knu_e" "ac_cv_func_gsl_sf_bessel_Knu_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Knu_e" "ac_cv_func_gsl_sf_bessel_Knu_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Knu_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KNU_E 1
@@ -5139,7 +5720,7 @@
 
 for ac_func in gsl_sf_bessel_Knu_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Knu_e" "ac_cv_func_gsl_sf_bessel_Knu_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Knu_e" "ac_cv_func_gsl_sf_bessel_Knu_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Knu_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KNU_E 1
@@ -5152,7 +5733,7 @@
 
 for ac_func in gsl_sf_bessel_lnKnu_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_lnKnu_e" "ac_cv_func_gsl_sf_bessel_lnKnu_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_lnKnu_e" "ac_cv_func_gsl_sf_bessel_lnKnu_e"
 if test "x$ac_cv_func_gsl_sf_bessel_lnKnu_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_LNKNU_E 1
@@ -5165,7 +5746,7 @@
 
 for ac_func in gsl_sf_bessel_lnKnu_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_lnKnu_e" "ac_cv_func_gsl_sf_bessel_lnKnu_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_lnKnu_e" "ac_cv_func_gsl_sf_bessel_lnKnu_e"
 if test "x$ac_cv_func_gsl_sf_bessel_lnKnu_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_LNKNU_E 1
@@ -5178,7 +5759,7 @@
 
 for ac_func in gsl_sf_bessel_Knu_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Knu_scaled_e" "ac_cv_func_gsl_sf_bessel_Knu_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Knu_scaled_e" "ac_cv_func_gsl_sf_bessel_Knu_scaled_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Knu_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KNU_SCALED_E 1
@@ -5191,7 +5772,7 @@
 
 for ac_func in gsl_sf_bessel_Knu_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Knu_scaled_e" "ac_cv_func_gsl_sf_bessel_Knu_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Knu_scaled_e" "ac_cv_func_gsl_sf_bessel_Knu_scaled_e"
 if test "x$ac_cv_func_gsl_sf_bessel_Knu_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KNU_SCALED_E 1
@@ -5204,7 +5785,7 @@
 
 for ac_func in gsl_sf_exp_mult_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_exp_mult_e" "ac_cv_func_gsl_sf_exp_mult_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_exp_mult_e" "ac_cv_func_gsl_sf_exp_mult_e"
 if test "x$ac_cv_func_gsl_sf_exp_mult_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXP_MULT_E 1
@@ -5217,7 +5798,7 @@
 
 for ac_func in gsl_sf_exp_mult_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_exp_mult_e" "ac_cv_func_gsl_sf_exp_mult_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_exp_mult_e" "ac_cv_func_gsl_sf_exp_mult_e"
 if test "x$ac_cv_func_gsl_sf_exp_mult_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_EXP_MULT_E 1
@@ -5230,7 +5811,7 @@
 
 for ac_func in gsl_sf_fermi_dirac_inc_0_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_fermi_dirac_inc_0_e" "ac_cv_func_gsl_sf_fermi_dirac_inc_0_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_fermi_dirac_inc_0_e" "ac_cv_func_gsl_sf_fermi_dirac_inc_0_e"
 if test "x$ac_cv_func_gsl_sf_fermi_dirac_inc_0_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_FERMI_DIRAC_INC_0_E 1
@@ -5243,7 +5824,7 @@
 
 for ac_func in gsl_sf_fermi_dirac_inc_0_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_fermi_dirac_inc_0_e" "ac_cv_func_gsl_sf_fermi_dirac_inc_0_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_fermi_dirac_inc_0_e" "ac_cv_func_gsl_sf_fermi_dirac_inc_0_e"
 if test "x$ac_cv_func_gsl_sf_fermi_dirac_inc_0_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_FERMI_DIRAC_INC_0_E 1
@@ -5256,7 +5837,7 @@
 
 for ac_func in gsl_sf_poch_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_poch_e" "ac_cv_func_gsl_sf_poch_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_poch_e" "ac_cv_func_gsl_sf_poch_e"
 if test "x$ac_cv_func_gsl_sf_poch_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_POCH_E 1
@@ -5269,7 +5850,7 @@
 
 for ac_func in gsl_sf_poch_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_poch_e" "ac_cv_func_gsl_sf_poch_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_poch_e" "ac_cv_func_gsl_sf_poch_e"
 if test "x$ac_cv_func_gsl_sf_poch_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_POCH_E 1
@@ -5282,7 +5863,7 @@
 
 for ac_func in gsl_sf_lnpoch_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lnpoch_e" "ac_cv_func_gsl_sf_lnpoch_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lnpoch_e" "ac_cv_func_gsl_sf_lnpoch_e"
 if test "x$ac_cv_func_gsl_sf_lnpoch_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNPOCH_E 1
@@ -5295,7 +5876,7 @@
 
 for ac_func in gsl_sf_lnpoch_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lnpoch_e" "ac_cv_func_gsl_sf_lnpoch_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lnpoch_e" "ac_cv_func_gsl_sf_lnpoch_e"
 if test "x$ac_cv_func_gsl_sf_lnpoch_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNPOCH_E 1
@@ -5308,7 +5889,7 @@
 
 for ac_func in gsl_sf_pochrel_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_pochrel_e" "ac_cv_func_gsl_sf_pochrel_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_pochrel_e" "ac_cv_func_gsl_sf_pochrel_e"
 if test "x$ac_cv_func_gsl_sf_pochrel_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_POCHREL_E 1
@@ -5321,7 +5902,7 @@
 
 for ac_func in gsl_sf_pochrel_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_pochrel_e" "ac_cv_func_gsl_sf_pochrel_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_pochrel_e" "ac_cv_func_gsl_sf_pochrel_e"
 if test "x$ac_cv_func_gsl_sf_pochrel_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_POCHREL_E 1
@@ -5334,7 +5915,7 @@
 
 for ac_func in gsl_sf_gamma_inc_Q_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gamma_inc_Q_e" "ac_cv_func_gsl_sf_gamma_inc_Q_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gamma_inc_Q_e" "ac_cv_func_gsl_sf_gamma_inc_Q_e"
 if test "x$ac_cv_func_gsl_sf_gamma_inc_Q_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMA_INC_Q_E 1
@@ -5347,7 +5928,7 @@
 
 for ac_func in gsl_sf_gamma_inc_Q_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gamma_inc_Q_e" "ac_cv_func_gsl_sf_gamma_inc_Q_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gamma_inc_Q_e" "ac_cv_func_gsl_sf_gamma_inc_Q_e"
 if test "x$ac_cv_func_gsl_sf_gamma_inc_Q_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMA_INC_Q_E 1
@@ -5360,7 +5941,7 @@
 
 for ac_func in gsl_sf_gamma_inc_P_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gamma_inc_P_e" "ac_cv_func_gsl_sf_gamma_inc_P_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gamma_inc_P_e" "ac_cv_func_gsl_sf_gamma_inc_P_e"
 if test "x$ac_cv_func_gsl_sf_gamma_inc_P_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMA_INC_P_E 1
@@ -5373,7 +5954,7 @@
 
 for ac_func in gsl_sf_gamma_inc_P_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gamma_inc_P_e" "ac_cv_func_gsl_sf_gamma_inc_P_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gamma_inc_P_e" "ac_cv_func_gsl_sf_gamma_inc_P_e"
 if test "x$ac_cv_func_gsl_sf_gamma_inc_P_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMA_INC_P_E 1
@@ -5386,7 +5967,7 @@
 
 for ac_func in gsl_sf_gamma_inc_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gamma_inc_e" "ac_cv_func_gsl_sf_gamma_inc_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gamma_inc_e" "ac_cv_func_gsl_sf_gamma_inc_e"
 if test "x$ac_cv_func_gsl_sf_gamma_inc_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMA_INC_E 1
@@ -5399,7 +5980,7 @@
 
 for ac_func in gsl_sf_gamma_inc_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gamma_inc_e" "ac_cv_func_gsl_sf_gamma_inc_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gamma_inc_e" "ac_cv_func_gsl_sf_gamma_inc_e"
 if test "x$ac_cv_func_gsl_sf_gamma_inc_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GAMMA_INC_E 1
@@ -5412,7 +5993,7 @@
 
 for ac_func in gsl_sf_beta_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_beta_e" "ac_cv_func_gsl_sf_beta_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_beta_e" "ac_cv_func_gsl_sf_beta_e"
 if test "x$ac_cv_func_gsl_sf_beta_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BETA_E 1
@@ -5425,7 +6006,7 @@
 
 for ac_func in gsl_sf_beta_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_beta_e" "ac_cv_func_gsl_sf_beta_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_beta_e" "ac_cv_func_gsl_sf_beta_e"
 if test "x$ac_cv_func_gsl_sf_beta_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BETA_E 1
@@ -5438,7 +6019,7 @@
 
 for ac_func in gsl_sf_lnbeta_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lnbeta_e" "ac_cv_func_gsl_sf_lnbeta_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lnbeta_e" "ac_cv_func_gsl_sf_lnbeta_e"
 if test "x$ac_cv_func_gsl_sf_lnbeta_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNBETA_E 1
@@ -5451,7 +6032,7 @@
 
 for ac_func in gsl_sf_lnbeta_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lnbeta_e" "ac_cv_func_gsl_sf_lnbeta_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lnbeta_e" "ac_cv_func_gsl_sf_lnbeta_e"
 if test "x$ac_cv_func_gsl_sf_lnbeta_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNBETA_E 1
@@ -5464,7 +6045,7 @@
 
 for ac_func in gsl_sf_hyperg_0F1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hyperg_0F1_e" "ac_cv_func_gsl_sf_hyperg_0F1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hyperg_0F1_e" "ac_cv_func_gsl_sf_hyperg_0F1_e"
 if test "x$ac_cv_func_gsl_sf_hyperg_0F1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HYPERG_0F1_E 1
@@ -5477,7 +6058,7 @@
 
 for ac_func in gsl_sf_hyperg_0F1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hyperg_0F1_e" "ac_cv_func_gsl_sf_hyperg_0F1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hyperg_0F1_e" "ac_cv_func_gsl_sf_hyperg_0F1_e"
 if test "x$ac_cv_func_gsl_sf_hyperg_0F1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HYPERG_0F1_E 1
@@ -5490,7 +6071,7 @@
 
 for ac_func in gsl_sf_conicalP_half_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_conicalP_half_e" "ac_cv_func_gsl_sf_conicalP_half_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_conicalP_half_e" "ac_cv_func_gsl_sf_conicalP_half_e"
 if test "x$ac_cv_func_gsl_sf_conicalP_half_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CONICALP_HALF_E 1
@@ -5503,7 +6084,7 @@
 
 for ac_func in gsl_sf_conicalP_half_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_conicalP_half_e" "ac_cv_func_gsl_sf_conicalP_half_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_conicalP_half_e" "ac_cv_func_gsl_sf_conicalP_half_e"
 if test "x$ac_cv_func_gsl_sf_conicalP_half_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CONICALP_HALF_E 1
@@ -5516,7 +6097,7 @@
 
 for ac_func in gsl_sf_conicalP_mhalf_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_conicalP_mhalf_e" "ac_cv_func_gsl_sf_conicalP_mhalf_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_conicalP_mhalf_e" "ac_cv_func_gsl_sf_conicalP_mhalf_e"
 if test "x$ac_cv_func_gsl_sf_conicalP_mhalf_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CONICALP_MHALF_E 1
@@ -5529,7 +6110,7 @@
 
 for ac_func in gsl_sf_conicalP_mhalf_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_conicalP_mhalf_e" "ac_cv_func_gsl_sf_conicalP_mhalf_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_conicalP_mhalf_e" "ac_cv_func_gsl_sf_conicalP_mhalf_e"
 if test "x$ac_cv_func_gsl_sf_conicalP_mhalf_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CONICALP_MHALF_E 1
@@ -5542,7 +6123,7 @@
 
 for ac_func in gsl_sf_conicalP_0_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_conicalP_0_e" "ac_cv_func_gsl_sf_conicalP_0_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_conicalP_0_e" "ac_cv_func_gsl_sf_conicalP_0_e"
 if test "x$ac_cv_func_gsl_sf_conicalP_0_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CONICALP_0_E 1
@@ -5555,7 +6136,7 @@
 
 for ac_func in gsl_sf_conicalP_0_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_conicalP_0_e" "ac_cv_func_gsl_sf_conicalP_0_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_conicalP_0_e" "ac_cv_func_gsl_sf_conicalP_0_e"
 if test "x$ac_cv_func_gsl_sf_conicalP_0_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CONICALP_0_E 1
@@ -5568,7 +6149,7 @@
 
 for ac_func in gsl_sf_conicalP_1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_conicalP_1_e" "ac_cv_func_gsl_sf_conicalP_1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_conicalP_1_e" "ac_cv_func_gsl_sf_conicalP_1_e"
 if test "x$ac_cv_func_gsl_sf_conicalP_1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CONICALP_1_E 1
@@ -5581,7 +6162,7 @@
 
 for ac_func in gsl_sf_conicalP_1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_conicalP_1_e" "ac_cv_func_gsl_sf_conicalP_1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_conicalP_1_e" "ac_cv_func_gsl_sf_conicalP_1_e"
 if test "x$ac_cv_func_gsl_sf_conicalP_1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CONICALP_1_E 1
@@ -5594,7 +6175,7 @@
 
 for ac_func in gsl_sf_airy_Ai_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Ai_e" "ac_cv_func_gsl_sf_airy_Ai_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Ai_e" "ac_cv_func_gsl_sf_airy_Ai_e"
 if test "x$ac_cv_func_gsl_sf_airy_Ai_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_AI_E 1
@@ -5607,7 +6188,7 @@
 
 for ac_func in gsl_sf_airy_Ai_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Ai_e" "ac_cv_func_gsl_sf_airy_Ai_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Ai_e" "ac_cv_func_gsl_sf_airy_Ai_e"
 if test "x$ac_cv_func_gsl_sf_airy_Ai_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_AI_E 1
@@ -5620,7 +6201,7 @@
 
 for ac_func in gsl_sf_airy_Bi_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Bi_e" "ac_cv_func_gsl_sf_airy_Bi_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Bi_e" "ac_cv_func_gsl_sf_airy_Bi_e"
 if test "x$ac_cv_func_gsl_sf_airy_Bi_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_BI_E 1
@@ -5633,7 +6214,7 @@
 
 for ac_func in gsl_sf_airy_Bi_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Bi_e" "ac_cv_func_gsl_sf_airy_Bi_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Bi_e" "ac_cv_func_gsl_sf_airy_Bi_e"
 if test "x$ac_cv_func_gsl_sf_airy_Bi_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_BI_E 1
@@ -5646,7 +6227,7 @@
 
 for ac_func in gsl_sf_airy_Ai_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Ai_scaled_e" "ac_cv_func_gsl_sf_airy_Ai_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Ai_scaled_e" "ac_cv_func_gsl_sf_airy_Ai_scaled_e"
 if test "x$ac_cv_func_gsl_sf_airy_Ai_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_AI_SCALED_E 1
@@ -5659,7 +6240,7 @@
 
 for ac_func in gsl_sf_airy_Ai_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Ai_scaled_e" "ac_cv_func_gsl_sf_airy_Ai_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Ai_scaled_e" "ac_cv_func_gsl_sf_airy_Ai_scaled_e"
 if test "x$ac_cv_func_gsl_sf_airy_Ai_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_AI_SCALED_E 1
@@ -5672,7 +6253,7 @@
 
 for ac_func in gsl_sf_airy_Bi_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Bi_scaled_e" "ac_cv_func_gsl_sf_airy_Bi_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Bi_scaled_e" "ac_cv_func_gsl_sf_airy_Bi_scaled_e"
 if test "x$ac_cv_func_gsl_sf_airy_Bi_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_BI_SCALED_E 1
@@ -5685,7 +6266,7 @@
 
 for ac_func in gsl_sf_airy_Bi_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Bi_scaled_e" "ac_cv_func_gsl_sf_airy_Bi_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Bi_scaled_e" "ac_cv_func_gsl_sf_airy_Bi_scaled_e"
 if test "x$ac_cv_func_gsl_sf_airy_Bi_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_BI_SCALED_E 1
@@ -5698,7 +6279,7 @@
 
 for ac_func in gsl_sf_airy_Ai_deriv_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Ai_deriv_e" "ac_cv_func_gsl_sf_airy_Ai_deriv_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Ai_deriv_e" "ac_cv_func_gsl_sf_airy_Ai_deriv_e"
 if test "x$ac_cv_func_gsl_sf_airy_Ai_deriv_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_AI_DERIV_E 1
@@ -5711,7 +6292,7 @@
 
 for ac_func in gsl_sf_airy_Ai_deriv_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Ai_deriv_e" "ac_cv_func_gsl_sf_airy_Ai_deriv_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Ai_deriv_e" "ac_cv_func_gsl_sf_airy_Ai_deriv_e"
 if test "x$ac_cv_func_gsl_sf_airy_Ai_deriv_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_AI_DERIV_E 1
@@ -5724,7 +6305,7 @@
 
 for ac_func in gsl_sf_airy_Bi_deriv_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Bi_deriv_e" "ac_cv_func_gsl_sf_airy_Bi_deriv_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Bi_deriv_e" "ac_cv_func_gsl_sf_airy_Bi_deriv_e"
 if test "x$ac_cv_func_gsl_sf_airy_Bi_deriv_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_BI_DERIV_E 1
@@ -5737,7 +6318,7 @@
 
 for ac_func in gsl_sf_airy_Bi_deriv_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Bi_deriv_e" "ac_cv_func_gsl_sf_airy_Bi_deriv_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Bi_deriv_e" "ac_cv_func_gsl_sf_airy_Bi_deriv_e"
 if test "x$ac_cv_func_gsl_sf_airy_Bi_deriv_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_BI_DERIV_E 1
@@ -5750,7 +6331,7 @@
 
 for ac_func in gsl_sf_airy_Ai_deriv_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Ai_deriv_scaled_e" "ac_cv_func_gsl_sf_airy_Ai_deriv_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Ai_deriv_scaled_e" "ac_cv_func_gsl_sf_airy_Ai_deriv_scaled_e"
 if test "x$ac_cv_func_gsl_sf_airy_Ai_deriv_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_AI_DERIV_SCALED_E 1
@@ -5763,7 +6344,7 @@
 
 for ac_func in gsl_sf_airy_Ai_deriv_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Ai_deriv_scaled_e" "ac_cv_func_gsl_sf_airy_Ai_deriv_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Ai_deriv_scaled_e" "ac_cv_func_gsl_sf_airy_Ai_deriv_scaled_e"
 if test "x$ac_cv_func_gsl_sf_airy_Ai_deriv_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_AI_DERIV_SCALED_E 1
@@ -5776,7 +6357,7 @@
 
 for ac_func in gsl_sf_airy_Bi_deriv_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Bi_deriv_scaled_e" "ac_cv_func_gsl_sf_airy_Bi_deriv_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Bi_deriv_scaled_e" "ac_cv_func_gsl_sf_airy_Bi_deriv_scaled_e"
 if test "x$ac_cv_func_gsl_sf_airy_Bi_deriv_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_BI_DERIV_SCALED_E 1
@@ -5789,7 +6370,7 @@
 
 for ac_func in gsl_sf_airy_Bi_deriv_scaled_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_Bi_deriv_scaled_e" "ac_cv_func_gsl_sf_airy_Bi_deriv_scaled_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_Bi_deriv_scaled_e" "ac_cv_func_gsl_sf_airy_Bi_deriv_scaled_e"
 if test "x$ac_cv_func_gsl_sf_airy_Bi_deriv_scaled_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_BI_DERIV_SCALED_E 1
@@ -5802,7 +6383,7 @@
 
 for ac_func in gsl_sf_ellint_Kcomp_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_Kcomp_e" "ac_cv_func_gsl_sf_ellint_Kcomp_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_Kcomp_e" "ac_cv_func_gsl_sf_ellint_Kcomp_e"
 if test "x$ac_cv_func_gsl_sf_ellint_Kcomp_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_KCOMP_E 1
@@ -5815,7 +6396,7 @@
 
 for ac_func in gsl_sf_ellint_Kcomp_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_Kcomp_e" "ac_cv_func_gsl_sf_ellint_Kcomp_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_Kcomp_e" "ac_cv_func_gsl_sf_ellint_Kcomp_e"
 if test "x$ac_cv_func_gsl_sf_ellint_Kcomp_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_KCOMP_E 1
@@ -5828,7 +6409,7 @@
 
 for ac_func in gsl_sf_ellint_Ecomp_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_Ecomp_e" "ac_cv_func_gsl_sf_ellint_Ecomp_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_Ecomp_e" "ac_cv_func_gsl_sf_ellint_Ecomp_e"
 if test "x$ac_cv_func_gsl_sf_ellint_Ecomp_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_ECOMP_E 1
@@ -5841,7 +6422,7 @@
 
 for ac_func in gsl_sf_ellint_Ecomp_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_Ecomp_e" "ac_cv_func_gsl_sf_ellint_Ecomp_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_Ecomp_e" "ac_cv_func_gsl_sf_ellint_Ecomp_e"
 if test "x$ac_cv_func_gsl_sf_ellint_Ecomp_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_ECOMP_E 1
@@ -5854,7 +6435,7 @@
 
 for ac_func in gsl_sf_ellint_E_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_E_e" "ac_cv_func_gsl_sf_ellint_E_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_E_e" "ac_cv_func_gsl_sf_ellint_E_e"
 if test "x$ac_cv_func_gsl_sf_ellint_E_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_E_E 1
@@ -5867,7 +6448,7 @@
 
 for ac_func in gsl_sf_ellint_F_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_F_e" "ac_cv_func_gsl_sf_ellint_F_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_F_e" "ac_cv_func_gsl_sf_ellint_F_e"
 if test "x$ac_cv_func_gsl_sf_ellint_F_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_F_E 1
@@ -5880,7 +6461,7 @@
 
 for ac_func in gsl_sf_ellint_Pcomp_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_Pcomp_e" "ac_cv_func_gsl_sf_ellint_Pcomp_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_Pcomp_e" "ac_cv_func_gsl_sf_ellint_Pcomp_e"
 if test "x$ac_cv_func_gsl_sf_ellint_Pcomp_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_PCOMP_E 1
@@ -5893,7 +6474,7 @@
 
 for ac_func in gsl_sf_ellint_RC_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_RC_e" "ac_cv_func_gsl_sf_ellint_RC_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_RC_e" "ac_cv_func_gsl_sf_ellint_RC_e"
 if test "x$ac_cv_func_gsl_sf_ellint_RC_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_RC_E 1
@@ -5906,7 +6487,7 @@
 
 for ac_func in gsl_sf_ellint_D_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_D_e" "ac_cv_func_gsl_sf_ellint_D_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_D_e" "ac_cv_func_gsl_sf_ellint_D_e"
 if test "x$ac_cv_func_gsl_sf_ellint_D_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_D_E 1
@@ -5919,7 +6500,7 @@
 
 for ac_func in gsl_sf_ellint_P_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_P_e" "ac_cv_func_gsl_sf_ellint_P_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_P_e" "ac_cv_func_gsl_sf_ellint_P_e"
 if test "x$ac_cv_func_gsl_sf_ellint_P_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_P_E 1
@@ -5932,7 +6513,7 @@
 
 for ac_func in gsl_sf_ellint_RD_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_RD_e" "ac_cv_func_gsl_sf_ellint_RD_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_RD_e" "ac_cv_func_gsl_sf_ellint_RD_e"
 if test "x$ac_cv_func_gsl_sf_ellint_RD_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_RD_E 1
@@ -5945,7 +6526,7 @@
 
 for ac_func in gsl_sf_ellint_RF_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_RF_e" "ac_cv_func_gsl_sf_ellint_RF_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_RF_e" "ac_cv_func_gsl_sf_ellint_RF_e"
 if test "x$ac_cv_func_gsl_sf_ellint_RF_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_RF_E 1
@@ -5958,7 +6539,7 @@
 
 for ac_func in gsl_sf_ellint_RJ_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_ellint_RJ_e" "ac_cv_func_gsl_sf_ellint_RJ_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_ellint_RJ_e" "ac_cv_func_gsl_sf_ellint_RJ_e"
 if test "x$ac_cv_func_gsl_sf_ellint_RJ_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ELLINT_RJ_E 1
@@ -5971,7 +6552,7 @@
 
 for ac_func in gsl_sf_airy_zero_Ai_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_zero_Ai_e" "ac_cv_func_gsl_sf_airy_zero_Ai_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_zero_Ai_e" "ac_cv_func_gsl_sf_airy_zero_Ai_e"
 if test "x$ac_cv_func_gsl_sf_airy_zero_Ai_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_ZERO_AI_E 1
@@ -5984,7 +6565,7 @@
 
 for ac_func in gsl_sf_airy_zero_Ai_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_zero_Ai_e" "ac_cv_func_gsl_sf_airy_zero_Ai_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_zero_Ai_e" "ac_cv_func_gsl_sf_airy_zero_Ai_e"
 if test "x$ac_cv_func_gsl_sf_airy_zero_Ai_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_ZERO_AI_E 1
@@ -5997,7 +6578,7 @@
 
 for ac_func in gsl_sf_airy_zero_Bi_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_zero_Bi_e" "ac_cv_func_gsl_sf_airy_zero_Bi_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_zero_Bi_e" "ac_cv_func_gsl_sf_airy_zero_Bi_e"
 if test "x$ac_cv_func_gsl_sf_airy_zero_Bi_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_ZERO_BI_E 1
@@ -6010,7 +6591,7 @@
 
 for ac_func in gsl_sf_airy_zero_Bi_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_zero_Bi_e" "ac_cv_func_gsl_sf_airy_zero_Bi_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_zero_Bi_e" "ac_cv_func_gsl_sf_airy_zero_Bi_e"
 if test "x$ac_cv_func_gsl_sf_airy_zero_Bi_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_ZERO_BI_E 1
@@ -6023,7 +6604,7 @@
 
 for ac_func in gsl_sf_airy_zero_Ai_deriv_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_zero_Ai_deriv_e" "ac_cv_func_gsl_sf_airy_zero_Ai_deriv_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_zero_Ai_deriv_e" "ac_cv_func_gsl_sf_airy_zero_Ai_deriv_e"
 if test "x$ac_cv_func_gsl_sf_airy_zero_Ai_deriv_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_ZERO_AI_DERIV_E 1
@@ -6036,7 +6617,7 @@
 
 for ac_func in gsl_sf_airy_zero_Ai_deriv_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_zero_Ai_deriv_e" "ac_cv_func_gsl_sf_airy_zero_Ai_deriv_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_zero_Ai_deriv_e" "ac_cv_func_gsl_sf_airy_zero_Ai_deriv_e"
 if test "x$ac_cv_func_gsl_sf_airy_zero_Ai_deriv_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_ZERO_AI_DERIV_E 1
@@ -6049,7 +6630,7 @@
 
 for ac_func in gsl_sf_airy_zero_Bi_deriv_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_zero_Bi_deriv_e" "ac_cv_func_gsl_sf_airy_zero_Bi_deriv_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_zero_Bi_deriv_e" "ac_cv_func_gsl_sf_airy_zero_Bi_deriv_e"
 if test "x$ac_cv_func_gsl_sf_airy_zero_Bi_deriv_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_ZERO_BI_DERIV_E 1
@@ -6062,7 +6643,7 @@
 
 for ac_func in gsl_sf_airy_zero_Bi_deriv_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_airy_zero_Bi_deriv_e" "ac_cv_func_gsl_sf_airy_zero_Bi_deriv_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_airy_zero_Bi_deriv_e" "ac_cv_func_gsl_sf_airy_zero_Bi_deriv_e"
 if test "x$ac_cv_func_gsl_sf_airy_zero_Bi_deriv_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_AIRY_ZERO_BI_DERIV_E 1
@@ -6075,7 +6656,7 @@
 
 for ac_func in gsl_sf_bessel_zero_J0_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_zero_J0_e" "ac_cv_func_gsl_sf_bessel_zero_J0_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_zero_J0_e" "ac_cv_func_gsl_sf_bessel_zero_J0_e"
 if test "x$ac_cv_func_gsl_sf_bessel_zero_J0_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_ZERO_J0_E 1
@@ -6088,7 +6669,7 @@
 
 for ac_func in gsl_sf_bessel_zero_J0_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_zero_J0_e" "ac_cv_func_gsl_sf_bessel_zero_J0_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_zero_J0_e" "ac_cv_func_gsl_sf_bessel_zero_J0_e"
 if test "x$ac_cv_func_gsl_sf_bessel_zero_J0_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_ZERO_J0_E 1
@@ -6101,7 +6682,7 @@
 
 for ac_func in gsl_sf_bessel_zero_J1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_zero_J1_e" "ac_cv_func_gsl_sf_bessel_zero_J1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_zero_J1_e" "ac_cv_func_gsl_sf_bessel_zero_J1_e"
 if test "x$ac_cv_func_gsl_sf_bessel_zero_J1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_ZERO_J1_E 1
@@ -6114,7 +6695,7 @@
 
 for ac_func in gsl_sf_bessel_zero_J1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_zero_J1_e" "ac_cv_func_gsl_sf_bessel_zero_J1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_zero_J1_e" "ac_cv_func_gsl_sf_bessel_zero_J1_e"
 if test "x$ac_cv_func_gsl_sf_bessel_zero_J1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_ZERO_J1_E 1
@@ -6127,7 +6708,7 @@
 
 for ac_func in gsl_sf_psi_1_int_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_psi_1_int_e" "ac_cv_func_gsl_sf_psi_1_int_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_psi_1_int_e" "ac_cv_func_gsl_sf_psi_1_int_e"
 if test "x$ac_cv_func_gsl_sf_psi_1_int_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_PSI_1_INT_E 1
@@ -6140,7 +6721,7 @@
 
 for ac_func in gsl_sf_psi_1_int_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_psi_1_int_e" "ac_cv_func_gsl_sf_psi_1_int_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_psi_1_int_e" "ac_cv_func_gsl_sf_psi_1_int_e"
 if test "x$ac_cv_func_gsl_sf_psi_1_int_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_PSI_1_INT_E 1
@@ -6153,7 +6734,7 @@
 
 for ac_func in gsl_sf_conicalP_cyl_reg_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_conicalP_cyl_reg_e" "ac_cv_func_gsl_sf_conicalP_cyl_reg_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_conicalP_cyl_reg_e" "ac_cv_func_gsl_sf_conicalP_cyl_reg_e"
 if test "x$ac_cv_func_gsl_sf_conicalP_cyl_reg_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CONICALP_CYL_REG_E 1
@@ -6166,7 +6747,7 @@
 
 for ac_func in gsl_sf_conicalP_sph_reg_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_conicalP_sph_reg_e" "ac_cv_func_gsl_sf_conicalP_sph_reg_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_conicalP_sph_reg_e" "ac_cv_func_gsl_sf_conicalP_sph_reg_e"
 if test "x$ac_cv_func_gsl_sf_conicalP_sph_reg_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CONICALP_SPH_REG_E 1
@@ -6179,7 +6760,7 @@
 
 for ac_func in gsl_sf_gegenpoly_n_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gegenpoly_n_e" "ac_cv_func_gsl_sf_gegenpoly_n_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gegenpoly_n_e" "ac_cv_func_gsl_sf_gegenpoly_n_e"
 if test "x$ac_cv_func_gsl_sf_gegenpoly_n_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GEGENPOLY_N_E 1
@@ -6192,7 +6773,7 @@
 
 for ac_func in gsl_sf_laguerre_n_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_laguerre_n_e" "ac_cv_func_gsl_sf_laguerre_n_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_laguerre_n_e" "ac_cv_func_gsl_sf_laguerre_n_e"
 if test "x$ac_cv_func_gsl_sf_laguerre_n_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LAGUERRE_N_E 1
@@ -6205,7 +6786,7 @@
 
 for ac_func in gsl_sf_mathieu_ce_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_mathieu_ce_e" "ac_cv_func_gsl_sf_mathieu_ce_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_mathieu_ce_e" "ac_cv_func_gsl_sf_mathieu_ce_e"
 if test "x$ac_cv_func_gsl_sf_mathieu_ce_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_MATHIEU_CE_E 1
@@ -6218,7 +6799,7 @@
 
 for ac_func in gsl_sf_mathieu_se_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_mathieu_se_e" "ac_cv_func_gsl_sf_mathieu_se_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_mathieu_se_e" "ac_cv_func_gsl_sf_mathieu_se_e"
 if test "x$ac_cv_func_gsl_sf_mathieu_se_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_MATHIEU_SE_E 1
@@ -6231,7 +6812,7 @@
 
 for ac_func in gsl_sf_hyperg_U_int_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hyperg_U_int_e" "ac_cv_func_gsl_sf_hyperg_U_int_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hyperg_U_int_e" "ac_cv_func_gsl_sf_hyperg_U_int_e"
 if test "x$ac_cv_func_gsl_sf_hyperg_U_int_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HYPERG_U_INT_E 1
@@ -6244,7 +6825,7 @@
 
 for ac_func in gsl_sf_hyperg_1F1_int_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hyperg_1F1_int_e" "ac_cv_func_gsl_sf_hyperg_1F1_int_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hyperg_1F1_int_e" "ac_cv_func_gsl_sf_hyperg_1F1_int_e"
 if test "x$ac_cv_func_gsl_sf_hyperg_1F1_int_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HYPERG_1F1_INT_E 1
@@ -6257,7 +6838,7 @@
 
 for ac_func in gsl_sf_legendre_Plm_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_Plm_e" "ac_cv_func_gsl_sf_legendre_Plm_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_Plm_e" "ac_cv_func_gsl_sf_legendre_Plm_e"
 if test "x$ac_cv_func_gsl_sf_legendre_Plm_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_PLM_E 1
@@ -6268,7 +6849,7 @@
 
 for ac_func in gsl_sf_legendre_Plm_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_Plm_e" "ac_cv_func_gsl_sf_legendre_Plm_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_Plm_e" "ac_cv_func_gsl_sf_legendre_Plm_e"
 if test "x$ac_cv_func_gsl_sf_legendre_Plm_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_PLM_E 1
@@ -6279,7 +6860,7 @@
 
 for ac_func in gsl_sf_legendre_sphPlm_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_sphPlm_e" "ac_cv_func_gsl_sf_legendre_sphPlm_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_sphPlm_e" "ac_cv_func_gsl_sf_legendre_sphPlm_e"
 if test "x$ac_cv_func_gsl_sf_legendre_sphPlm_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_SPHPLM_E 1
@@ -6290,7 +6871,7 @@
 
 for ac_func in gsl_sf_legendre_sphPlm_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_sphPlm_e" "ac_cv_func_gsl_sf_legendre_sphPlm_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_sphPlm_e" "ac_cv_func_gsl_sf_legendre_sphPlm_e"
 if test "x$ac_cv_func_gsl_sf_legendre_sphPlm_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_SPHPLM_E 1
@@ -6301,7 +6882,7 @@
 
 for ac_func in gsl_sf_hydrogenicR_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hydrogenicR_e" "ac_cv_func_gsl_sf_hydrogenicR_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hydrogenicR_e" "ac_cv_func_gsl_sf_hydrogenicR_e"
 if test "x$ac_cv_func_gsl_sf_hydrogenicR_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HYDROGENICR_E 1
@@ -6314,7 +6895,7 @@
 
 for ac_func in gsl_sf_mathieu_Mc_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_mathieu_Mc_e" "ac_cv_func_gsl_sf_mathieu_Mc_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_mathieu_Mc_e" "ac_cv_func_gsl_sf_mathieu_Mc_e"
 if test "x$ac_cv_func_gsl_sf_mathieu_Mc_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_MATHIEU_MC_E 1
@@ -6327,7 +6908,7 @@
 
 for ac_func in gsl_sf_mathieu_Ms_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_mathieu_Ms_e" "ac_cv_func_gsl_sf_mathieu_Ms_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_mathieu_Ms_e" "ac_cv_func_gsl_sf_mathieu_Ms_e"
 if test "x$ac_cv_func_gsl_sf_mathieu_Ms_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_MATHIEU_MS_E 1
@@ -6340,7 +6921,7 @@
 
 for ac_func in gsl_sf_bessel_zero_Jnu_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_zero_Jnu_e" "ac_cv_func_gsl_sf_bessel_zero_Jnu_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_zero_Jnu_e" "ac_cv_func_gsl_sf_bessel_zero_Jnu_e"
 if test "x$ac_cv_func_gsl_sf_bessel_zero_Jnu_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_ZERO_JNU_E 1
@@ -6353,7 +6934,7 @@
 
 for ac_func in gsl_sf_hyperg_U_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hyperg_U_e" "ac_cv_func_gsl_sf_hyperg_U_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hyperg_U_e" "ac_cv_func_gsl_sf_hyperg_U_e"
 if test "x$ac_cv_func_gsl_sf_hyperg_U_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HYPERG_U_E 1
@@ -6366,7 +6947,7 @@
 
 for ac_func in gsl_sf_hyperg_U_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hyperg_U_e" "ac_cv_func_gsl_sf_hyperg_U_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hyperg_U_e" "ac_cv_func_gsl_sf_hyperg_U_e"
 if test "x$ac_cv_func_gsl_sf_hyperg_U_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HYPERG_U_E 1
@@ -6379,7 +6960,7 @@
 
 for ac_func in gsl_sf_hyperg_1F1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hyperg_1F1_e" "ac_cv_func_gsl_sf_hyperg_1F1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hyperg_1F1_e" "ac_cv_func_gsl_sf_hyperg_1F1_e"
 if test "x$ac_cv_func_gsl_sf_hyperg_1F1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HYPERG_1F1_E 1
@@ -6392,7 +6973,7 @@
 
 for ac_func in gsl_sf_hyperg_1F1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hyperg_1F1_e" "ac_cv_func_gsl_sf_hyperg_1F1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hyperg_1F1_e" "ac_cv_func_gsl_sf_hyperg_1F1_e"
 if test "x$ac_cv_func_gsl_sf_hyperg_1F1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HYPERG_1F1_E 1
@@ -6405,7 +6986,7 @@
 
 for ac_func in gsl_sf_hyperg_2F0_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hyperg_2F0_e" "ac_cv_func_gsl_sf_hyperg_2F0_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hyperg_2F0_e" "ac_cv_func_gsl_sf_hyperg_2F0_e"
 if test "x$ac_cv_func_gsl_sf_hyperg_2F0_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HYPERG_2F0_E 1
@@ -6418,7 +6999,7 @@
 
 for ac_func in gsl_sf_hyperg_2F0_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hyperg_2F0_e" "ac_cv_func_gsl_sf_hyperg_2F0_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hyperg_2F0_e" "ac_cv_func_gsl_sf_hyperg_2F0_e"
 if test "x$ac_cv_func_gsl_sf_hyperg_2F0_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HYPERG_2F0_E 1
@@ -6431,7 +7012,7 @@
 
 for ac_func in gsl_sf_beta_inc_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_beta_inc_e" "ac_cv_func_gsl_sf_beta_inc_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_beta_inc_e" "ac_cv_func_gsl_sf_beta_inc_e"
 if test "x$ac_cv_func_gsl_sf_beta_inc_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BETA_INC_E 1
@@ -6444,7 +7025,7 @@
 
 for ac_func in gsl_sf_hyperg_2F1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hyperg_2F1_e" "ac_cv_func_gsl_sf_hyperg_2F1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hyperg_2F1_e" "ac_cv_func_gsl_sf_hyperg_2F1_e"
 if test "x$ac_cv_func_gsl_sf_hyperg_2F1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HYPERG_2F1_E 1
@@ -6457,7 +7038,7 @@
 
 for ac_func in gsl_sf_fact_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_fact_e" "ac_cv_func_gsl_sf_fact_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_fact_e" "ac_cv_func_gsl_sf_fact_e"
 if test "x$ac_cv_func_gsl_sf_fact_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_FACT_E 1
@@ -6470,7 +7051,7 @@
 
 for ac_func in gsl_sf_doublefact_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_doublefact_e" "ac_cv_func_gsl_sf_doublefact_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_doublefact_e" "ac_cv_func_gsl_sf_doublefact_e"
 if test "x$ac_cv_func_gsl_sf_doublefact_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_DOUBLEFACT_E 1
@@ -6483,7 +7064,7 @@
 
 for ac_func in gsl_sf_lnfact_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lnfact_e" "ac_cv_func_gsl_sf_lnfact_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lnfact_e" "ac_cv_func_gsl_sf_lnfact_e"
 if test "x$ac_cv_func_gsl_sf_lnfact_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNFACT_E 1
@@ -6496,7 +7077,7 @@
 
 for ac_func in gsl_sf_lndoublefact_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lndoublefact_e" "ac_cv_func_gsl_sf_lndoublefact_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lndoublefact_e" "ac_cv_func_gsl_sf_lndoublefact_e"
 if test "x$ac_cv_func_gsl_sf_lndoublefact_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNDOUBLEFACT_E 1
@@ -6509,7 +7090,7 @@
 
 for ac_func in gsl_sf_choose_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_choose_e" "ac_cv_func_gsl_sf_choose_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_choose_e" "ac_cv_func_gsl_sf_choose_e"
 if test "x$ac_cv_func_gsl_sf_choose_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_CHOOSE_E 1
@@ -6522,7 +7103,7 @@
 
 for ac_func in gsl_sf_lnchoose_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_lnchoose_e" "ac_cv_func_gsl_sf_lnchoose_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_lnchoose_e" "ac_cv_func_gsl_sf_lnchoose_e"
 if test "x$ac_cv_func_gsl_sf_lnchoose_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LNCHOOSE_E 1
@@ -6535,7 +7116,7 @@
 
 for ac_func in gsl_sf_coupling_3j_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_coupling_3j_e" "ac_cv_func_gsl_sf_coupling_3j_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_coupling_3j_e" "ac_cv_func_gsl_sf_coupling_3j_e"
 if test "x$ac_cv_func_gsl_sf_coupling_3j_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_COUPLING_3J_E 1
@@ -6548,7 +7129,7 @@
 
 for ac_func in gsl_sf_coupling_3j_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_coupling_3j_e" "ac_cv_func_gsl_sf_coupling_3j_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_coupling_3j_e" "ac_cv_func_gsl_sf_coupling_3j_e"
 if test "x$ac_cv_func_gsl_sf_coupling_3j_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_COUPLING_3J_E 1
@@ -6561,7 +7142,7 @@
 
 for ac_func in gsl_sf_coupling_6j_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_coupling_6j_e" "ac_cv_func_gsl_sf_coupling_6j_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_coupling_6j_e" "ac_cv_func_gsl_sf_coupling_6j_e"
 if test "x$ac_cv_func_gsl_sf_coupling_6j_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_COUPLING_6J_E 1
@@ -6574,7 +7155,7 @@
 
 for ac_func in gsl_sf_coupling_6j_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_coupling_6j_e" "ac_cv_func_gsl_sf_coupling_6j_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_coupling_6j_e" "ac_cv_func_gsl_sf_coupling_6j_e"
 if test "x$ac_cv_func_gsl_sf_coupling_6j_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_COUPLING_6J_E 1
@@ -6587,7 +7168,7 @@
 
 for ac_func in gsl_sf_coupling_9j_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_coupling_9j_e" "ac_cv_func_gsl_sf_coupling_9j_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_coupling_9j_e" "ac_cv_func_gsl_sf_coupling_9j_e"
 if test "x$ac_cv_func_gsl_sf_coupling_9j_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_COUPLING_9J_E 1
@@ -6600,7 +7181,7 @@
 
 for ac_func in gsl_sf_coupling_9j_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_coupling_9j_e" "ac_cv_func_gsl_sf_coupling_9j_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_coupling_9j_e" "ac_cv_func_gsl_sf_coupling_9j_e"
 if test "x$ac_cv_func_gsl_sf_coupling_9j_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_COUPLING_9J_E 1
@@ -6613,7 +7194,7 @@
 
 for ac_func in gsl_sf_bessel_jl_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_jl_array" "ac_cv_func_gsl_sf_bessel_jl_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_jl_array" "ac_cv_func_gsl_sf_bessel_jl_array"
 if test "x$ac_cv_func_gsl_sf_bessel_jl_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_JL_ARRAY 1
@@ -6626,7 +7207,7 @@
 
 for ac_func in gsl_sf_bessel_jl_steed_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_jl_steed_array" "ac_cv_func_gsl_sf_bessel_jl_steed_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_jl_steed_array" "ac_cv_func_gsl_sf_bessel_jl_steed_array"
 if test "x$ac_cv_func_gsl_sf_bessel_jl_steed_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_JL_STEED_ARRAY 1
@@ -6639,7 +7220,7 @@
 
 for ac_func in gsl_sf_bessel_il_scaled_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_il_scaled_array" "ac_cv_func_gsl_sf_bessel_il_scaled_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_il_scaled_array" "ac_cv_func_gsl_sf_bessel_il_scaled_array"
 if test "x$ac_cv_func_gsl_sf_bessel_il_scaled_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_IL_SCALED_ARRAY 1
@@ -6652,7 +7233,7 @@
 
 for ac_func in gsl_sf_bessel_kl_scaled_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_kl_scaled_array" "ac_cv_func_gsl_sf_bessel_kl_scaled_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_kl_scaled_array" "ac_cv_func_gsl_sf_bessel_kl_scaled_array"
 if test "x$ac_cv_func_gsl_sf_bessel_kl_scaled_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KL_SCALED_ARRAY 1
@@ -6665,7 +7246,7 @@
 
 for ac_func in gsl_sf_bessel_yl_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_yl_array" "ac_cv_func_gsl_sf_bessel_yl_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_yl_array" "ac_cv_func_gsl_sf_bessel_yl_array"
 if test "x$ac_cv_func_gsl_sf_bessel_yl_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_YL_ARRAY 1
@@ -6678,7 +7259,7 @@
 
 for ac_func in gsl_sf_legendre_Pl_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_Pl_array" "ac_cv_func_gsl_sf_legendre_Pl_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_Pl_array" "ac_cv_func_gsl_sf_legendre_Pl_array"
 if test "x$ac_cv_func_gsl_sf_legendre_Pl_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_PL_ARRAY 1
@@ -6691,7 +7272,7 @@
 
 for ac_func in gsl_sf_gegenpoly_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_gegenpoly_array" "ac_cv_func_gsl_sf_gegenpoly_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_gegenpoly_array" "ac_cv_func_gsl_sf_gegenpoly_array"
 if test "x$ac_cv_func_gsl_sf_gegenpoly_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_GEGENPOLY_ARRAY 1
@@ -6704,7 +7285,7 @@
 
 for ac_func in gsl_sf_bessel_In_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_In_array" "ac_cv_func_gsl_sf_bessel_In_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_In_array" "ac_cv_func_gsl_sf_bessel_In_array"
 if test "x$ac_cv_func_gsl_sf_bessel_In_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_IN_ARRAY 1
@@ -6717,7 +7298,7 @@
 
 for ac_func in gsl_sf_bessel_In_scaled_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_In_scaled_array" "ac_cv_func_gsl_sf_bessel_In_scaled_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_In_scaled_array" "ac_cv_func_gsl_sf_bessel_In_scaled_array"
 if test "x$ac_cv_func_gsl_sf_bessel_In_scaled_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_IN_SCALED_ARRAY 1
@@ -6730,7 +7311,7 @@
 
 for ac_func in gsl_sf_bessel_Jn_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Jn_array" "ac_cv_func_gsl_sf_bessel_Jn_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Jn_array" "ac_cv_func_gsl_sf_bessel_Jn_array"
 if test "x$ac_cv_func_gsl_sf_bessel_Jn_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_JN_ARRAY 1
@@ -6743,7 +7324,7 @@
 
 for ac_func in gsl_sf_bessel_Kn_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Kn_array" "ac_cv_func_gsl_sf_bessel_Kn_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Kn_array" "ac_cv_func_gsl_sf_bessel_Kn_array"
 if test "x$ac_cv_func_gsl_sf_bessel_Kn_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KN_ARRAY 1
@@ -6756,7 +7337,7 @@
 
 for ac_func in gsl_sf_bessel_Kn_scaled_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Kn_scaled_array" "ac_cv_func_gsl_sf_bessel_Kn_scaled_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Kn_scaled_array" "ac_cv_func_gsl_sf_bessel_Kn_scaled_array"
 if test "x$ac_cv_func_gsl_sf_bessel_Kn_scaled_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_KN_SCALED_ARRAY 1
@@ -6769,7 +7350,7 @@
 
 for ac_func in gsl_sf_bessel_Yn_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_bessel_Yn_array" "ac_cv_func_gsl_sf_bessel_Yn_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_bessel_Yn_array" "ac_cv_func_gsl_sf_bessel_Yn_array"
 if test "x$ac_cv_func_gsl_sf_bessel_Yn_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_BESSEL_YN_ARRAY 1
@@ -6782,7 +7363,7 @@
 
 for ac_func in gsl_sf_legendre_Plm_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_Plm_array" "ac_cv_func_gsl_sf_legendre_Plm_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_Plm_array" "ac_cv_func_gsl_sf_legendre_Plm_array"
 if test "x$ac_cv_func_gsl_sf_legendre_Plm_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_PLM_ARRAY 1
@@ -6793,7 +7374,7 @@
 
 for ac_func in gsl_sf_legendre_Plm_deriv_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_Plm_deriv_array" "ac_cv_func_gsl_sf_legendre_Plm_deriv_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_Plm_deriv_array" "ac_cv_func_gsl_sf_legendre_Plm_deriv_array"
 if test "x$ac_cv_func_gsl_sf_legendre_Plm_deriv_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_PLM_DERIV_ARRAY 1
@@ -6804,7 +7385,7 @@
 
 for ac_func in gsl_sf_legendre_sphPlm_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_sphPlm_array" "ac_cv_func_gsl_sf_legendre_sphPlm_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_sphPlm_array" "ac_cv_func_gsl_sf_legendre_sphPlm_array"
 if test "x$ac_cv_func_gsl_sf_legendre_sphPlm_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_SPHPLM_ARRAY 1
@@ -6815,7 +7396,7 @@
 
 for ac_func in gsl_sf_legendre_sphPlm_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_sphPlm_array" "ac_cv_func_gsl_sf_legendre_sphPlm_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_sphPlm_array" "ac_cv_func_gsl_sf_legendre_sphPlm_array"
 if test "x$ac_cv_func_gsl_sf_legendre_sphPlm_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_SPHPLM_ARRAY 1
@@ -6826,7 +7407,7 @@
 
 for ac_func in gsl_sf_legendre_sphPlm_deriv_array
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_sphPlm_deriv_array" "ac_cv_func_gsl_sf_legendre_sphPlm_deriv_array"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_sphPlm_deriv_array" "ac_cv_func_gsl_sf_legendre_sphPlm_deriv_array"
 if test "x$ac_cv_func_gsl_sf_legendre_sphPlm_deriv_array" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_SPHPLM_DERIV_ARRAY 1
@@ -6837,7 +7418,7 @@
 
 for ac_func in gsl_sf_legendre_array_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_array_e" "ac_cv_func_gsl_sf_legendre_array_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_array_e" "ac_cv_func_gsl_sf_legendre_array_e"
 if test "x$ac_cv_func_gsl_sf_legendre_array_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_ARRAY_E 1
@@ -6850,7 +7431,7 @@
 
 for ac_func in gsl_sf_legendre_deriv_array_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_deriv_array_e" "ac_cv_func_gsl_sf_legendre_deriv_array_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_deriv_array_e" "ac_cv_func_gsl_sf_legendre_deriv_array_e"
 if test "x$ac_cv_func_gsl_sf_legendre_deriv_array_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_DERIV_ARRAY_E 1
@@ -6863,7 +7444,7 @@
 
 for ac_func in gsl_sf_legendre_deriv2_array_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_legendre_deriv2_array_e" "ac_cv_func_gsl_sf_legendre_deriv2_array_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_legendre_deriv2_array_e" "ac_cv_func_gsl_sf_legendre_deriv2_array_e"
 if test "x$ac_cv_func_gsl_sf_legendre_deriv2_array_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_LEGENDRE_DERIV2_ARRAY_E 1
@@ -6876,7 +7457,7 @@
 
 for ac_func in gsl_sf_zeta_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_zeta_e" "ac_cv_func_gsl_sf_zeta_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_zeta_e" "ac_cv_func_gsl_sf_zeta_e"
 if test "x$ac_cv_func_gsl_sf_zeta_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ZETA_E 1
@@ -6889,7 +7470,7 @@
 
 for ac_func in gsl_sf_zeta_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_zeta_e" "ac_cv_func_gsl_sf_zeta_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_zeta_e" "ac_cv_func_gsl_sf_zeta_e"
 if test "x$ac_cv_func_gsl_sf_zeta_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ZETA_E 1
@@ -6902,7 +7483,7 @@
 
 for ac_func in gsl_sf_zeta_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_zeta_e" "ac_cv_func_gsl_sf_zeta_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_zeta_e" "ac_cv_func_gsl_sf_zeta_e"
 if test "x$ac_cv_func_gsl_sf_zeta_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ZETA_E 1
@@ -6915,7 +7496,7 @@
 
 for ac_func in gsl_sf_zeta_int_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_zeta_int_e" "ac_cv_func_gsl_sf_zeta_int_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_zeta_int_e" "ac_cv_func_gsl_sf_zeta_int_e"
 if test "x$ac_cv_func_gsl_sf_zeta_int_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ZETA_INT_E 1
@@ -6928,7 +7509,7 @@
 
 for ac_func in gsl_sf_zeta_int_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_zeta_int_e" "ac_cv_func_gsl_sf_zeta_int_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_zeta_int_e" "ac_cv_func_gsl_sf_zeta_int_e"
 if test "x$ac_cv_func_gsl_sf_zeta_int_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ZETA_INT_E 1
@@ -6941,7 +7522,7 @@
 
 for ac_func in gsl_sf_zetam1_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_zetam1_e" "ac_cv_func_gsl_sf_zetam1_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_zetam1_e" "ac_cv_func_gsl_sf_zetam1_e"
 if test "x$ac_cv_func_gsl_sf_zetam1_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ZETAM1_E 1
@@ -6954,7 +7535,7 @@
 
 for ac_func in gsl_sf_zetam1_int_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_zetam1_int_e" "ac_cv_func_gsl_sf_zetam1_int_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_zetam1_int_e" "ac_cv_func_gsl_sf_zetam1_int_e"
 if test "x$ac_cv_func_gsl_sf_zetam1_int_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ZETAM1_INT_E 1
@@ -6967,7 +7548,7 @@
 
 for ac_func in gsl_sf_eta_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_eta_e" "ac_cv_func_gsl_sf_eta_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_eta_e" "ac_cv_func_gsl_sf_eta_e"
 if test "x$ac_cv_func_gsl_sf_eta_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ETA_E 1
@@ -6980,7 +7561,7 @@
 
 for ac_func in gsl_sf_eta_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_eta_e" "ac_cv_func_gsl_sf_eta_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_eta_e" "ac_cv_func_gsl_sf_eta_e"
 if test "x$ac_cv_func_gsl_sf_eta_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ETA_E 1
@@ -6993,7 +7574,7 @@
 
 for ac_func in gsl_sf_eta_int_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_eta_int_e" "ac_cv_func_gsl_sf_eta_int_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_eta_int_e" "ac_cv_func_gsl_sf_eta_int_e"
 if test "x$ac_cv_func_gsl_sf_eta_int_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ETA_INT_E 1
@@ -7006,7 +7587,7 @@
 
 for ac_func in gsl_sf_eta_int_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_eta_int_e" "ac_cv_func_gsl_sf_eta_int_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_eta_int_e" "ac_cv_func_gsl_sf_eta_int_e"
 if test "x$ac_cv_func_gsl_sf_eta_int_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_ETA_INT_E 1
@@ -7019,7 +7600,7 @@
 
 for ac_func in gsl_sf_hzeta_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hzeta_e" "ac_cv_func_gsl_sf_hzeta_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hzeta_e" "ac_cv_func_gsl_sf_hzeta_e"
 if test "x$ac_cv_func_gsl_sf_hzeta_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HZETA_E 1
@@ -7032,7 +7613,7 @@
 
 for ac_func in gsl_sf_hzeta_e
 do :
-  ac_fn_cxx_check_func "$LINENO" "gsl_sf_hzeta_e" "ac_cv_func_gsl_sf_hzeta_e"
+  ac_fn_c_check_func "$LINENO" "gsl_sf_hzeta_e" "ac_cv_func_gsl_sf_hzeta_e"
 if test "x$ac_cv_func_gsl_sf_hzeta_e" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GSL_SF_HZETA_E 1
diff -ur gsl-2.1.1.orig/src/configure.ac gsl-2.1.1/src/configure.ac
--- gsl-2.1.1.orig/src/configure.ac	2018-07-06 11:04:59.199071174 -0400
+++ gsl-2.1.1/src/configure.ac	2018-07-06 12:16:06.825679865 -0400
@@ -28,24 +28,23 @@
 AC_PATH_PROG([MKOCTFILE],[mkoctfile])
 test -z "$MKOCTFILE" && AC_MSG_ERROR([mkoctfile not found])
 
-dnl Check for octave (used to get cannical_host_type)
-AC_PATH_PROG([OCTAVE],[octave])
-test -z "$OCTAVE" && AC_MSG_ERROR([octave not found])
-
+dnl Check for octave-config
+AC_PATH_PROG([OCTAVE_CONFIG],[octave-config])
+test -z "$OCTAVE_CONFIG" &&  AC_MSG_ERROR([octave-config not found])
+
+AC_DEFUN(OCTAVE_CONFIG_EVAL,
+[AC_MSG_CHECKING([for $1 in octave-config])
+$2=`$OCTAVE_CONFIG -p $1`
+AC_MSG_RESULT($$2)
+AC_SUBST($2)
+])
 
 dnl *****************************
 dnl *** System-specific stuff ***
 dnl *****************************
 
 dnl Grab canonical host type so we can write system specific install stuff
-AC_MSG_CHECKING([for Octave's canonical_host_type])
-canonical_host_type=`$OCTAVE -qf --eval "                   \
-  if exist ('__octave_config_info__')                       \
-    disp  (__octave_config_info__ ('canonical_host_type'))  \
-  else                                                      \
-    disp  (octave_config_info ('canonical_host_type'))      \
-  end"`
-AC_MSG_RESULT([${canonical_host_type}])
+OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
 
 dnl GSL specific preprocessor flags
 AC_SUBST([GSL_DEFINES])
@@ -63,17 +62,23 @@
 dnl *********************************
 
 dnl Find Octave's include directory
-AC_MSG_CHECKING([for Octave's include directory])
-octave_include_dir=`$OCTAVE -qf --eval "              \
-  if exist ('__octave_config_info__')                 \
-    disp  (__octave_config_info__ ('octincludedir'))  \
-  else                                                \
-    disp  (octave_config_info ('octincludedir'))      \
-  end"`
-AC_MSG_RESULT([${octave_include_dir}])
+OCTAVE_CONFIG_EVAL(OCTINCLUDEDIR,octave_include_dir)
+
+# let configure get CC and CXX so we cant override for tests
+AC_PROG_CC
+AC_PROG_CXX
+
+# set compiler and flags to values octave will be using
+CC=`$MKOCTFILE -p CC`
+CXX=`$MKOCTFILE -p CXX`
+CFLAGS=`$MKOCTFILE -p CFLAGS`
+CPPFLAGS=`$MKOCTFILE -p CPPFLAGS`
+LDFLAGS=`$MKOCTFILE -p LDFLAGS`
+LIBS=`$MKOCTFILE -p LIBS`
+CXXFLAGS=`$MKOCTFILE -p CXXFLAGS`
 
 dnl Save initial state
-save_CPPFLAGS=${CPPFLAG}
+save_CPPFLAGS=${CPPFLAGS}
 AC_LANG_PUSH([C++])
 
 dnl Add octave include dir to CPPFLAGS
@@ -120,7 +125,7 @@
 )
 
 dnl Restore initial state
-AC_LANG_PUSH([C++])
+AC_LANG_POP([C++])
 CPPFLAGS=${save_CPPFLAGS}
 
 
diff -ur gsl-2.1.1.orig/src/configure.ac.in gsl-2.1.1/src/configure.ac.in
--- gsl-2.1.1.orig/src/configure.ac.in	2018-07-06 11:04:59.193071031 -0400
+++ gsl-2.1.1/src/configure.ac.in	2018-07-06 12:16:00.987540545 -0400
@@ -24,24 +24,23 @@
 AC_PATH_PROG([MKOCTFILE],[mkoctfile])
 test -z "$MKOCTFILE" && AC_MSG_ERROR([mkoctfile not found])
 
-dnl Check for octave (used to get cannical_host_type)
-AC_PATH_PROG([OCTAVE],[octave])
-test -z "$OCTAVE" && AC_MSG_ERROR([octave not found])
-
+dnl Check for octave-config
+AC_PATH_PROG([OCTAVE_CONFIG],[octave-config])
+test -z "$OCTAVE_CONFIG" &&  AC_MSG_ERROR([octave-config not found])
+
+AC_DEFUN(OCTAVE_CONFIG_EVAL,
+[AC_MSG_CHECKING([for $1 in octave-config])
+$2=`$OCTAVE_CONFIG -p $1`
+AC_MSG_RESULT($$2)
+AC_SUBST($2)
+])
 
 dnl *****************************
 dnl *** System-specific stuff ***
 dnl *****************************
 
 dnl Grab canonical host type so we can write system specific install stuff
-AC_MSG_CHECKING([for Octave's canonical_host_type])
-canonical_host_type=`$OCTAVE -qf --eval "                   \
-  if exist ('__octave_config_info__')                       \
-    disp  (__octave_config_info__ ('canonical_host_type'))  \
-  else                                                      \
-    disp  (octave_config_info ('canonical_host_type'))      \
-  end"`
-AC_MSG_RESULT([${canonical_host_type}])
+OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
 
 dnl GSL specific preprocessor flags
 AC_SUBST([GSL_DEFINES])
@@ -59,17 +58,23 @@
 dnl *********************************
 
 dnl Find Octave's include directory
-AC_MSG_CHECKING([for Octave's include directory])
-octave_include_dir=`$OCTAVE -qf --eval "              \
-  if exist ('__octave_config_info__')                 \
-    disp  (__octave_config_info__ ('octincludedir'))  \
-  else                                                \
-    disp  (octave_config_info ('octincludedir'))      \
-  end"`
-AC_MSG_RESULT([${octave_include_dir}])
+OCTAVE_CONFIG_EVAL(OCTINCLUDEDIR,octave_include_dir)
+
+# let configure get CC and CXX so we cant override for tests
+AC_PROG_CC
+AC_PROG_CXX
+
+# set compiler and flags to values octave will be using
+CC=`$MKOCTFILE -p CC`
+CXX=`$MKOCTFILE -p CXX`
+CFLAGS=`$MKOCTFILE -p CFLAGS`
+CPPFLAGS=`$MKOCTFILE -p CPPFLAGS`
+LDFLAGS=`$MKOCTFILE -p LDFLAGS`
+LIBS=`$MKOCTFILE -p LIBS`
+CXXFLAGS=`$MKOCTFILE -p CXXFLAGS`
 
 dnl Save initial state
-save_CPPFLAGS=${CPPFLAG}
+save_CPPFLAGS=${CPPFLAGS}
 AC_LANG_PUSH([C++])
 
 dnl Add octave include dir to CPPFLAGS
@@ -116,7 +121,7 @@
 )
 
 dnl Restore initial state
-AC_LANG_PUSH([C++])
+AC_LANG_POP([C++])
 CPPFLAGS=${save_CPPFLAGS}