Commit 08e15134 authored by Sam Hocevar's avatar Sam Hocevar

* configure.ac: allow to specify another name for the wx-config script, for

    systems with both 2.4 and 2.5.
parent 4e1ce8be
...@@ -3619,8 +3619,15 @@ then ...@@ -3619,8 +3619,15 @@ then
then then
WXWINDOWS_PATH="${with_wx_config_path}:${PATH}" WXWINDOWS_PATH="${with_wx_config_path}:${PATH}"
fi ]) fi ])
WXWINDOWS_NAME="wx-config"
AC_ARG_WITH(wx-config,
[ --with-wx-config=NAME wx-config name (default is wx-config)],
[ if test "${with_wx_config}" != "no"
then
WXWINDOWS_NAME="${with_wx_config}"
fi ])
# look for wx-config # look for wx-config
AC_PATH_PROG(WX_CONFIG, wx-config, no, ${WXWINDOWS_PATH}) AC_PATH_PROG(WX_CONFIG, ${WXWINDOWS_NAME}, no, ${WXWINDOWS_PATH})
if test "${WX_CONFIG}" != "no" -a "${CXX}" != "" if test "${WX_CONFIG}" != "no" -a "${CXX}" != ""
then then
if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment