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

SN: Several workarounds for OS/2-specific problems.

Browse Source 
SN: "--with-pm" only allowed on OS/2.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2000-01-10 17:07:28 +00:00
parent 1cf4526de3
commit d51e8205da
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configure.in
View File

@@ -1191,7 +1191,18 @@ else
fi fi
dnl we suppose that expr exists... dnl we suppose that expr exists...
NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_PM:-0}` NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
case "${host}" in
*-pc-os2_emx )
NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
# PATH_IFS is autodetected by OS/2's configure (usually ';')
LEX_STEM="lexyy"
;;
*)
PATH_IFS=':'
LEX_STEM="lex.yy"
;;
esac
case "$NUM_TOOLKITS" in case "$NUM_TOOLKITS" in
1) 1)
@@ -1398,6 +1409,8 @@ SEARCH_INCLUDE="\
/usr/x386/include \ /usr/x386/include \
/usr/XFree86/include/X11 \ /usr/XFree86/include/X11 \
\ \
X:/XFree86/include/X11 \
\
/usr/include/gtk \ /usr/include/gtk \
/usr/local/include/gtk \ /usr/local/include/gtk \
/usr/include/glib \ /usr/include/glib \
@@ -3173,7 +3186,14 @@ dnl for convenience, sort the samples in alphabetical order
dnl dnl
dnl FIXME For some mysterious reasons, sometimes the directories are duplicated dnl FIXME For some mysterious reasons, sometimes the directories are duplicated
dnl in this list - hence uniq. But normally, this shouldn't be needed! dnl in this list - hence uniq. But normally, this shouldn't be needed!
SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '`" dnl Unfortunately, there is a bug in OS/2's tr, such that
dnl tr ' ' '\n' introduces DOS-like line breaks, whereas tr '\n' ' '
dnl only removes the Unix-like part of the introduced line break.
SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
dnl makefile variables
AC_SUBST(LEX_STEM)
AC_SUBST(PATH_IFS)
dnl global options dnl global options
AC_SUBST(WX_MAJOR_VERSION_NUMBER) AC_SUBST(WX_MAJOR_VERSION_NUMBER)