Changeset 316


Ignore:
Timestamp:
Apr 10, 2012 10:36:09 AM (7 years ago)
Author:
kulshres
Message:

tweaks in configure

to check for fmin/fmax and get rid of some redundancies

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/src/adouble.cpp

    r275 r316  
    4242}
    4343
    44 #if !defined(_ISOC99_SOURCE) && !defined(__USE_ISOC99)
     44#if !defined(HAVE_FMAX)
    4545/*--------------------------------------------------------------------------*/
    4646double fmax( const double &x, const double &y ) {
     
    5050        return x;
    5151}
    52 
     52#endif
     53
     54#if !defined(HAVE_FMIN)
    5355/*--------------------------------------------------------------------------*/
    5456double fmin( const double &x, const double &y ) {
  • trunk/ADOL-C/src/adouble.h

    r207 r316  
    6969                                  const double &arg );
    7070
    71 #if !defined(_ISOC99_SOURCE) && !defined(__USE_ISOC99) && !defined(__APPLE_CC__)
     71#if !defined(HAVE_FMIN)
    7272double ADOLC_DLL_EXPORT fmin( const double &x, const double &y );
     73#endif
     74#if !defined(HAVE_FMAX)
    7375double ADOLC_DLL_EXPORT fmax( const double &x, const double &y );
    7476#endif
  • trunk/MSVisualStudio/v10/nosparse/config.h.in

    r210 r316  
    3232#define HAVE_FLOOR 1
    3333
     34/* Define to 1 if you have the `fmax' function. */
     35#define HAVE_FMAX 1
     36
     37/* Define to 1 if you have the `fmin' function. */
     38#define HAVE_FMIN 1
     39
    3440/* Define to 1 if you have the `ftime' function. */
    3541#define HAVE_FTIME 1
     
    4046/* Define 1 if ColPack is available */
    4147/* #undef HAVE_LIBCOLPACK */
    42 
    43 /* Define to 1 if you have the `m' library (-lm). */
    44 #define HAVE_LIBM 1
    4548
    4649/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
     
    9699/* Define to 1 if you have the <sys/types.h> header file. */
    97100#define HAVE_SYS_TYPES_H 1
     101
     102/* Define to 1 if you have the `trunc' function. */
     103#define HAVE_TRUNC 1
    98104
    99105/* Define to 1 if you have the <unistd.h> header file. */
  • trunk/MSVisualStudio/v10/sparse/config.h.in

    r210 r316  
    3232#define HAVE_FLOOR 1
    3333
     34/* Define to 1 if you have the `fmax' function. */
     35#define HAVE_FMAX 1
     36
     37/* Define to 1 if you have the `fmin' function. */
     38#define HAVE_FMIN 1
     39
    3440/* Define to 1 if you have the `ftime' function. */
    3541#define HAVE_FTIME 1
     
    4046/* Define 1 if ColPack is available */
    4147#define HAVE_LIBCOLPACK 1
    42 
    43 /* Define to 1 if you have the `m' library (-lm). */
    44 #define HAVE_LIBM 1
    4548
    4649/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
     
    9699/* Define to 1 if you have the <sys/types.h> header file. */
    97100#define HAVE_SYS_TYPES_H 1
     101
     102/* Define to 1 if you have the `trunc' function. */
     103#define HAVE_TRUNC 1
    98104
    99105/* Define to 1 if you have the <unistd.h> header file. */
  • trunk/MSVisualStudio/v10/x64/nosparse/config.h.in

    r210 r316  
    3232#define HAVE_FLOOR 1
    3333
     34/* Define to 1 if you have the `fmax' function. */
     35#define HAVE_FMAX 1
     36
     37/* Define to 1 if you have the `fmin' function. */
     38#define HAVE_FMIN 1
     39
    3440/* Define to 1 if you have the `ftime' function. */
    3541#define HAVE_FTIME 1
     
    4046/* Define 1 if ColPack is available */
    4147/* #undef HAVE_LIBCOLPACK */
    42 
    43 /* Define to 1 if you have the `m' library (-lm). */
    44 #define HAVE_LIBM 1
    4548
    4649/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
     
    9699/* Define to 1 if you have the <sys/types.h> header file. */
    97100#define HAVE_SYS_TYPES_H 1
     101
     102/* Define to 1 if you have the `trunc' function. */
     103#define HAVE_TRUNC 1
    98104
    99105/* Define to 1 if you have the <unistd.h> header file. */
  • trunk/MSVisualStudio/v10/x64/sparse/config.h.in

    r210 r316  
    3232#define HAVE_FLOOR 1
    3333
     34/* Define to 1 if you have the `fmax' function. */
     35#define HAVE_FMAX 1
     36
     37/* Define to 1 if you have the `fmin' function. */
     38#define HAVE_FMIN 1
     39
    3440/* Define to 1 if you have the `ftime' function. */
    3541#define HAVE_FTIME 1
     
    4046/* Define 1 if ColPack is available */
    4147#define HAVE_LIBCOLPACK 1
    42 
    43 /* Define to 1 if you have the `m' library (-lm). */
    44 #define HAVE_LIBM 1
    4548
    4649/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
     
    9699/* Define to 1 if you have the <sys/types.h> header file. */
    97100#define HAVE_SYS_TYPES_H 1
     101
     102/* Define to 1 if you have the `trunc' function. */
     103#define HAVE_TRUNC 1
    98104
    99105/* Define to 1 if you have the <unistd.h> header file. */
  • trunk/configure.ac

    r296 r316  
    5151   _lib=lib
    5252fi
    53 libdir='${prefix}/${_lib}'
     53libdir='${exec_prefix}/${_lib}'
    5454AC_SUBST(_lib)
    5555AC_SUBST(libdir)
     
    7070AC_FUNC_MALLOC
    7171AC_FUNC_REALLOC
    72 AC_CHECK_FUNCS([floor ftime pow sqrt strchr strtol])
     72
     73# Checks for libraries and fuctions
     74AC_SEARCH_LIBS([pow], [m])
     75AC_CHECK_FUNCS([floor fmax fmin ftime pow sqrt strchr strtol trunc])
    7376
    7477# substitutions
    7578AC_SUBST(ac_aux_dir)
    76 
    77 # Checks for libraries
    78 AC_CHECK_LIB([m], [pow])
    7979
    8080# ADOL-C configuration
     
    164164             AC_MSG_RESULT(no)])
    165165
    166 test "x${ac_pwd}" = x && ac_pwd=`pwd`
    167 abs_srcdir=`readlink -f ${ac_pwd}/${srcdir}`
    168166AC_ARG_WITH(colpack,
    169167        [
    170168AS_HELP_STRING([--with-colpack=DIR],[path to the colpack library and headers [default=${srcdir}/ThirdParty/ColPack]])],
    171                 [
     169[
    172170colpack=$withval
    173171COLPACK_CFLAGS="$ac_adolc_openmpflag -I$colpack/include"
Note: See TracChangeset for help on using the changeset viewer.