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

Applied patch [ 1204497 ] fixes for wxwin.m4

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-05-22 14:42:31 +00:00
parent 2963f111d6
commit 80f3a6b0aa
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wxwin.m4
View File

@@ -7,7 +7,7 @@ dnl ...
dnl AM_OPTIONS_WXCONFIG dnl AM_OPTIONS_WXCONFIG
dnl ... dnl ...
dnl ... dnl ...
dnl AM_PATH_WXCONFIG(2.3.4, wxWin=1) dnl AM_PATH_WXCONFIG(2.6.0, wxWin=1)
dnl if test "$wxWin" != 1; then dnl if test "$wxWin" != 1; then
dnl AC_MSG_ERROR([ dnl AC_MSG_ERROR([
dnl wxWindows must be installed on your system dnl wxWindows must be installed on your system
@@ -23,7 +23,7 @@ dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
dnl dnl
dnl LDFLAGS="$LDFLAGS $WX_LIBS" dnl LIBS="$LIBS $WX_LIBS"
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@@ -229,6 +229,15 @@ AC_DEFUN([AM_PATH_WXCONFIG],
ifelse([$3], , :, [$3]) ifelse([$3], , :, [$3])
fi fi
else
WX_CFLAGS=""
WX_CPPFLAGS=""
WX_CXXFLAGS=""
WX_LIBS=""
WX_LIBS_STATIC=""
ifelse([$3], , :, [$3])
fi fi
AC_SUBST(WX_CPPFLAGS) AC_SUBST(WX_CPPFLAGS)