Fix nonsensical handling of TOOLKIT in wxwin.m4
The code set WX_PORT to $TOOLKIT only if the latter was empty which made no sense and also set WX_PORT to the never used nor documented anywhere else $PORT if $TOOLKIT was not empty which made even less of it. Just assign $TOOLKIT to WX_PORT if the former has a valid value.
This commit is contained in:
6
wxwin.m4
6
wxwin.m4
@@ -899,14 +899,8 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
|
|||||||
|
|
||||||
AC_MSG_RESULT([$WX_PORT])
|
AC_MSG_RESULT([$WX_PORT])
|
||||||
else
|
else
|
||||||
|
|
||||||
dnl Use the setting given by the user
|
dnl Use the setting given by the user
|
||||||
if test -z "$TOOLKIT" ; then
|
|
||||||
WX_PORT=$TOOLKIT
|
WX_PORT=$TOOLKIT
|
||||||
else
|
|
||||||
dnl try with PORT
|
|
||||||
WX_PORT=$PORT
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(WX_PORT)
|
AC_SUBST(WX_PORT)
|
||||||
|
Reference in New Issue
Block a user