Changeset 7e2f708 in git


Ignore:
Timestamp:
16/06/10 04:01:20 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/survex-1_1, svn/tags/1.1.14, svn/tags/1.1.15, svn/tags/1.1.16, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/tags/v1_1_13, svn/trunk, travis-osx
Children:
bc59149
Parents:
4a320aa
Message:

configure.in: Only ask for core, gl, and html wx libs to avoid
linking to a load of others we don't use.

git-svn-id: file:///home/survex-svn/survex/branches/survex-1_1@3435 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r4a320aa r7e2f708  
     1Wed Jun 16 02:59:48 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * configure.in: Only ask for core, gl, and html wx libs to avoid
     4          linking to a load of others we don't use.
     5
    16Tue Jun 15 17:01:41 GMT 2010  Olly Betts <olly@survex.com>
    27
  • configure.in

    r4a320aa r7e2f708  
    131131AC_SUBST(WINPROGS)
    132132
     133dnl The wxWidgets libraries we need:
     134wx_libs="core,gl,html"
     135
    133136AC_ARG_VAR(WXCONFIG, [Old name for WX_CONFIG, accepted for compatibility])
    134137AC_ARG_VAR(WX_CONFIG, [wxWidgets configuration script to use to build Aven])
     
    141144  dnl WX_CONFIG specified - sanity check the value
    142145  dnl don't check for --ldflags - older wx-config didn't do that
    143   if (exec >&5 2>&5;$WX_CONFIG --libs --cflags --cxxflags;exit $?) then
     146  if (exec >&5 2>&5;$WX_CONFIG --libs --cflags --cxxflags "$wx_libs";exit $?) then
    144147    :
    145148  else
    146     AC_MSG_ERROR(['$WX_CONFIG --libs --cflags --cxxflags' doesn't work, bailing out])
     149    AC_MSG_ERROR(['$WX_CONFIG --libs --cflags --cxxflags "$wx_libs"' doesn't work, bailing out])
    147150  fi
    148151else
     
    162165    AC_PATH_PROGS(WX_CONFIG, [wx-config])
    163166    if test -n "$WX_CONFIG" ; then
    164       if (exec >&5 2>&5;$WX_CONFIG --cflags|grep -e -D"$wxdef";exit $?) then
     167      if (exec >&5 2>&5;$WX_CONFIG --cflags "$wx_libs"|grep -e -D"$wxdef";exit $?) then
    165168        :
    166169      else
     
    179182  *--unicode=*) ;;
    180183  *)
    181     if (exec >&5 2>&5;$WX_CONFIG --unicode=yes --version;exit $?) ; then
     184    if (exec >&5 2>&5;$WX_CONFIG --unicode=yes --version "$wx_libs";exit $?) ; then
    182185      WX_CONFIG="$WX_CONFIG --unicode=yes"
    183     elif (exec >&5 2>&5;$WX_CONFIG --unicode=no --version;exit $?) ; then
     186    elif (exec >&5 2>&5;$WX_CONFIG --unicode=no --version "$wx_libs";exit $?) ; then
    184187      WX_CONFIG="$WX_CONFIG --unicode=no"
    185188    fi ;;
    186189esac
    187190
    188 dnl Call wx-config twice to avoid getting a newline in WX_LIBS.
    189 WX_LIBS=`$WX_CONFIG --libs`" "`$WX_CONFIG --gl-libs`
     191WX_LIBS=`$WX_CONFIG --libs "$wx_libs"`
    190192dnl Needed for nvidia drivers on linux (for some setups anyway).
    191193AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryVersion, [WX_LIBS="$WX_LIBS -lXxf86vm"], [], [$WX_LIBS])
     
    193195dnl Older wx-config didn't support --ldflags (2.6.3 doesn't) - error goes to
    194196dnl stderr, with nothing to stdout, so just ignore stderr.
    195 WX_LDFLAGS=`$WX_CONFIG --ldflags 2> /dev/null`
     197WX_LDFLAGS=`$WX_CONFIG --ldflags "$wx_libs" 2> /dev/null`
    196198AC_SUBST(WX_LDFLAGS)
    197 WX_CFLAGS=`$WX_CONFIG --cflags`
     199WX_CFLAGS=`$WX_CONFIG --cflags "$wx_libs"`
    198200AC_SUBST(WX_CFLAGS)
    199 WX_CXXFLAGS=`$WX_CONFIG --cxxflags`
     201WX_CXXFLAGS=`$WX_CONFIG --cxxflags "$wx_libs"`
    200202AC_SUBST(WX_CXXFLAGS)
    201203
Note: See TracChangeset for help on using the changeset viewer.