Changeset 2098 for stable/0.7


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

bugfix: setup X_INSTALLED variables also if project flags are given by user and pkg-config is disabled

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7/coin.m4

    r2095 r2098  
    31113111         m4_toupper(myvar)_LIBS="$withval $m4_toupper(myvar)_LIBS"
    31123112       ])
     3113       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     3114       if test -z "$PKG_CONFIG" ; then
     3115         m4_toupper($1_LIBS_INSTALLED)="$withval"
     3116         coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_LIBS_INSTALLED="$withval $m4_toupper(myvar)_LIBS_INSTALLED"])
     3117       fi
    31133118     fi
    31143119    ],
     
    31253130       m4_tolower(coin_has_$1)=yes
    31263131       m4_toupper($1_CFLAGS)="-I`${CYGPATH_W} $withval`"
    3127        coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_CFLAGS="$withval $m4_toupper(myvar)_CFLAGS"])
     3132       coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_CFLAGS="-I`${CYGPATH_W} $withval` $m4_toupper(myvar)_CFLAGS"])
     3133       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     3134       if test -z "$PKG_CONFIG" ; then
     3135         m4_toupper($1_CFLAGS_INSTALLED)="$m4_toupper($1_CFLAGS)"
     3136         coin_foreach_w([myvar], [$3], [m4_toupper(myvar)_CFLAGS_INSTALLED="$m4_toupper($1_CFLAGS) $m4_toupper(myvar)_CFLAGS_INSTALLED"])
     3137       fi
    31283138     fi
    31293139    ],
     
    31403150       m4_tolower(coin_has_$1)=yes
    31413151       m4_toupper($1_DATA)="$withval"
     3152       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     3153       if test -z "$PKG_CONFIG" ; then
     3154         m4_toupper($1_DATA_INSTALLED)="$withval"
     3155       fi
    31423156     fi
    31433157    ],
Note: See TracChangeset for help on using the changeset viewer.