Changeset 476


Ignore:
Timestamp:
Feb 20, 2014 11:17:12 AM (6 years ago)
Author:
kulshres
Message:

merge pending changes from 'master' on 'gitclone' to 'svn'

the following commits were merged:

commit 81556d9900656703891ba0bd32dfa07ba7a8a067
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Feb 20 17:14:42 2014 +0100

unify the format for rpath

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

commit d66ebb795df2fa79a722c7d31220b04f1eb46c63
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Feb 20 17:00:03 2014 +0100

adjust pkg-config file to library name and dependency changes

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

commit b1fe3fcf2ff00359ebd94bb7784de6cf46f9114d
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Feb 20 16:51:54 2014 +0100

add ampi libs to rpath

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

commit 605225bae9f829d3e84012f8557e7db5628bd2be
Author: Oliver Sander <sander@…>
Date: Mon Dec 9 17:40:43 2013 +0100

Add support for pkg-config

commit 7870180328544b5f27c337e82793fe73a5e5754f
Author: Oliver Sander <sander@…>
Date: Mon Dec 9 17:35:15 2013 +0100

Expand the _lib variable earlier

This makes the actual value appear in the help output at the end of the
configure run. Also, it is a prerequisite for the pkg-config support
coming in the next patch, which otherwise would contain _lib instead
of its value.

commit f03e8a5f8eadeed8e00da8cc7d056fa2994cb77f
Author: Oliver Sander <sander@…>
Date: Fri Dec 6 23:24:09 2013 +0100

Fix spelling errors

Location:
trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    r471 r476  
    3838SUBDIRS              = ADOL-C
    3939
     40# install pkg-config information
     41pkgconfigdir = $(libdir)/pkgconfig
     42pkgconfig_DATA = @adolclib@.pc
     43
     44@adolclib@.pc: adolclib.pc
     45        mv $@ $<
     46
    4047test: all
    4148        cd ADOL-C; $(MAKE) test
  • trunk/autoconf/ampi.m4

    r471 r476  
    1414  fi
    1515  CPPFLAGS="$CPPFLAGS -I$with_ampi/include"
    16   LDFLAGS="$LDFLAGS -L$with_ampi/lib"
     16  LDFLAGS="$LDFLAGS -L$with_ampi/lib -Wl,-rpath,$with_ampi/lib"
    1717  if test x"$_lib" != "xlib" ;
    1818  then
    19      LDFLAGS="$LDFLAGS -L$with_ampi/${_lib}"
     19     LDFLAGS="$LDFLAGS -L$with_ampi/${_lib} -Wl,-rpath,$with_ampi/${_lib}"
    2020  fi
    2121fi
  • trunk/configure.ac

    r475 r476  
    7979fi
    8080if test "x$libdir_set_on_cmd" = "xno" ; then
    81    libdir='${exec_prefix}/${_lib}'
     81   libdir='${exec_prefix}'/"${_lib}"
    8282   AC_SUBST(_lib)
    8383   AC_SUBST(libdir)
     
    105105AC_DEFINE_UNQUOTED([calloc],[rpl_calloc],[Define to rpl_calloc if the replacement function should be used.])
    106106fi
     107
    107108# Checks for libraries and fuctions
    108109AC_SEARCH_LIBS([pow], [m])
     
    233234AC_ARG_ENABLE(stdczero,
    234235              [
    235 AS_HELP_STRING([--disable-stdczero],[adouble default constructor does not initialze the value to zero
     236AS_HELP_STRING([--disable-stdczero],[adouble default constructor does not initialize the value to zero
    236237(improves performance but yields incorrect results for implicit array initializations, see manual) [default=enabled]])],
    237238  [
     
    248249fi
    249250
    250 AC_MSG_CHECKING(wether the adouble varaibles have a late initialize option for functions like malloc/realloc)
     251AC_MSG_CHECKING(whether the adouble variables have a late initialize option for functions like malloc/realloc)
    251252AC_ARG_ENABLE(lateinit,
    252253              [
    253 AS_HELP_STRING([--enable-lateinit],[adouble constructors need to be called. With malloc or realloc that is not the case. With this option the adouble can do an late initialization.) [default=disabled]])],
     254AS_HELP_STRING([--enable-lateinit],[adouble constructors need to be called. With malloc or realloc that is not the case. With this option the adouble can do a late initialization.) [default=disabled]])],
    254255  [
    255256  adolc_late_init=yes
     
    511512                MSVisualStudio/v10/x64/nosparse/config.h
    512513                adolc.spec
     514                adolclib.pc
    513515)
    514516
     
    585587"  \033@<:@1;31mPrefix ${prefix} not writable
    586588  please run ./configure --prefix=DIR
    587   with a writable directory path otherwise administrator privilages
     589  with a writable directory path otherwise administrator privileges
    588590  will be required to run \`make install'\033@<:@0m"
    589591    warn=true
Note: See TracChangeset for help on using the changeset viewer.