Changeset 330 for branches

Timestamp:

Jun 28, 2012 5:16:50 AM (6 years ago)

Author:

kulshres

Message:

regenerate files

Location:

branches/advector

Files:

• ADOL-C/src/config.h.in (modified) (3 diffs)
• Makefile.in (modified) (3 diffs)
• configure (modified) (4 diffs)

branches/advector/ADOL-C/src/config.h.in

@@ -31 +31 @@
 #undef HAVE_FLOOR
 
+/* Define to 1 if you have the `fmax' function. */
+#undef HAVE_FMAX
+
+/* Define to 1 if you have the `fmin' function. */
+#undef HAVE_FMIN
+
 /* Define to 1 if you have the `ftime' function. */
 #undef HAVE_FTIME
@@ -39 +45 @@
 /* Define 1 if ColPack is available */
 #undef HAVE_LIBCOLPACK
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
 
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
@@ -95 +98 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the `trunc' function. */
+#undef HAVE_TRUNC
 
 /* Define to 1 if you have the <unistd.h> header file. */

branches/advector/Makefile.in

@@ -260 +260 @@
                        ADOL-C/doc/tapebasic.pdf ADOL-C/doc/tapebasic.eps \
                        ADOL-C/doc/tap_point.pdf ADOL-C/doc/tap_point.eps \
-                       autoconf/shave.in autoconf/shave-libtool.in \
-                       autoconf/dolt.m4 autoconf/shave.m4 \
                        MSVisualStudio/v10/adolc.sln MSVisualStudio/v10/adolc.vcxproj \
+                       MSVisualStudio/v10/ColPack_Readme_VC++.txt \
+                       MSVisualStudio/v10/ColPack.vcxproj \
                        MSVisualStudio/v10/sparse/config.h.in MSVisualStudio/v10/nosparse/config.h.in \
                        MSVisualStudio/v10/x64/sparse/config.h.in MSVisualStudio/v10/x64/nosparse/config.h.in \
@@ -270 +270 @@
                        MSVisualStudio/v10/installer.sh \
                        adolc.spec.in adolc.spec \
-                       update_versions.sh \
-                       ThirdParty/ColPack/ColPack.vcxproj \
-                       ThirdParty/ColPack/Readme_VC++.txt
+                       update_versions.sh
 
 SUBDIRS = ADOL-C
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure ADOL-C/src/config.h.in \
-                       ADOL-C/src/stamp-h.in *~ *.orig 
-
-DISTCLEANFILES = doltcompile doltlibtool
 all: all-recursive
 
@@ -674 +668 @@
         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
         -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
         @echo "This command is intended for maintainers to use"
         @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 

branches/advector/configure

@@ -15690 +15690 @@
    _lib=lib
 fi
-libdir='${prefix}/${_lib}'
+libdir='${exec_prefix}/${_lib}'
 
 
@@ -16253 +16253 @@
 
 
-for ac_func in floor ftime pow sqrt strchr strtol
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-# substitutions
-
-
-# Checks for libraries
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
-$as_echo_n "checking for pow in -lm... " >&6; }
-if ${ac_cv_lib_m_pow+:} false; then :
+
+# Checks for libraries and fuctions
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pow" >&5
+$as_echo_n "checking for library containing pow... " >&6; }
+if ${ac_cv_search_pow+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -16295 +16279 @@
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_pow=yes
-else
-  ac_cv_lib_m_pow=no
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_pow=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
-$as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = xyes; then :
+    conftest$ac_exeext
+  if ${ac_cv_search_pow+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_pow+:} false; then :
+
+else
+  ac_cv_search_pow=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pow" >&5
+$as_echo "$ac_cv_search_pow" >&6; }
+ac_res=$ac_cv_search_pow
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+for ac_func in floor fmax fmin ftime pow sqrt strchr strtol trunc
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
-  LIBS="-lm $LIBS"
-
-fi
+fi
+done
+
+
+# substitutions
 
 
@@ -16454 +16465 @@
 
 
-test "x${ac_pwd}" = x && ac_pwd=`pwd`
-abs_srcdir=`readlink -f ${ac_pwd}/${srcdir}`
 
 # Check whether --with-colpack was given.