WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=12
+WX_RELEASE_NUMBER=13
WX_INTERFACE_AGE=0
WX_BINARY_AGE=0
fi
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
1)
/usr/x386/include \
/usr/XFree86/include/X11 \
\
+ X:/XFree86/include/X11 \
+ \
/usr/include/gtk \
/usr/local/include/gtk \
/usr/include/glib \
dnl search for toolkit (widget sets)
dnl ----------------------------------------------------------------
+AFMINSTALL=
+
if test "$wxUSE_GUI" = "yes"; then
+USE_GUI=1
+
TOOLKIT=
TOOLKIT_INCLUDE=
if test "$wxUSE_GTK" = 1; then
dnl avoid calling AM_PATH_GTK twice, so check first for the newer version
dnl and only then, if it wasn't found, for an older one
- AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?))
+ AM_PATH_GTK(1.2.3, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.3 or above?))
dnl it doesn't really work with 1.3.0 now...
dnl AM_PATH_GTK(1.3.0,
dnl WXGTK13=1,
GUI_TK_LIBRARY="$GTK_LIBS -lgthread"
TOOLKIT=GTK
+ AFMINSTALL=afminstall
+
GUIOBJS="\$(GTK_GUIOBJS)"
GUIHEADERS="\$(GTK_HEADERS)"
COMMONOBJS="\$(GTK_COMMONOBJS)"
GUI_TK_LIBRARY="$X_LIBS"
TOOLKIT_INCLUDE="$X_CFLAGS"
+ AFMINSTALL=afminstall
+
dnl manual check for X11 headers/libs
dnl
dnl AC_MSG_CHECKING(for X11 headers)
dnl the name of the directory where the files for this toolkit live
if test "$TOOLKIT" != "PM" ; then
- TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`
+ TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"`
else
TOOLKIT_DIR="os2"
fi
else
dnl leave all TOOLKIT_XXX vars empty
+ USE_GUI=0
+
dnl the sources, their dependenices and the headers
ALL_OBJECTS="\$(BASE_OBJS)"
ALL_DEPFILES="\${BASE_DEPS}"
fi
DEP_INFO_FLAGS=
+CODE_GEN_FLAGS=
if test "$GCC" = yes ; then
if test "$wxUSE_NO_RTTI" = "yes" ; then
- WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti"
+ CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-rtti"
fi
if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
- WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions"
+ CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-exceptions"
fi
if test "$wxUSE_PERMISSIVE" = "yes" ; then
- CFLAGS="${CFLAGS} -fpermissive"
- CXXFLAGS="${CXXFLAGS} -fpermissive"
+ CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
fi
if test "$wxUSE_NO_DEPS" = "no" ; then
DEP_INFO_FLAGS="-MMD"
if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
AC_DEFINE(wxUSE_DIALUP_MANAGER)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
fi
if test "$wxUSE_STREAMS" = "yes" ; then
AC_LANG_RESTORE
AC_DEFINE(wxUSE_SOCKETS)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
fi
dnl library features they need are present)
dnl TODO some samples are never built so far:
- dnl mfc, nativdlg, oleauto, ownerdrw, proplist
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
- font forty fractal image minimal richedit wxpoem"
+ dnl ipc, mfc, nativdlg, oleauto, ownerdrw, proplist
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs drawing dynamic \
+ font fractal image minimal richedit"
dnl this is needed to be able to find AFM files
CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
dnl
dnl FIXME For some mysterious reasons, sometimes the directories are duplicated
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
AC_SUBST(WX_MAJOR_VERSION_NUMBER)
AC_SUBST(SHARED_LD)
AC_SUBST(PIC_FLAG)
AC_SUBST(DEP_INFO_FLAGS)
+AC_SUBST(CODE_GEN_FLAGS)
AC_SUBST(BURNT_LIBRARY_NAME)
dnl debugging options
AC_SUBST(WXDEBUG_DEFINE)
dnl toolkit options
+AC_SUBST(USE_GUI)
+AC_SUBST(AFMINSTALL)
AC_SUBST(TOOLKIT)
AC_SUBST(TOOLKIT_DEF)
AC_SUBST(TOOLKIT_DIR)
src/makeprog.env
src/makelib.env
Makefile
+ demos/Makefile
+ demos/bombs/Makefile
+ demos/forty/Makefile
+ demos/fractal/Makefile
+ demos/life/Makefile
+ demos/poem/Makefile
samples/Makefile
- samples/bombs/Makefile
samples/caret/Makefile
+ samples/calendar/Makefile
samples/checklst/Makefile
samples/config/Makefile
samples/controls/Makefile
samples/docvwmdi/Makefile
samples/dnd/Makefile
samples/drawing/Makefile
- samples/forty/Makefile
+ samples/exec/Makefile
samples/font/Makefile
- samples/fractal/Makefile
+ samples/grid/Makefile
+ samples/help/Makefile
samples/image/Makefile
samples/internat/Makefile
+ samples/ipc/Makefile
samples/layout/Makefile
samples/listctrl/Makefile
samples/mdi/Makefile
samples/minifram/Makefile
samples/minimal/Makefile
- samples/nettest/Makefile
+ samples/dialup/Makefile
samples/newgrid/Makefile
samples/notebook/Makefile
samples/png/Makefile
samples/printing/Makefile
samples/proplist/Makefile
+ samples/propsize/Makefile
samples/richedit/Makefile
samples/resource/Makefile
samples/sashtest/Makefile
samples/treectrl/Makefile
samples/typetest/Makefile
samples/validate/Makefile
- samples/wxpoem/Makefile
- samples/wxsocket/Makefile
+ samples/sockets/Makefile
samples/wizard/Makefile
samples/html/Makefile
samples/html/about/Makefile
utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
utils/ogl/Makefile
utils/ogl/src/Makefile
+ utils/makegen/Makefile
+ utils/HelpGen/Makefile
+ utils/HelpGen/src/Makefile
+ utils/tex2rtf/Makefile
+ utils/tex2rtf/src/Makefile
+ utils/hhp2cached/Makefile
+ utils/dialoged/Makefile
+ utils/dialoged/src/Makefile
],
[
chmod +x wx-config
projects / wxWidgets.git / blobdiff