Changeset 1689


Ignore:
Timestamp:
Oct 16, 2010 4:21:27 AM (9 years ago)
Author:
stefan
Message:

add AC_SUBST for CFLAGS in COIN_HAS_PACKAGE; make abs_lib_dir point to lib/coin

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r1677 r1689  
    17041704full_prefix=`cd $full_prefix ; pwd`
    17051705AC_SUBST(abs_lib_dir)
    1706 abs_lib_dir=$full_prefix/lib
     1706abs_lib_dir=$full_prefix/lib/coin
    17071707AC_SUBST(abs_include_dir)
    17081708abs_include_dir=$full_prefix/include
     
    18281828  # set RPATH_FLAGS to the compiler link flags required to hardcode location
    18291829  # of the shared objects
    1830   AC_COIN_RPATH_FLAGS([$abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty])
     1830  AC_COIN_RPATH_FLAGS([$abs_lib_dir $abs_lib_dir/ThirdParty])
    18311831
    18321832else
     
    26322632  m4_toupper($1OBJDIR)=`pwd`/$m4_tolower(coin_has_$1)
    26332633  AC_SUBST(m4_toupper($1DOCDIR))
    2634   m4_toupper($1DOCDIR)=$abs_lib_dir/../share/doc/coin/$1
     2634  m4_toupper($1DOCDIR)=$abs_lib_dir/../../share/doc/coin/$1
    26352635fi
    26362636
     
    44704470AC_SUBST(m4_toupper($1_DATA))
    44714471coin_foreach_w([myvar], [$3], [
     4472  AC_SUBST(m4_toupper(myvar)_CFLAGS)
    44724473  AC_SUBST(m4_toupper(myvar)_LIBS)
    44734474  AC_SUBST(m4_toupper(myvar)_PCLIBS)
Note: See TracChangeset for help on using the changeset viewer.