From 8e1aefe0f2f292f48bfec1c9572ed6e6a98a8d2d Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 24 Jan 2002 21:11:46 +0000 Subject: [PATCH 1/1] fixes to git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + wxwin.m4 | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index e71441a824..e61cca8686 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -73,6 +73,7 @@ wxBase: - modified wxFileName::CreateTempFileName() to open the file atomically (if possible) and, especially, not to leak the file descriptors under Unix - memory leak in wxHTTP fixed (Dimitri) +- fixes to AM_PATH_WXCONFIG autoconf macro All (GUI): diff --git a/wxwin.m4 b/wxwin.m4 index c0f0c678ca..a7e88b886c 100644 --- a/wxwin.m4 +++ b/wxwin.m4 @@ -69,20 +69,20 @@ AC_DEFUN(AM_PATH_WXCONFIG, dnl deal with optional prefixes if test x$wx_config_exec_prefix != x ; then wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix" - if test x${WX_CONFIG_NAME+set} != xset ; then - WX_CONFIG_PATH=$wx_config_exec_prefix/bin/$WX_CONFIG_NAME - fi + WX_LOOKUP_PATH="$wx_config_exec_prefix/bin" fi if test x$wx_config_prefix != x ; then wx_config_args="$wx_config_args --prefix=$wx_config_prefix" - if test x${WX_CONFIG_NAME+set} != xset ; then - WX_CONFIG_PATH=$wx_config_prefix/bin/$WX_CONFIG_NAME - fi + WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin" fi - dnl don't search the PATH if we already have the full name - if test "x$WX_CONFIG_PATH" = "x" ; then - AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no) + dnl don't search the PATH if WX_CONFIG_NAME is absolute filename + if test -x "$WX_CONFIG_NAME" ; then + AC_MSG_CHECKING(for wx-config) + WX_CONFIG_PATH="$WX_CONFIG_NAME" + AC_MSG_RESULT($WX_CONFIG_PATH) + else + AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH") fi if test "$WX_CONFIG_PATH" != "no" ; then -- 2.45.2