Changeset ab920c2 in git


Ignore:
Timestamp:
16/06/10 15:15:44 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
svn/1.0, svn/tags/1.0.40
Children:
94132ec
Parents:
608f9cc
Message:

configure.in: Backport change to add support for WX_CONFIG as a
preferred new replacement for WXCONFIG. Add wx2.8 and remove
wx2.5 (development version) from the list of wx versions to
check.

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

Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r608f9cc rab920c2  
    142142AC_SUBST(WINPROGS)
    143143
    144 AC_ARG_VAR(WXCONFIG, [wxWindows configuration script to use to build Aven])
     144AC_ARG_VAR(WXCONFIG, [Old name for WX_CONFIG, accepted for compatibility])
     145AC_ARG_VAR(WX_CONFIG, [wxWidgets configuration script to use to build Aven])
     146: ${WX_CONFIG="$WXCONFIG"}
    145147
    146148if test yes = "$no_x"; then
    147149  AC_MSG_RESULT([not building xcaverot (X libraries not found or disabled)])
    148   if test -z "$WXCONFIG" && test no = "$mswindows"; then
     150  if test -z "$WX_CONFIG" && test no = "$mswindows"; then
    149151    AC_MSG_RESULT([not building aven (X libraries not found or disabled)])
    150152    AVEN=
     
    161163
    162164if test -n "$AVEN"; then
    163   if test -n "$WXCONFIG" ; then
    164     dnl WXCONFIG specified - sanity check the value
     165  if test -n "$WX_CONFIG" ; then
     166    dnl WX_CONFIG specified - sanity check the value
    165167    dnl don't check for --ldflags - older wx-config didn't do that
    166     if (exec >&5 2>&5;$WXCONFIG --libs --cflags --cxxflags;exit $?) then
     168    if (exec >&5 2>&5;$WX_CONFIG --libs --cflags --cxxflags;exit $?) then
    167169      :
    168170    else
    169       AC_MSG_ERROR(['$WXCONFIG --libs --cflags --cxxflags' doesn't work, bailing out])
     171      AC_MSG_ERROR(['$WX_CONFIG --libs --cflags --cxxflags' doesn't work, bailing out])
    170172    fi
    171173  else
    172     # prefer wx2.6 (or wx2.5) - a few things work better with it.
     174    # prefer wx2.6 or wx2.8 - a few things work better with it than with wx2.4.
    173175    if test yes = "$macosx" ; then
    174       AC_PATH_PROGS(WXCONFIG, [wxmac-2.6-config wxmac-2.5-config wxmac-2.4-config wxmac-config])
     176      AC_PATH_PROGS(WX_CONFIG, [wxmac-2.8-config wxmac-2.6-config wxmac-2.4-config wxmac-config])
    175177      wxdef=__WXMAC__
    176178    elif test yes = "$mswindows" ; then
    177       AC_PATH_PROGS(WXCONFIG, [wxmsw-2.6-config wxmsw-2.5-config wxmsw-2.4-config wxmsw-config])
     179      AC_PATH_PROGS(WX_CONFIG, [wxmsw-2.8-config wxmsw-2.6-config wxmsw-2.4-config wxmsw-config])
    178180      wxdef=__WXMSW__
    179181    else
    180       AC_PATH_PROGS(WXCONFIG, [wxgtk-2.6-config wxgtk-2.5-config wxgtk-2.4-config wxgtk-config])
     182      AC_PATH_PROGS(WX_CONFIG, [wxgtk-2.8-config wxgtk-2.6-config wxgtk-2.4-config wxgtk-config])
    181183      wxdef=__WXGTK__
    182184    fi
    183     if test -z "$WXCONFIG" ; then
     185    if test -z "$WX_CONFIG" ; then
    184186      dnl see if wx-config exists and is for the correct version
    185       AC_PATH_PROGS(WXCONFIG, [wx-config])
    186       if test -n "$WXCONFIG" ; then
    187         if (exec >&5 2>&5;$WXCONFIG --cflags|grep -e -D"$wxdef";exit $?) then
     187      AC_PATH_PROGS(WX_CONFIG, [wx-config])
     188      if test -n "$WX_CONFIG" ; then
     189        if (exec >&5 2>&5;$WX_CONFIG --cflags|grep -e -D"$wxdef";exit $?) then
    188190          :
    189191        else
    190           WXCONFIG=
     192          WX_CONFIG=
    191193        fi
    192194      fi
    193195    fi
    194     if test -z "$WXCONFIG" ; then
     196    if test -z "$WX_CONFIG" ; then
    195197      AC_MSG_RESULT([not building aven (wxWindows not found)])
    196198      AVEN=
     
    199201
    200202  if test -n "$AVEN"; then
    201     WX_LIBS=`$WXCONFIG --libs`
     203    WX_LIBS=`$WX_CONFIG --libs`
    202204    AC_SUBST(WX_LIBS)
    203205    dnl older wx-config didn't support this - error goes to stderr, with
    204206    dnl nothing to stdout, so just ignore stderr
    205     WX_LDFLAGS=`$WXCONFIG --ldflags 2> /dev/null`
     207    WX_LDFLAGS=`$WX_CONFIG --ldflags 2> /dev/null`
    206208    AC_SUBST(WX_LDFLAGS)
    207     WX_CFLAGS=`$WXCONFIG --cflags`
     209    WX_CFLAGS=`$WX_CONFIG --cflags`
    208210    AC_SUBST(WX_CFLAGS)
    209     WX_CXXFLAGS=`$WXCONFIG --cxxflags`
     211    WX_CXXFLAGS=`$WX_CONFIG --cxxflags`
    210212    AC_SUBST(WX_CXXFLAGS)
    211213    AC_MSG_RESULT(building aven)
Note: See TracChangeset for help on using the changeset viewer.