X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c8849722a71ee7139e035bca5fdb2ae7b0af570..9b94d7f91e0db6340eaf4897819488dd1251966f:/configure.in diff --git a/configure.in b/configure.in index 9408a84b11..d028abf649 100644 --- a/configure.in +++ b/configure.in @@ -587,6 +587,7 @@ case "${host}" in AC_DEFINE(__WIN95__) AC_DEFINE(__WINDOWS__) AC_DEFINE(__GNUWIN32__) + AC_DEFINE(STRICT) AC_DEFINE(WINVER, 0x0400) DEFAULT_DEFAULT_wxUSE_MSW=1 ;; @@ -596,6 +597,7 @@ case "${host}" in AC_DEFINE(__WIN95__) AC_DEFINE(__WINDOWS__) AC_DEFINE(__GNUWIN32__) + AC_DEFINE(STRICT) AC_DEFINE(WINVER, 0x0400) DEFAULT_DEFAULT_wxUSE_MSW=1 ;; @@ -641,8 +643,10 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_SHARED=yes DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no + DEFAULT_wxUSE_NO_DEPS=no DEFAULT_wxUSE_NO_RTTI=no DEFAULT_wxUSE_NO_EXCEPTIONS=no + DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes DEFAULT_wxUSE_DEBUG_GDB=yes @@ -657,7 +661,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ZLIB=no DEFAULT_wxUSE_LIBPNG=no - DEFAULT_wxUSE_LIBGIF=no DEFAULT_wxUSE_LIBJPEG=no DEFAULT_wxUSE_ODBC=no @@ -670,6 +673,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CONFIG=no DEFAULT_wxUSE_STREAMS=no DEFAULT_wxUSE_SOCKETS=no + DEFAULT_wxUSE_DIALUP_MANAGER=no DEFAULT_wxUSE_SERIAL=no DEFAULT_wxUSE_JOYSTICK=no DEFAULT_wxUSE_DYNLIB_CLASS=no @@ -740,14 +744,20 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_UNICODE=no DEFAULT_wxUSE_WCSRTOMBS=no + + DEFAULT_wxUSE_GIF=no + DEFAULT_wxUSE_PCX=no + DEFAULT_wxUSE_PNM=no else DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no + DEFAULT_wxUSE_NO_DEPS=no DEFAULT_wxUSE_NO_RTTI=no DEFAULT_wxUSE_NO_EXCEPTIONS=no + DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=no DEFAULT_wxUSE_DEBUG_INFO=no DEFAULT_wxUSE_DEBUG_GDB=no @@ -762,7 +772,6 @@ else DEFAULT_wxUSE_ZLIB=yes DEFAULT_wxUSE_LIBPNG=yes - DEFAULT_wxUSE_LIBGIF=yes DEFAULT_wxUSE_LIBJPEG=yes DEFAULT_wxUSE_ODBC=no @@ -775,6 +784,7 @@ else DEFAULT_wxUSE_CONFIG=yes DEFAULT_wxUSE_STREAMS=yes DEFAULT_wxUSE_SOCKETS=yes + DEFAULT_wxUSE_DIALUP_MANAGER=yes DEFAULT_wxUSE_SERIAL=yes DEFAULT_wxUSE_JOYSTICK=yes DEFAULT_wxUSE_DYNLIB_CLASS=yes @@ -845,6 +855,10 @@ else DEFAULT_wxUSE_UNICODE=no DEFAULT_wxUSE_WCSRTOMBS=no + + DEFAULT_wxUSE_GIF=yes + DEFAULT_wxUSE_PCX=yes + DEFAULT_wxUSE_PNM=yes fi dnl WX_ARG_WITH should be used to select whether an external package will be @@ -880,7 +894,6 @@ AC_ARG_WITH(gtk-exec-prefix, [ --with-gtk-exec-prefix=PFX Exec prefix where GT WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC) WX_ARG_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB) WX_ARG_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG) -WX_ARG_WITH(libgif, [ --with-libgif use libgif (GIF file format)], wxUSE_LIBGIF) WX_ARG_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], wxUSE_LIBJPEG) WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL) WX_ARG_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC) @@ -913,6 +926,8 @@ WX_ARG_ENABLE(mem_tracing, [ --enable-mem_tracing create code with memory WX_ARG_ENABLE(profile, [ --enable-profile create code with profiling information], wxUSE_PROFILE) WX_ARG_ENABLE(no_rtti, [ --enable-no_rtti create code without RTTI information], wxUSE_NO_RTTI) WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without exceptions information], wxUSE_NO_EXCEPTIONS) +WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregarding strict ANSI], wxUSE_PERMISSIVE) +WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS) dnl --------------------------------------------------------------------------- dnl --disable-gui will build only non-GUI part of wxWindows @@ -930,6 +945,7 @@ dnl --------------------------------------------------------------------------- WX_ARG_ENABLE(intl, [ --enable-intl use internationalization system], wxUSE_INTL) WX_ARG_ENABLE(config, [ --enable-config use wxConfig (and derived) classes], wxUSE_CONFIG) WX_ARG_ENABLE(sockets, [ --enable-sockets use socket/network classes], wxUSE_SOCKETS) +WX_ARG_ENABLE(dialupman, [ --enable-dialupman use dialup network classes], wxUSE_DIALUP_MANAGER) WX_ARG_ENABLE(ipc, [ --enable-ipc use interprocess communication (wxSocket etc.)], wxUSE_IPC) WX_ARG_ENABLE(apple_ieee, [ --enable-apple_ieee use the Apple IEEE codec], wxUSE_APPLE_IEEE) WX_ARG_ENABLE(timedate, [ --enable-timedate use date/time classes], wxUSE_TIMEDATE) @@ -1107,6 +1123,14 @@ WX_ARG_ENABLE(splines, [ --enable-splines use spline drawing code], WX_ARG_ENABLE(validators, [ --enable-validators use wxValidator and derived classes], wxUSE_VALIDATORS) WX_ARG_ENABLE(busyinfo, [ --enable-busyinfo use wxBusyInfo], wxUSE_BUSYINFO) +dnl --------------------------------------------------------------------------- +dnl support for image formats that do not rely on external library +dnl --------------------------------------------------------------------------- + +WX_ARG_ENABLE(gif, [ --enable-gif use gif images (GIF file format)], wxUSE_GIF) +WX_ARG_ENABLE(pcx, [ --enable-pcx use pcx images (PCX file format)], wxUSE_PCX) +WX_ARG_ENABLE(pnm, [ --enable-pnm use pnm images (PNM file format)], wxUSE_PNM) + dnl cache the options values before (may be) aborting below WX_ARG_CACHE_FLUSH @@ -1174,12 +1198,12 @@ dnl cross-compiling support: we're cross compiling if the build system is dnl different from the target one (assume host and target be always the same) if eval "test $host != $build"; then if eval "test $host_alias != NONE"; then - CC=$host_alias-gcc - CXX=$host_alias-c++ + CC=$host_alias-gcc + CXX=$host_alias-c++ AR=$host_alias-ar RANLIB=$host_alias-ranlib - DLLTOOL=$host_alias-dlltool - LD=$host_alias-ld + DLLTOOL=$host_alias-dlltool + LD=$host_alias-ld NM=$host_alias-nm STRIP=$host_alias-strip fi @@ -1293,6 +1317,8 @@ SEARCH_INCLUDE="\ \ /usr/include/Motif1.2 \ /opt/xpm/include/X11 \ + /opt/GBxpm/include/ \ + /opt/GBxpm/X11/include/ \ \ /usr/Motif1.2/include \ /usr/dt/include \ @@ -1378,33 +1404,38 @@ WXGTK12= WXWINE= -if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then - AC_MSG_CHECKING(for Windows headers) - WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" - - dnl --- Quick & Dirty ; link against most/all libraries - dnl --- This will bloat the executable, but it'll work for now... - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -loldnames -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" +dnl Extension for programs; '.exe' for msw builds +PROGRAM_EXT= - if test "$ac_find_includes" != "" ; then - AC_MSG_RESULT(found $ac_find_includes) - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" +if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then + if test "$cross_compiling" = "yes" ; then + AC_MSG_WARN(Cross compiling --- skipping windows.h check) else - AC_MSG_RESULT(no) - if test "$cross_compiling" != "yes" ; then + AC_MSG_CHECKING(for Windows headers) + WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) + if test "$ac_find_includes" != "" ; then + AC_MSG_RESULT(found $ac_find_includes) + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" + else + AC_MSG_RESULT(no) AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) - fi + fi fi + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" + dnl --- Quick & Dirty ; link against most/all libraries + dnl --- This will bloat the executable, but it'll work for now... + LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" + TOOLKIT=MSW - + GUIOBJS=MSW_GUIOBJS GUIHEADERS=MSW_HEADERS COMMONOBJS=MSW_COMMONOBJS GENERICOBJS=MSW_GENERICOBJS UNIXOBJS= GUIDIST=MSW_DIST + PROGRAM_EXT=.exe fi if test "$wxUSE_GTK" = 1; then @@ -1418,11 +1449,14 @@ if test "$wxUSE_GTK" = 1; then TOOLKIT_INCLUDE="$GTK_CFLAGS" GUI_TK_LIBRARY="$GTK_LIBS -ldl" TOOLKIT=GTK - - GUIOBJS=GTK_GUIOBJS + GUIHEADERS=GTK_HEADERS + GUIOBJS=GTK_GUIOBJS COMMONOBJS=GTK_COMMONOBJS GENERICOBJS=GTK_GENERICOBJS + GUIDEPS=GTK_GUIDEPS + COMMONDEPS=GTK_COMMONDEPS + GENERICDEPS=GTK_GENERICDEPS UNIXOBJS=UNIXOBJS GUIDIST=GTK_DIST fi @@ -1450,7 +1484,7 @@ if test "$wxUSE_WINE" = 1; then AC_MSG_RESULT(no) AC_MSG_WARN(library will be compiled without support for images in XPM format) fi - + MESA_LINK="" AC_MSG_CHECKING(for Mesa library) WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL) @@ -1466,11 +1500,14 @@ if test "$wxUSE_WINE" = 1; then GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" WXWINE=1 TOOLKIT=MSW - - GUIOBJS=MSW_GUIOBJS + GUIHEADERS=MSW_HEADERS + GUIOBJS=MSW_GUIOBJS COMMONOBJS=MSW_COMMONOBJS GENERICOBJS=MSW_GENERICOBJS + GUIDEPS=MSW_GUIDEPS + COMMONDEPS=MSW_COMMONDEPS + GENERICDEPS=MSW_GENERICDEPS UNIXOBJS=UNIXOBJS GUIDIST=MSW_DIST fi @@ -1538,11 +1575,14 @@ if test "$wxUSE_MOTIF" = 1; then GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -ldl -lm" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" TOOLKIT=MOTIF - - GUIOBJS=MOTIF_GUIOBJS + GUIHEADERS=MOTIF_HEADERS + GUIOBJS=MOTIF_GUIOBJS COMMONOBJS=MOTIF_COMMONOBJS GENERICOBJS=MOTIF_GENERICOBJS + GUIDEPS=MOTIF_GUIDEPS + COMMONDEPS=MOTIF_COMMONDEPS + GENERICDEPS=MOTIF_GENERICDEPS UNIXOBJS=UNIXOBJS GUIDIST=MOTIF_DIST fi @@ -1851,7 +1891,7 @@ fi if test "$wxUSE_THREADS" = "yes" ; then dnl find if POSIX threads are available - + dnl standard lib name is pthread dnl We no longer test for pthread-0.7 as it breaks compilation on some dnl glibc2 systems, especially for static linkage. @@ -1966,16 +2006,17 @@ if test "$wxUSE_CYGWIN" = 1 ; then fi WXDEBUG= -if test "$wxUSE_DEBUG_GDB" = "yes" ; then - wxUSE_DEBUG_INFO=yes - WXDEBUG="-ggdb" -fi if test "$wxUSE_DEBUG_INFO" = "yes" ; then WXDEBUG="-g" wxUSE_OPTIMISE=no fi +if test "$wxUSE_DEBUG_GDB" = "yes" ; then + wxUSE_DEBUG_INFO=yes + WXDEBUG="-ggdb" +fi + if test "$wxUSE_DEBUG_FLAG" = "yes" ; then AC_DEFINE(WXDEBUG) WXDEBUG_DEFINE="-D__WXDEBUG__" @@ -2000,6 +2041,7 @@ if test "$wxUSE_PROFILE" = "yes" ; then PROFILE="-pg" fi +DEP_INFO_FLAGS= if test "$GCC" = yes ; then if test "$wxUSE_NO_RTTI" = "yes" ; then WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti" @@ -2007,11 +2049,16 @@ if test "$GCC" = yes ; then if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions" fi -dnl CFLAGS="${CFLAGS} -fpermissive" -dnl CXXFLAGS="${CXXFLAGS} -fpermissive" -fi - - + if test "$wxUSE_PERMISSIVE" = "yes" ; then + CFLAGS="${CFLAGS} -fpermissive" + CXXFLAGS="${CXXFLAGS} -fpermissive" + fi + if test "$wxUSE_NO_DEPS" = "no" ; then + DEP_INFO_FLAGS="-MMD" + fi +fi + + CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` if test "$wxUSE_OPTIMISE" = "no" ; then @@ -2046,10 +2093,6 @@ if test "$wxUSE_LIBPNG" = "yes" ; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" fi -if test "$wxUSE_LIBGIF" = "yes" ; then - AC_DEFINE(wxUSE_LIBGIF) -fi - JPEG_INCLUDE= if test "$wxUSE_LIBJPEG" = "yes" ; then AC_DEFINE(wxUSE_LIBJPEG) @@ -2188,6 +2231,10 @@ if test "$wxUSE_SOCKETS" = "yes" ; then fi fi +if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then + AC_DEFINE(wxUSE_DIALUP_MANAGER) +fi + if test "$wxUSE_STREAMS" = "yes" ; then AC_DEFINE(wxUSE_STREAMS) fi @@ -2254,13 +2301,13 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1]) if test "$HAVE_DL_FUNCS" = 0; then - if test "$USE_UNIX" = 1; then + if test "$USE_UNIX" = 1; then AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support") wxUSE_ODBC=no wxUSE_DYNLIB_CLASS=no else AC_MSG_WARN("Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled.") - fi + fi fi fi @@ -2502,11 +2549,7 @@ if test "$wxUSE_STATLINE" = "yes"; then if test "$wxUSE_WINE" = 1 ; then AC_MSG_WARN([wxStaticLine is not supported under WINE]) else - if test "$wxUSE_MOTIF" = 1 ; then - AC_MSG_WARN([wxStaticLine is not supported under Motif]) - else - AC_DEFINE(wxUSE_STATLINE) - fi + AC_DEFINE(wxUSE_STATLINE) fi fi @@ -2606,6 +2649,18 @@ if test "$wxUSE_VALIDATORS" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" fi +if test "$wxUSE_GIF" = "yes" ; then + AC_DEFINE(wxUSE_GIF) +fi + +if test "$wxUSE_PCX" = "yes" ; then + AC_DEFINE(wxUSE_PCX) +fi + +if test "$wxUSE_PNM" = "yes" ; then + AC_DEFINE(wxUSE_PNM) +fi + dnl --------------------------------------------------------------------------- dnl Output the makefiles and such from the results found above dnl --------------------------------------------------------------------------- @@ -2670,6 +2725,7 @@ AC_SUBST(WX_TARGET_LIBRARY) AC_SUBST(WX_LIBRARY_LINK1) AC_SUBST(WX_LIBRARY_LINK2) AC_SUBST(WX_LIBRARY_LINK3) +AC_SUBST(PROGRAM_EXT) dnl are we supposed to create the links? AC_SUBST(WX_CREATE_LINKS) @@ -2677,6 +2733,7 @@ AC_SUBST(WX_CREATE_INSTALLED_LINKS) AC_SUBST(SHARED_LD) AC_SUBST(PIC_FLAG) +AC_SUBST(DEP_INFO_FLAGS) dnl debugging options AC_SUBST(WXDEBUG_DEFINE) @@ -2688,10 +2745,13 @@ AC_SUBST(TOOLKIT_DIR) AC_SUBST(TOOLKIT_INCLUDE) dnl what to compile -AC_SUBST(GUIOBJS) AC_SUBST(GUIHEADERS) +AC_SUBST(GUIOBJS) AC_SUBST(COMMONOBJS) AC_SUBST(GENERICOBJS) +AC_SUBST(GUIDEPS) +AC_SUBST(COMMONDEPS) +AC_SUBST(GENERICDEPS) AC_SUBST(UNIXOBJS) AC_SUBST(GUIDIST) @@ -2715,6 +2775,15 @@ AC_PROG_MAKE_SET AC_CONFIG_HEADER(setup.h:setup.h.in) +dnl Duh! glcanvas/$(TOOLKIT_DIR) doesn't work for msw because some +dnl genius called it "win" +if test "${TOOLKIT_DIR}" = "msw" ; then + GL_TOOLKIT_DIR="win" +else + GL_TOOLKIT_DIR="${TOOLKIT_DIR}" +fi +dnl It's needed in glcanvas/Makefile.in so we even have to subst this hack! +AC_SUBST(GL_TOOLKIT_DIR) dnl create each of the files in the space separated list from the file.in dnl (the original file name may be overriden by appending another name after a @@ -2738,6 +2807,7 @@ AC_OUTPUT([ samples/drawing/Makefile samples/dynamic/Makefile samples/image/Makefile + samples/internat/Makefile samples/layout/Makefile samples/listctrl/Makefile samples/mdi/Makefile @@ -2770,17 +2840,21 @@ AC_OUTPUT([ utils/wxMMedia2/Makefile utils/wxMMedia2/lib/Makefile utils/wxMMedia2/sample/Makefile + utils/glcanvas/Makefile + utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile + utils/ogl/Makefile + utils/ogl/src/Makefile ], [ chmod +x wx-config - if test ! -d include; then - mkdir include + if test ! -d include; then + mkdir include fi - if test ! -d include/wx; then - mkdir include/wx + if test ! -d include/wx; then + mkdir include/wx fi - if test ! -d include/wx/${TOOLKIT_DIR}; then - mkdir include/wx/${TOOLKIT_DIR} + if test ! -d include/wx/${TOOLKIT_DIR}; then + mkdir include/wx/${TOOLKIT_DIR} fi cp -f setup.h include/wx/${TOOLKIT_DIR}/setup.h ],