Changeset d9f8c1c in git


Ignore:
Timestamp:
21/09/11 01:12:25 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
svn/1.0, svn/tags/1.0.40
Children:
2676b0a
Parents:
d11f684
Message:

Backport change from 1.2.0:
configure.in: Only ask for core wx lib to avoid linking to a load of
others we don't use.

git-svn-id: file:///home/survex-svn/survex/branches/1.0@3728 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rd11f684 rd9f8c1c  
     1Wed Sep 21 00:11:57 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * Backport change from 1.2.0:
     4        * configure.in: Only ask for core wx lib to avoid linking to a load of
     5          others we don't use.
     6
    17Wed Sep 21 00:07:52 GMT 2011  Olly Betts <olly@survex.com>
    28
  • configure.in

    rd11f684 rd9f8c1c  
    139139fi
    140140AC_SUBST(WINPROGS)
     141
     142dnl The wxWidgets libraries we need:
     143wx_libs="core"
    141144
    142145AC_ARG_VAR(WXCONFIG, [Old name for WX_CONFIG, accepted for compatibility])
     
    164167    dnl WX_CONFIG specified - sanity check the value
    165168    dnl don't check for --ldflags - older wx-config didn't do that
    166     if (exec >&5 2>&5;$WX_CONFIG --libs --cflags --cxxflags;exit $?) then
     169    if (exec >&5 2>&5;$WX_CONFIG --libs --cflags --cxxflags "$wx_libs";exit $?) then
    167170      :
    168171    else
    169       AC_MSG_ERROR(['$WX_CONFIG --libs --cflags --cxxflags' does not work, bailing out])
     172      AC_MSG_ERROR(['$WX_CONFIG --libs --cflags --cxxflags "$wx_libs"' does not work, bailing out])
    170173    fi
    171174  else
     
    184187      AC_PATH_PROGS(WX_CONFIG, [wx-config])
    185188      if test -n "$WX_CONFIG" ; then
    186         if (exec >&5 2>&5;$WX_CONFIG --cflags|grep -e -D"$wxdef";exit $?) then
     189        if (exec >&5 2>&5;$WX_CONFIG --cflags "$wx_libs"|grep -e -D"$wxdef";exit $?) then
    187190          :
    188191        else
     
    198201
    199202  if test -n "$AVEN"; then
    200     WX_LIBS=`$WX_CONFIG --libs`
     203    WX_LIBS=`$WX_CONFIG --libs "$wx_libs"`
    201204    AC_SUBST(WX_LIBS)
    202205    dnl older wx-config didn't support this - error goes to stderr, with
    203206    dnl nothing to stdout, so just ignore stderr
    204     WX_LDFLAGS=`$WX_CONFIG --ldflags 2> /dev/null`
     207    WX_LDFLAGS=`$WX_CONFIG --ldflags "$wx_libs" 2> /dev/null`
    205208    AC_SUBST(WX_LDFLAGS)
    206     WX_CFLAGS=`$WX_CONFIG --cflags`
     209    WX_CFLAGS=`$WX_CONFIG --cflags "$wx_libs"`
    207210    AC_SUBST(WX_CFLAGS)
    208     WX_CXXFLAGS=`$WX_CONFIG --cxxflags`
     211    WX_CXXFLAGS=`$WX_CONFIG --cxxflags "$wx_libs"`
    209212    AC_SUBST(WX_CXXFLAGS)
    210213    AC_MSG_RESULT(building aven)
Note: See TracChangeset for help on using the changeset viewer.