Get rid of CAM stuff. The latest CAM model doesn't need it.

Makefile.in

@@ -1,35 +1,29 @@
 CC       = @CC@
-CFLAGS   = @CAMFLAGS@ @CFLAGS@ @THREADFLAGS@ @FDEFS@ @THREADDEFS@ @DEFS@ @PAPIPREP@ @BITFLAGS@
+CFLAGS   = @CFLAGS@ @THREADFLAGS@ @FDEFS@ @THREADDEFS@ @DEFS@ @PAPIPREP@ @BITFLAGS@
 
 LIBNAME  = libgptl.a
-CAMLIB   = libcamgptl.a
 LIBDIR   = @prefix@/lib
 INCDIR   = @prefix@/include
 MANDIR   = @prefix@/man/man3
 OBJS     = f_wrappers.o gptl.o util.o threadutil.o get_memusage.o \
            print_memusage.o gptl_papi.o
-CAMOBJS  = camwrappers.o gptl.o util.o threadutil.o get_memusage.o \
-           print_memusage.o gptl_papi.o
+AR       = @AR@
+
 @SET_MAKE@
 
-all: $(LIBNAME) $(CAMLIB) ctests/all ftests/all
+all: $(LIBNAME) ctests/all ftests/all
 
 $(LIBNAME): $(OBJS)
-	ar @ARFLAGS@ $@ $(OBJS)
-	rm -f ctests/*.o ftests/*.o
-
-$(CAMLIB): $(CAMOBJS)
-	ar @ARFLAGS@ $@ $(CAMOBJS)
+	$(AR) @ARFLAGS@ $@ $(OBJS)
 	rm -f ctests/*.o ftests/*.o
 
-install: $(LIBNAME) $(CAMLIB)
+install: $(LIBNAME)
 	cp $(LIBNAME) $(LIBDIR)
-	cp $(CAMLIB) $(LIBDIR)
-	cp gptl.h gptl.inc camgptl.inc $(INCDIR)
+	cp gptl.h gptl.inc $(INCDIR)
 	cp man/man3/*.3 $(MANDIR)
 
 uninstall:
-	rm -f $(LIBDIR)/$(LIBNAME) $(LIBDIR)/$(CAMLIB) $(INCDIR)/gptl.h $(INCDIR)/gptl.inc
+	rm -f $(LIBDIR)/$(LIBNAME) $(INCDIR)/gptl.h $(INCDIR)/gptl.inc
 
 ctests/all:
 	(cd ctests && $(MAKE) all)
@@ -38,12 +32,10 @@ ftests/all:
 	(cd ftests && $(MAKE) all)
 
 clean:
-	rm -f $(OBJS) camwrappers.o $(CAMOBJS) $(LIBNAME) $(CAMLIB)
+	rm -f $(OBJS) $(LIBNAME)
 	(cd ctests && $(MAKE) clean)
 	(cd ftests && $(MAKE) clean)
 
-camwrappers.o: camwrappers.c gptl.h private.h cfort.h
-	$(CC) -c @BITFLAGS@ @CAMFLAGS@ -o $@ $*.c
 f_wrappers.o: f_wrappers.c gptl.h private.h
 gptl.o: gptl.c gptl.h private.h
 util.o: util.c gptl.h private.h

configure

@@ -272,7 +272,7 @@ PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
 ac_unique_file="private.h"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT F77 FFLAGS ac_ct_F77 FLIBS FDEFS THREADDEFS THREADFLAGS FTHREADFLAGS PAPIPREP ARFLAGS BITFLAGS FORTDEFS INSTRFLAGS CAMFLAGS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT F77 FFLAGS ac_ct_F77 FLIBS AR FDEFS THREADDEFS THREADFLAGS FTHREADFLAGS PAPIPREP ARFLAGS BITFLAGS FORTDEFS INSTRFLAGS CAMFLAGS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -4636,6 +4636,42 @@ done
 
 
 
+# Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR=""
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
 
 
 
@@ -5296,6 +5332,7 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@FLIBS@,$FLIBS,;t t
+s,@AR@,$AR,;t t
 s,@FDEFS@,$FDEFS,;t t
 s,@THREADDEFS@,$THREADDEFS,;t t
 s,@THREADFLAGS@,$THREADFLAGS,;t t

configure.ac

@@ -178,6 +178,9 @@ AC_C_INLINE
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
 
+dnl Checks for AR
+AC_CHECK_PROG(AR,ar)
+
 AC_SUBST(FDEFS)
 AC_SUBST(THREADDEFS)
 AC_SUBST(THREADFLAGS)

ctests/scale.c

@@ -130,7 +130,7 @@ int main (int argc, char **argv)
 
   GPTLsetoption (GPTLverbose, 0);
 #ifdef HAVE_PAPI
-  GPTLsetoption (PAPI_FP_OPS, 1);
+//  GPTLsetoption (PAPI_FP_OPS, 1);
 #endif
 
   /*