..

acinclude.m4

@@ -10,23 +10,23 @@ if test -z "${R_HOME}" ; then
   R_HOME=`R RHOME`
 fi
 
-if test -z "${R_HOME}" ; then
-  echo "Cannot find the R distribution!"
-  exit 1 
-fi
-
-CC=`"${R_HOME}/bin/R" CMD config CC`
-F77=`"${R_HOME}/bin/R" CMD config F77`
 PKG_CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
 PKG_FFLAGS=`"${R_HOME}/bin/R" CMD config FFLAGS`
 
 
+<<<<<<< acinclude.m4
+case "${host_cpu}-${host_os}" in
+  x86*-solaris*) 
+=======
 case "${host}" in
   x*-sun-solaris*) 
+>>>>>>> 1.2
 dnl use a hard coded call to src/tripack.f through R
 dnl to determine wether it returns all NA. 
 dnl then retry with -xO5
 dnl 
+dnl skip gcc:
+    if test "${ac_cv_fc_compiler_gnu}" != yes; then
       cat >conftest.R <<EOT
 check <- function(){
   dyn.load("src/tripack.so")
@@ -143,9 +143,11 @@ dnl strip out all -xO[1234] flags, add one -xO5 flag instead
           fi
         fi
       fi
-;;
+    fi
+  ;;
 *)
-  echo -n "not running on x*-solaris*"
+  echo -n "not running on x86*-solaris*"
+  ;;
 esac
 
   ]) # AC_CACHE_CHECK

configure.ac

 # package/configure.in
 AC_PREREQ(2.50)
-AM_INIT_AUTOMAKE("akima",0.5-5)
-AC_INIT(src/tripack.f)
+AC_INIT([akima],[0.5-5])
+AC_CONFIG_SRCDIR(src/tripack.f)
 #if you want to use more macros
 #AC_CONFIG_MACRO_DIR([m4])