Changeset 2099


Ignore:
Timestamp:
Jan 28, 2011 1:10:11 PM (9 years ago)
Author:
stefan
Message:

merge chgset 2098 from stable/0.7: fix for using --with-xxx-yyy and no pkg-config and examples

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/coin.m4

    r2097 r2099  
    31163116         m4_toupper(myvar)_LIBS="$withval $m4_toupper(myvar)_LIBS"
    31173117       ])
     3118       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     3119       if test -z "$PKG_CONFIG" ; then
     3120         m4_toupper($1_LIBS_INSTALLED)="$withval"
     3121         coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_LIBS_INSTALLED="$withval $m4_toupper(myvar)_LIBS_INSTALLED"])
     3122       fi
    31183123     fi
    31193124    ],
     
    31303135       m4_tolower(coin_has_$1)=yes
    31313136       m4_toupper($1_CFLAGS)="-I`${CYGPATH_W} $withval`"
    3132        coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_CFLAGS="$withval $m4_toupper(myvar)_CFLAGS"])
     3137       coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_CFLAGS="-I`${CYGPATH_W} $withval` $m4_toupper(myvar)_CFLAGS"])
     3138       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     3139       if test -z "$PKG_CONFIG" ; then
     3140         m4_toupper($1_CFLAGS_INSTALLED)="$m4_toupper($1_CFLAGS)"
     3141         coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_CFLAGS_INSTALLED="$m4_toupper($1_CFLAGS) $m4_toupper(myvar)_CFLAGS_INSTALLED"])
     3142       fi
    31333143     fi
    31343144    ],
     
    31453155       m4_tolower(coin_has_$1)=yes
    31463156       m4_toupper($1_DATA)="$withval"
     3157       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     3158       if test -z "$PKG_CONFIG" ; then
     3159         m4_toupper($1_DATA_INSTALLED)="$withval"
     3160       fi
    31473161     fi
    31483162    ],
  • trunk/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.