Changeset 5297c43 in git


Ignore:
Timestamp:
23/07/10 12:23:05 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, 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/trunk, travis-osx
Children:
193efb1
Parents:
b7510ee
Message:

configure.in: Update the wx-config probing code - wxmac-config etc
aren't present with newer wxWidgets versions.

git-svn-id: file:///home/survex-svn/survex/trunk@3481 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rb7510ee r5297c43  
     1Fri Jul 23 11:21:52 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * configure.in: Update the wx-config probing code - wxmac-config etc
     4          aren't present with newer wxWidgets versions.
     5
    16Fri Jul 23 05:55:37 GMT 2010  Olly Betts <olly@survex.com>
    27
  • configure.in

    rb7510ee r5297c43  
    147147    :
    148148  else
    149     AC_MSG_ERROR(['$WX_CONFIG --libs --cflags --cxxflags "$wx_libs"' doesn't work, bailing out])
     149    AC_MSG_ERROR(['$WX_CONFIG --libs --cflags --cxxflags "$wx_libs"' does not work, bailing out])
    150150  fi
    151151else
    152152  if test yes = "$macosx" ; then
    153     dnl FIXME: Not sure if this is useful for newer wx...
    154     AC_PATH_PROGS(WX_CONFIG, [wxmac-2.8-config wxmac-2.6-config wxmac-2.7-config wxmac-config])
    155153    wxdef=__WXMAC__
    156154  elif test yes = "$mswindows" ; then
    157     dnl FIXME: Not sure if this is useful for newer wx...
    158     AC_PATH_PROGS(WX_CONFIG, [wxmsw-2.8-config wxmac-2.6-config wxmac-2.7-config wxmac-config])
    159155    wxdef=__WXMSW__
    160156  else
    161157    wxdef=__WXGTK__
    162158  fi
    163   if test -z "$WX_CONFIG" ; then
    164     dnl See if wx-config exists and is for the correct version.
    165     AC_PATH_PROGS(WX_CONFIG, [wx-config])
    166     if test -n "$WX_CONFIG" ; then
    167       if (exec >&5 2>&5;$WX_CONFIG --cflags "$wx_libs"|grep -e -D"$wxdef";exit $?) then
    168         :
    169       else
    170         WX_CONFIG=
    171       fi
     159  dnl See if wx-config exists and is for the correct version.
     160  AC_PATH_PROGS(WX_CONFIG, [wx-config])
     161  if test -n "$WX_CONFIG" ; then
     162    if (exec >&5 2>&5;$WX_CONFIG --cflags "$wx_libs"|grep -e -D"$wxdef";exit $?) then
     163      :
     164    else
     165      AC_MSG_ERROR([wxWidgets not for the right toolkit.  Run ./configure WX_CONFIG=/path/to/wx-config])
    172166    fi
    173   fi
    174   if test -z "$WX_CONFIG" ; then
     167  else
    175168    AC_MSG_ERROR([wxWidgets not found.  Run ./configure WX_CONFIG=/path/to/wx-config])
    176169  fi
Note: See TracChangeset for help on using the changeset viewer.