cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminate the redundant no_wx var and the extra test to set it.

Browse Source 
Don't perform unrelated tests inside a single CHECK/RESULT block.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee 2004-10-12 13:23:09 +00:00
parent 8dabd665bd
commit 3f45f8bf3d
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wxwin.m4
View File

@ -113,7 +113,6 @@ AC_DEFUN([AM_PATH_WXCONFIG],
if test "$WX_CONFIG_PATH" != "no" ; then if test "$WX_CONFIG_PATH" != "no" ; then
WX_VERSION="" WX_VERSION=""
no_wx=""
min_wx_version=ifelse([$1], ,2.2.1,$1) min_wx_version=ifelse([$1], ,2.2.1,$1)
if test -z "$5" ; then if test -z "$5" ; then
@ -158,11 +157,20 @@ AC_DEFUN([AM_PATH_WXCONFIG],
fi fi
fi fi
if test "x$wx_ver_ok" = x ; then if test -n "$wx_ver_ok"; then
no_wx=yes
else AC_MSG_RESULT(yes (version $WX_VERSION))
WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs` WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
dnl is this even still appropriate? --static is a real option now
dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
dnl what the user actually wants, making this redundant at best.
dnl For now keep it in case anyone actually used it in the past.
AC_MSG_CHECKING([for wxWindows static library])
WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs` WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs`
if test -n "$WX_LIBS_STATIC"; then
AC_MSG_RESULT(yes)
fi
dnl starting with version 2.2.6 wx-config has --cppflags argument dnl starting with version 2.2.6 wx-config has --cppflags argument
wx_has_cppflags="" wx_has_cppflags=""
@ -199,12 +207,11 @@ AC_DEFUN([AM_PATH_WXCONFIG],
WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"` WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"` WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
fi fi
fi
if test "x$no_wx" = x ; then ifelse([$2], , :, [$2])
AC_MSG_RESULT(yes (version $WX_VERSION))
ifelse([$2], , :, [$2])
else else
if test "x$WX_VERSION" = x; then if test "x$WX_VERSION" = x; then
dnl no wx-config at all dnl no wx-config at all
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@ -218,6 +225,7 @@ AC_DEFUN([AM_PATH_WXCONFIG],
WX_LIBS="" WX_LIBS=""
WX_LIBS_STATIC="" WX_LIBS_STATIC=""
ifelse([$3], , :, [$3]) ifelse([$3], , :, [$3])
fi fi
fi fi