Changeset 160 for trunk/configure


Ignore:
Timestamp:
Sep 15, 2010 1:30:57 PM (9 years ago)
Author:
kulshres
Message:

Squashed merge branch 'master' of 'gitclone' into svn

  • 'master' of 'gitclone': (4 commits) use unmanaged functions for recovery from colpack too fix test for sizeof_void_p in configure.ac wrap set_HP in #ifdef SPARSE for windows nosparse compilation version update after release

Details of the commits:

commit 7913137aacaca89674b60f5f858017e135201427
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Sep 15 16:01:44 2010 +0200

use unmanaged functions for recovery from colpack too

these pointers are returned to the user, and he may delete them when
he wishes, so we cannot expect ColPack? to memory manage them.

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

commit 66999f6a57b452498e2dc75162f02a2778b9ed89
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Fri Sep 10 15:32:02 2010 +0200

fix test for sizeof_void_p in configure.ac

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

commit 50ba17a10bb0141f6f15a332f4945230074d2d23
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Sep 8 14:05:40 2010 +0200

wrap set_HP in #ifdef SPARSE for windows nosparse compilation

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

commit b798110feb848e56e60d8092fd225ffd2cc19e34
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Sep 6 13:58:07 2010 +0200

version update after release

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r153 r160  
    22# From configure.ac Revision.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.65 for adolc 2.1.8-trunk.
     4# Generated by GNU Autoconf 2.65 for adolc 2.1.9-trunk.
    55#
    66# Report bugs to <adol-c@list.coin-or.org>.
     
    703703PACKAGE_NAME='adolc'
    704704PACKAGE_TARNAME='adolc'
    705 PACKAGE_VERSION='2.1.8-trunk'
    706 PACKAGE_STRING='adolc 2.1.8-trunk'
     705PACKAGE_VERSION='2.1.9-trunk'
     706PACKAGE_STRING='adolc 2.1.9-trunk'
    707707PACKAGE_BUGREPORT='adol-c@list.coin-or.org'
    708708PACKAGE_URL=''
     
    14741474  # This message is too long to be a string in the A/UX 3.1 sh.
    14751475  cat <<_ACEOF
    1476 \`configure' configures adolc 2.1.8-trunk to adapt to many kinds of systems.
     1476\`configure' configures adolc 2.1.9-trunk to adapt to many kinds of systems.
    14771477
    14781478Usage: $0 [OPTION]... [VAR=VALUE]...
     
    15441544if test -n "$ac_init_help"; then
    15451545  case $ac_init_help in
    1546      short | recursive ) echo "Configuration of adolc 2.1.8-trunk:";;
     1546     short | recursive ) echo "Configuration of adolc 2.1.9-trunk:";;
    15471547   esac
    15481548  cat <<\_ACEOF
     
    16731673if $ac_init_version; then
    16741674  cat <<\_ACEOF
    1675 adolc configure 2.1.8-trunk
     1675adolc configure 2.1.9-trunk
    16761676generated by GNU Autoconf 2.65
    16771677
     
    23972397running configure, to aid debugging if configure makes a mistake.
    23982398
    2399 It was created by adolc $as_me 2.1.8-trunk, which was
     2399It was created by adolc $as_me 2.1.9-trunk, which was
    24002400generated by GNU Autoconf 2.65.  Invocation command line was
    24012401
     
    32103210# Define the identity of the package.
    32113211 PACKAGE='adolc'
    3212  VERSION='2.1.8-trunk'
     3212 VERSION='2.1.9-trunk'
    32133213
    32143214
     
    1515615156
    1515715157
    15158 if test "x$SIZEOF_VOID_P" = "x8" ; then
     15158if test "x$ac_cv_sizeof_void_p" = "x8" ; then
    1515915159   _lib=lib64
    1516015160else
     
    1581515815
    1581615816
    15817 $as_echo "#define ADOLC_PATCHLEVEL 8" >>confdefs.h
     15817$as_echo "#define ADOLC_PATCHLEVEL 9" >>confdefs.h
    1581815818
    1581915819ADOLC_VERSION=2
    1582015820ADOLC_SUBVERSION=1
    15821 ADOLC_PATCHLEVEL=8
     15821ADOLC_PATCHLEVEL=9
    1582215822
    1582315823
     
    1698916989# values after options handling.
    1699016990ac_log="
    16991 This file was extended by adolc $as_me 2.1.8-trunk, which was
     16991This file was extended by adolc $as_me 2.1.9-trunk, which was
    1699216992generated by GNU Autoconf 2.65.  Invocation command line was
    1699316993
     
    1705517055ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    1705617056ac_cs_version="\\
    17057 adolc config.status 2.1.8-trunk
     17057adolc config.status 2.1.9-trunk
    1705817058configured by $0, generated by GNU Autoconf 2.65,
    1705917059  with options \\"\$ac_cs_config\\"
Note: See TracChangeset for help on using the changeset viewer.