Changeset 7097


Ignore:
Timestamp:
Nov 12, 2008, 3:49:03 AM (12 years ago)
Author:
charles
Message:

don't invoke wx-config if the user specified --disable-wx

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r7094 r7097  
    181181dnl  wxWidgets detection for the wxWidgets client
    182182
    183 AM_OPTIONS_WXCONFIG
    184 AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no])
     183build_wx=no
    185184AC_ARG_ENABLE([wx],
    186185              AC_HELP_STRING([--enable-wx],[build wxWidgets client]),
    187186              [want_wx=${enableval}],
    188               [want_wx=no])
    189 build_wx=no
    190 if test "x$want_wx" = "xyes" ; then
     187              [want_wx=maybe])
     188if test "x$want_wx" != "xno"; then
     189    AM_OPTIONS_WXCONFIG
     190    AM_PATH_WXCONFIG($WX_MINIMUM,[have_wx=yes],[have_wx=no])
    191191    if test "x$have_wx" = "xyes"; then
    192       build_wx=yes
    193     else
    194       AC_MSG_ERROR("wxWidgets not found!")
     192        build_wx=yes
     193    elif test "x$want_wx" = "xyes"; then
     194        AC_MSG_ERROR("wxWidgets not found!")
    195195    fi
    196196fi
Note: See TracChangeset for help on using the changeset viewer.