X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e46286351dbfa7ae98e8341e4fc328b134601e87..0b8558681e8c69b749f64b891111f5ea72c04550:/configure.in diff --git a/configure.in b/configure.in index f18379995c..361250ba45 100644 --- a/configure.in +++ b/configure.in @@ -11,6 +11,419 @@ dnl dnl Version: $Id$ dnl --------------------------------------------------------------------------- +dnl --------------------------------------------------------------------------- +dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS. Uses variables +dnl gtk_config_prefix and/or gtk_config_exec_prefix if defined. +dnl --------------------------------------------------------------------------- +dnl +AC_DEFUN(AM_PATH_GTK, +[ + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + fi + fi + + AC_PATH_PROG(GTK_CONFIG, gtk-config, no) + min_gtk_version=ifelse([$1], ,0.99.7,$1) + AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) + no_gtk="" + if test "$GTK_CONFIG" != "no" ; then + GTK_CFLAGS=`$GTK_CONFIG --cflags` + GTK_LIBS=`$GTK_CONFIG --libs` + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" +dnl +dnl Now check if the installed GTK is sufficiently new. (Also sanity +dnl checks the results of gtk-config to some extent) +dnl + AC_TRY_RUN([ +#include +#include + +int +main () +{ + int major, minor, micro; + + if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } + + if (gtk_minor_version == 1) return FALSE; + + return !((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); +} +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + else + no_gtk=yes + fi + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + GTK_CFLAGS="" + GTK_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) +]) + +dnl =========================================================================== +dnl macros to find the a file in the list of include/lib paths +dnl =========================================================================== + +dnl --------------------------------------------------------------------------- +dnl call WX_PATH_FIND_INCLUDES(search path, header name), sets ac_find_includes +dnl to the full name of the file that was found or leaves it empty if not found +dnl --------------------------------------------------------------------------- +AC_DEFUN(WX_PATH_FIND_INCLUDES, +[ +ac_find_includes= +for ac_dir in $1; + do + if test -f "$ac_dir/$2"; then + ac_find_includes=$ac_dir + break + fi + done +]) + +dnl --------------------------------------------------------------------------- +dnl call WX_PATH_FIND_LIBRARIES(search path, header name), sets ac_find_includes +dnl to the full name of the file that was found or leaves it empty if not found +dnl --------------------------------------------------------------------------- +AC_DEFUN(WX_PATH_FIND_LIBRARIES, +[ +ac_find_libraries= +for ac_dir in $1; + do + for ac_extension in a so sl; do + if test -f "$ac_dir/lib$2.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done +]) + +dnl --------------------------------------------------------------------------- +dnl Path to include, already defined +dnl --------------------------------------------------------------------------- +AC_DEFUN(WX_INCLUDE_PATH_EXIST, +[ + ac_path_to_include=$1 + echo "$2" | grep "\-I$1" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_include="" + else + ac_path_to_include="-I$1" + fi +]) + +dnl --------------------------------------------------------------------------- +dnl Path to link, already defined +dnl --------------------------------------------------------------------------- +AC_DEFUN(WX_LINK_PATH_EXIST, +[ + echo "$2" | grep "\-L$1" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_link="" + else + ac_path_to_link="-L$1" + fi +]) + +dnl =========================================================================== +dnl C++ features test +dnl =========================================================================== + +dnl --------------------------------------------------------------------------- +dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" header +dnl or only the old one - it may be generally assumed that if +dnl exists, the other "new" headers (without .h) exist too. +dnl +dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false-or-cross-compiling) +dnl --------------------------------------------------------------------------- + +AC_DEFUN(WX_CPP_NEW_HEADERS, +[ + if test "$cross_compiling" = "yes"; then + ifelse([$2], , :, [$2]) + else + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + + AC_CHECK_HEADERS(iostream) + + if test "x$HAVE_IOSTREAM" = x ; then + ifelse([$2], , :, [$2]) + else + ifelse([$1], , :, [$1]) + fi + + AC_LANG_RESTORE + fi +]) + +dnl --------------------------------------------------------------------------- +dnl WX_CPP_BOOL checks whether the C++ compiler has a built in bool type +dnl +dnl call WX_CPP_BOOL - will define HAVE_BOOL if the compiler supports bool +dnl --------------------------------------------------------------------------- + +AC_DEFUN(WX_CPP_BOOL, +[ + AC_CACHE_CHECK([if C++ compiler supports bool], wx_cv_cpp_bool, + [ + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + + AC_TRY_RUN([ + int main() + { + bool b = true; + + return 0; + } + ], + [ + AC_DEFINE(HAVE_BOOL) + wx_cv_cpp_bool=yes + ], + wx_cv_cpp_bool=no, + wx_cv_cpp_bool=no + ) + + AC_LANG_RESTORE + ]) + + if test "$wx_cv_cpp_bool" = "yes"; then + AC_DEFINE(HAVE_BOOL) + fi +]) + +dnl --------------------------------------------------------------------------- +dnl WX_CPP_SIZE_T_IS_NOT_INT checks whether size_t and int are different types, +dnl i.e. whether we may overload operator[] on its argument type +dnl --------------------------------------------------------------------------- + +AC_DEFUN(WX_CPP_SIZE_T_IS_NOT_INT, +[ + AC_CACHE_CHECK([if size_t and int are different types], wx_cv_cpp_sizet_not_int, + [ + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + + AC_TRY_RUN([ + #include + + class S + { + public: + S(char *s) { m_s = s; } + + char operator[](size_t n) const { return m_s[n]; } + char operator[](int n) const { return m_s[n]; } + + private: + char *m_s; + }; + + int main() + { + S s("dummy"); + size_t n1 = 2; + int n2 = 3; + + return s[n1] == s[n2]; + } + ], + AC_DEFINE(wxUSE_SIZE_T_STRING_OPERATOR) wx_cv_cpp_sizet_not_int=yes, + wx_cv_cpp_sizet_not_int=no, + wx_cv_cpp_sizet_not_int=no + ) + + AC_LANG_RESTORE + ]) +]) + +dnl --------------------------------------------------------------------------- +dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling +dnl --------------------------------------------------------------------------- + +AC_DEFUN(WX_C_BIGENDIAN, +[AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian, +[ac_cv_c_bigendian=unknown +# See if sys/param.h defines the BYTE_ORDER macro. +AC_TRY_COMPILE([#include +#include ], [ +#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN + bogus endian macros +#endif], [# It does; now see whether it defined to BIG_ENDIAN or not. +AC_TRY_COMPILE([#include +#include ], [ +#if BYTE_ORDER != BIG_ENDIAN + not big endian +#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)]) +if test $ac_cv_c_bigendian = unknown; then +AC_TRY_RUN([main () { + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long l; + char c[sizeof (long)]; + } u; + u.l = 1; + exit (u.c[sizeof (long) - 1] == 1); +}], ac_cv_c_bigendian=no, ac_cv_c_bigendian=yes, ac_cv_c_bigendian=unknown) +fi]) +if test $ac_cv_c_bigendian = unknown; then + AC_MSG_WARN([Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file]) +fi +if test $ac_cv_c_bigendian = yes; then + AC_DEFINE(WORDS_BIGENDIAN) +fi +]) + +dnl --------------------------------------------------------------------------- +dnl override AC_ARG_ENABLE/WITH to cache the results in .cache file +dnl --------------------------------------------------------------------------- + +AC_DEFUN(WX_ARG_CACHE_INIT, + [ + wx_arg_cache_file="configarg.cache" + echo "loading argument cache $wx_arg_cache_file" + rm -f ${wx_arg_cache_file}.tmp + touch ${wx_arg_cache_file}.tmp + touch ${wx_arg_cache_file} + ]) + +AC_DEFUN(WX_ARG_CACHE_FLUSH, + [ + echo "saving argument cache $wx_arg_cache_file" + mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file} + ]) + +dnl this macro checks for a command line argument and caches the result +dnl usage: WX_ARG_WITH(option, helpmessage, variable-name) +AC_DEFUN(WX_ARG_WITH, + [ + AC_MSG_CHECKING("for --with-$1") + no_cache=0 + AC_ARG_WITH($1, $2, + [ + if test "$withval" = yes; then + ac_cv_use_$1='$3=yes' + else + ac_cv_use_$1='$3=no' + fi + ], + [ + LINE=`grep "$3" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_$1='$3='$DEFAULT_$3 + ]) + + eval "$ac_cv_use_$1" + if test "$no_cache" != 1; then + echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp + fi + + if test "$$3" = yes; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + ]) + +dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH +dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name) +AC_DEFUN(WX_ARG_ENABLE, + [ + AC_MSG_CHECKING("for --enable-$1") + no_cache=0 + AC_ARG_ENABLE($1, $2, + [ + if test "$enableval" = yes; then + ac_cv_use_$1='$3=yes' + else + ac_cv_use_$1='$3=no' + fi + ], + [ + LINE=`grep "$3" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_$1='$3='$DEFAULT_$3 + ]) + + eval "$ac_cv_use_$1" + if test "$no_cache" != 1; then + echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp + fi + + if test "$$3" = yes; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + ]) + +dnl - +dnl - GNU libc extension (added by GL) +dnl - + +AC_DEFUN(WX_GNU_EXTENSIONS, +[ +AC_MSG_CHECKING([if you need GNU extensions]) +AC_CACHE_VAL(wx_cv_gnu_extensions,[ + AC_TRY_COMPILE([#include ],[ + +#ifndef __GNU_LIBRARY__ + Compile error wanted +#endif + +], + [wx_cv_gnu_extensions=yes], + [wx_cv_gnu_extensions=no]) +]) + +AC_MSG_RESULT($wx_cv_gnu_extensions) +if test "$wx_cv_gnu_extensions" = "yes"; then + AC_DEFINE_UNQUOTED(_GNU_SOURCE) +fi +]) + + dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- @@ -39,24 +452,11 @@ WX_BINARY_AGE=0 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER -AM_INIT_AUTOMAKE(wxWindows, $WX_VERSION) - -dnl libtool versioning -LT_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER -LT_CURRENT=`expr $WX_RELEASE_NUMBER - $WX_INTERFACE_AGE` -LT_REVISION=$WX_INTERFACE_AGE -LT_AGE=`expr $WX_BINARY_AGE - $WX_INTERFACE_AGE` -AC_SUBST(LT_RELEASE) -AC_SUBST(LT_CURRENT) -AC_SUBST(LT_REVISION) -AC_SUBST(LT_AGE) - -dnl FIXME this hack suppresses automake 1.4 warning about @LTLIBOBJS@ being -dnl never defined in configure.in (remove these lines to see what I'm -dnl speaking about) - Tom Tromey told me that it will -dnl be fixed in the next release. -LIBOBJS= -LIBOBJS="$LIBOBJS ../common/extended.o" +dnl wxWindows shared library versioning +WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER +WX_CURRENT=`expr $WX_RELEASE_NUMBER - $WX_INTERFACE_AGE` +WX_REVISION=$WX_INTERFACE_AGE +WX_AGE=`expr $WX_BINARY_AGE - $WX_INTERFACE_AGE` dnl ------------------------------------------------------------------------ dnl Check platform (host system) @@ -210,7 +610,6 @@ esac if test "$USE_UNIX" = 1 ; then wxUSE_UNIX=yes AC_DEFINE(__UNIX__) - EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/../unix" SRC_SUBDIRS="$SRC_SUBDIRS unix" INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix" fi @@ -238,7 +637,8 @@ DEBUG_CONFIGURE=0 if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_THREADS=yes - DEFAULT_wxUSE_OPTIMISE=no + DEFAULT_wxUSE_SHARED=yes + DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_RTTI=no DEFAULT_wxUSE_NO_EXCEPTIONS=no @@ -342,6 +742,7 @@ if test $DEBUG_CONFIGURE = 1; then else DEFAULT_wxUSE_THREADS=yes + DEFAULT_wxUSE_SHARED=yes DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_RTTI=no @@ -364,7 +765,7 @@ else DEFAULT_wxUSE_LIBJPEG=yes DEFAULT_wxUSE_ODBC=no - DEFAULT_wxUSE_STD_IOSTREAM=yes + DEFAULT_wxUSE_STD_IOSTREAM=no DEFAULT_wxUSE_FILE=yes DEFAULT_wxUSE_TEXTFILE=yes DEFAULT_wxUSE_TIMEDATE=yes @@ -491,6 +892,7 @@ dnl --------------------------------------------------------------------------- dnl compile options dnl --------------------------------------------------------------------------- +WX_ARG_ENABLE(shared, [ --enable-shared create shared library code], wxUSE_SHARED) WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wxUSE_OPTIMISE) WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG) @@ -874,69 +1276,11 @@ AC_PROG_YACC dnl LEX checks dnl defines LEX with the appropriate command dnl defines LEXLIB with the appropriate library -dnl this AM version (don't use AC_PROG_LEX!) also -dnl defines YYTEXT_POINTER if yytext is char* -dnl defines LEX_OUTPUT_ROOT as to the base of the -dnl filename output by the lexer -AM_PROG_LEX +AC_PROG_LEX dnl needed for making link to setup.h AC_PROG_LN_S -dnl without this (which just means that we use WXDLLEXPORT) libtool won't build -dnl DLLs under Win32. -dnl AC_LIBTOOL_WIN32_DLL - -dnl disable static libs by default, this takes too much time... -dnl libtool doesn't work on anything but Linux and maybe -dnl ***BSD - -case "${host}" in - *-hp-hpux* ) - AM_DISABLE_SHARED - ;; - *-*-linux* ) - AM_DISABLE_STATIC - ;; - *-*-irix5* | *-*-irix6* ) - AM_DISABLE_SHARED - ;; - *-*-solaris2* ) - AM_DISABLE_SHARED - ;; - *-*-sunos4* ) - AM_DISABLE_SHARED - ;; - *-*-freebsd* | *-*-netbsd*) - AM_DISABLE_STATIC - ;; - *-*-osf* ) - AM_DISABLE_SHARED - ;; - *-*-dgux5* ) - AM_DISABLE_SHARED - ;; - *-*-sysv5* ) - AM_DISABLE_SHARED - ;; - *-*-aix* ) - AM_DISABLE_SHARED - ;; - *-*-cygwin32* ) - AM_DISABLE_STATIC - ;; - *-*-mingw32* ) - AM_DISABLE_STATIC - ;; - *-pc-os2_emx ) - AM_DISABLE_SHARED - ;; - *) - AC_MSG_ERROR(unknown system type ${host}.) -esac - -AM_PROG_LIBTOOL - dnl --------------------------------------------------------------------------- dnl Define search path for includes and libraries: all headers and libs will be dnl looked for in all directories of this path @@ -1022,6 +1366,10 @@ dnl ---------------------------------------------------------------- TOOLKIT= TOOLKIT_INCLUDE= +GUIOBJS= +COMMONOBJS= +GENERICOBJS= + GUI_TK_LIBRARY= GUI_TK_LINK= @@ -1030,38 +1378,52 @@ 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" + 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 --- 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" - 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) - if test "$cross_compiling" != "yes" ; then - AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) - fi - fi + 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) + if test "$cross_compiling" != "yes" ; then + AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) + fi + fi - TOOLKIT=MSW + TOOLKIT=MSW + + GUIOBJS=MSW_GUIOBJS + GUIHEADERS=MSW_HEADERS + COMMONOBJS=MSW_COMMONOBJS + GENERICOBJS=MSW_GENERICOBJS + UNIXOBJS= + GUIDIST=MSW_DIST fi if test "$wxUSE_GTK" = 1; then - dnl avoid calling AM_PATH_GTK twice, so check first for the newer version and - dnl only then, if it wasn't found, for an older one - AM_PATH_GTK(1.2.0, WXGTK12=1) - if test "$WXGTK12" != 1; then - AM_PATH_GTK(1.0.0, , AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.X or 1.0.X?)) - fi + dnl avoid calling AM_PATH_GTK twice, so check first for the newer version and + dnl only then, if it wasn't found, for an older one + AM_PATH_GTK(1.2.0, WXGTK12=1) + if test "$WXGTK12" != 1; then + AM_PATH_GTK(1.0.0, , AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.X or 1.0.X?)) + fi - TOOLKIT_INCLUDE="$GTK_CFLAGS" - GUI_TK_LIBRARY="$GTK_LIBS" - TOOLKIT=GTK + TOOLKIT_INCLUDE="$GTK_CFLAGS" + GUI_TK_LIBRARY="$GTK_LIBS -ldl" + TOOLKIT=GTK + + GUIOBJS=GTK_GUIOBJS + GUIHEADERS=GTK_HEADERS + COMMONOBJS=GTK_COMMONOBJS + GENERICOBJS=GTK_GENERICOBJS + UNIXOBJS=UNIXOBJS + GUIDIST=GTK_DIST fi if test "$wxUSE_WINE" = 1; then @@ -1103,7 +1465,13 @@ if test "$wxUSE_WINE" = 1; then GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" WXWINE=1 TOOLKIT=MSW - LTLIBOBJS="$LTLIBOBJS winestub.lo" + + GUIOBJS=MSW_GUIOBJS + GUIHEADERS=MSW_HEADERS + COMMONOBJS=MSW_COMMONOBJS + GENERICOBJS=MSW_GENERICOBJS + UNIXOBJS=UNIXOBJS + GUIDIST=MSW_DIST fi if test "$wxUSE_MOTIF" = 1; then @@ -1169,19 +1537,121 @@ 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 + COMMONOBJS=MOTIF_COMMONOBJS + GENERICOBJS=MOTIF_GENERICOBJS + UNIXOBJS=UNIXOBJS + GUIDIST=MOTIF_DIST fi dnl the name of the directory where the files for this toolkit live TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"` dnl the symbol which allows conditional compilation for the given toolkit -TOOLKIT_DEF=-D__WX${TOOLKIT}__ +TOOLKIT_DEF="-D__WX${TOOLKIT}__" + +dnl the name of the (libtool) library +WX_LIBRARY="wx_${TOOLKIT_DIR}" dnl the name of the (libtool) library WX_LIBRARY_NAME="libwx_${TOOLKIT_DIR}.la" -dnl the name of the library to be linked reported by wx-config -WX_LIBRARY="wx_${TOOLKIT_DIR}" +dnl the name of the static library +WX_LIBRARY_NAME_STATIC="libwx_${TOOLKIT_DIR}.a" + +dnl the name of the shared library +WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" + +dnl the name of the links to the shared library +WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}" +WX_LIBRARY_LINK2="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so" +WX_LIBRARY_LINK3="libwx_${TOOLKIT_DIR}.so" + +dnl shared library settings +SHARED_LD= +PIC_FLAG= +WX_CREATE_LINKS= + +if test "$wxUSE_SHARED" = "yes"; then + dnl set target to shared + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}" + +case "${host}" in + *-hp-hpux* ) + WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl" + SHARED_LD="${CXX} -b -o" + PIC_FLAG="+Z" + ;; + *-*-linux* ) + SHARED_LD="${CC} -shared -o" + PIC_FLAG="-fPIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-irix5* | *-*-irix6* ) + SHARED_LD="${CXX} -shared -o" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-solaris2* ) + SHARED_LD="${CXX} -G -o" + PIC_FLAG="PIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-sunos4* ) + SHARED_LD="${CXX} -shared -o" + PIC_FLAG="-fPIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-freebsd* | *-*-netbsd*) + SHARED_LD="${CXX} -shared -o" + PIC_FLAG="-fPIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-osf* ) + SHARED_LD="${CXX} -shared -o" + PIC_FLAG="-fPIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-dgux5* ) + SHARED_LD="${CXX} -shared -o" + PIC_FLAG="-fPIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-sysv5* ) + SHARED_LD="${CXX} -shared -o" + PIC_FLAG="-fPIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-aix* ) + SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o" + ;; + *-*-cygwin32* ) + dnl only static for now + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + ;; + *-*-mingw32* ) + dnl only static for now + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + ;; + *-pc-os2_emx ) + ;; + *) + AC_MSG_ERROR(unknown system type ${host}.) +esac + +else + dnl set target to static + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" +fi dnl ------------------------------------------------------------------------ dnl Check for headers @@ -1250,6 +1720,9 @@ WX_CPP_BOOL dnl check whether overloading on size_t/int parameter works WX_CPP_SIZE_T_IS_NOT_INT +dnl check whether we should define _GNU_SOURCE +WX_GNU_EXTENSIONS + dnl --------------------------------------------------------------------------- dnl Check for functions dnl --------------------------------------------------------------------------- @@ -1274,6 +1747,32 @@ AC_CHECK_FUNCS(vsnprintf, AC_MSG_WARN(unsafe function sprintf will be used instead of snprintf) ) +dnl check for vsscanf() - on some platforms (Linux, glibc 2.1.1) it's +dnl available in the library but the prototype is missing, so we can't use +dnl AC_CHECK_FUNCS here, do it manually +AC_LANG_SAVE +AC_LANG_CPLUSPLUS + +AC_CACHE_CHECK([for vsscanf], wx_cv_func_vsscanf, +[ + AC_TRY_COMPILE( + [ + #include + #include + ], + [ + va_list ap; + vsscanf("", "", ap); + ], [ + wx_cv_func_vsscanf=yes + AC_DEFINE(HAVE_VSSCANF) + ], [ + wx_cv_func_vsscanf=no + ]) +]) + +AC_LANG_RESTORE + dnl check for vfork() (even if it's the same as fork() in modern Unices) AC_CHECK_FUNCS(vfork) @@ -1292,6 +1791,11 @@ AC_CHECK_FUNCS(nanosleep, AC_DEFINE(HAVE_NANOSLEEP), [ dnl check for uname (POSIX) and gethostname (BSD) AC_CHECK_FUNCS(uname gethostname, break) +dnl check for inet_addr, inet_aton, ... +AC_CHECK_FUNCS(inet_addr) +AC_CHECK_FUNCS(inet_aton) +AC_CHECK_LIB(resolv, inet_aton) + dnl =========================================================================== dnl Now we have all the info we need - use it! dnl =========================================================================== @@ -1341,17 +1845,15 @@ if test "$wxUSE_THREADS" = "yes" ; then ]) ]) ]) -fi -if test -z "$THREADS_OBJ" ; then - wxUSE_THREADS=no - AC_MSG_WARN(No thread support on this system) + if test -z "$THREADS_OBJ" ; then + wxUSE_THREADS=no + AC_MSG_WARN(No thread support on this system) + fi fi dnl do other tests only if we are using threads if test "$wxUSE_THREADS" = "yes" ; then - dnl LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ" - dnl define autoconf macro to check for given function in both pthread and dnl posix4 libraries dnl usage: AC_FUNC_THREAD(FUNCTION_NAME) @@ -1507,21 +2009,13 @@ dnl --------------------------------------------------------------------------- ZLIB_INCLUDE= if test "$wxUSE_ZLIB" = "yes" ; then AC_DEFINE(wxUSE_ZLIB) - EXTRA_VPATH="$EXTRA_VPATH:\${srcdir}/../zlib" - ZLIB_INCLUDE="-I\${srcdir}/../zlib" - LTLIBOBJS="$LTLIBOBJS adler32.lo compress.lo crc32.lo gzio.lo uncompr.lo deflate.lo \ - trees.lo zutil.lo inflate.lo infblock.lo inftrees.lo infcodes.lo \ - infutil.lo inffast.lo" + ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib" fi PNG_INCLUDE= if test "$wxUSE_LIBPNG" = "yes" ; then AC_DEFINE(wxUSE_LIBPNG) - LTLIBOBJS="$LTLIBOBJS png.lo pngset.lo pngget.lo pngrutil.lo pngtrans.lo pngwutil.lo \ - pngread.lo pngrio.lo pngwio.lo pngwrite.lo pngrtran.lo pngwtran.lo \ - pngmem.lo pngerror.lo pngpread.lo" - EXTRA_VPATH="$EXTRA_VPATH:\${srcdir}/../png" - PNG_INCLUDE="-I\${srcdir}/../png" + PNG_INCLUDE="-I\${top_srcdir}/src/png" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" fi @@ -1532,19 +2026,7 @@ fi JPEG_INCLUDE= if test "$wxUSE_LIBJPEG" = "yes" ; then AC_DEFINE(wxUSE_LIBJPEG) - EXTRA_VPATH="$EXTRA_VPATH:\${srcdir}/../jpeg" - JPEG_INCLUDE="-I\${srcdir}/../jpeg" - LTLIBOBJS="$LTLIBOBJS \ - jcomapi.lo jutils.lo jerror.lo jmemmgr.lo jmemnobs.lo \ - jcapimin.lo jcapistd.lo jctrans.lo jcparam.lo jdatadst.lo \ - jcinit.lo jcmaster.lo jcmarker.lo jcmainct.lo jcprepct.lo \ - jccoefct.lo jccolor.lo jcsample.lo jchuff.lo jcphuff.lo \ - jcdctmgr.lo jfdctfst.lo jfdctflt.lo jfdctint.lo \ - jdapimin.lo jdapistd.lo jdtrans.lo jdatasrc.lo \ - jdmaster.lo jdinput.lo jdmarker.lo jdhuff.lo jdphuff.lo \ - jdmainct.lo jdcoefct.lo jdpostct.lo jddctmgr.lo jidctfst.lo \ - jidctflt.lo jidctint.lo jidctred.lo jdsample.lo jdcolor.lo \ - jquant1.lo jquant2.lo jdmerge.lo" + JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" fi if test "$wxUSE_OPENGL" = "yes"; then @@ -1581,13 +2063,6 @@ if test "$wxUSE_GUI" = "yes"; then dnl need the dcs, pens, brushes, ...), this just can't be done now dnl 4. menu stuff: wxMenu, wxMenuBar, wxMenuItem dnl 5. misc stuff: timers, settings, message box - dnl LTLIBOBJS="$LTLIBOBJS \ - dnl main.lo app.lo event.lo wincmn.lo window.lo control.lo framecmn.lo frame.lo dialog.lo panelg.lo \ - dnl button.lo stattext.lo textctrl.lo \ - dnl bitmap.lo brush.lo colour.lo cursor.lo data.lo dc.lo dcbase.lo dcclient.lo \ - dnl dcmemory.lo dcscreen.lo font.lo gdicmn.lo gdiobj.lo icon.lo palette.lo pen.lo region.lo \ - dnl menu.lo \ - dnl settings.lo timer.lo msgdlgg.lo" else AC_DEFINE(wxUSE_NOGUI) fi @@ -1735,9 +2210,6 @@ if test "$wxUSE_JOYSTICK" = 1; then fi fi - -AC_CHECK_FUNCS(vsscanf) - dnl ------------------------------------------------------------------------ dnl DLL support dnl ------------------------------------------------------------------------ @@ -1792,8 +2264,6 @@ dnl ---------------------------------------------------------------- IODBC_C_SRC="" if test "$wxUSE_ODBC" = "yes" ; then AC_DEFINE(wxUSE_ODBC) - EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/../iodbc" - LTLIBOBJS="$LTLIBOBJS catalog.lo connect.lo dlf.lo dlproc.lo execute.lo fetch.lo hdbc.lo henv.lo herr.lo hstmt.lo info.lo itrace.lo misc.lo prepare.lo result.lo" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" fi @@ -1877,7 +2347,7 @@ fi if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then if test "$wxUSE_GTK" = 1; then if test "$WXGTK12" != 1; then - AC_MSG_WARN([Drag and drop is only supported under wxGTK 2.1]) + AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2]) wxUSE_DRAG_AND_DROP=no fi fi @@ -2124,6 +2594,10 @@ dnl all the libraries needed to link wxWindows programs (when the library is not dnl yet installed) LIBS="\${top_builddir}/src/${TOOLKIT_DIR}/${WX_LIBRARY_NAME} $EXTRA_LIBS" +dnl all the libraries needed to link wxWindows programs when using the +dnl makefile system without libtool +LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS" + dnl all -I options we must pass to the compiler INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TOOLKIT_INCLUDE" @@ -2151,12 +2625,6 @@ if test "$wxUSE_GUI" = "yes"; then forty fractal image wxpoem" fi -dnl for convenience, sort the files to build in alphabetical order -dnl -dnl another shell command to do it which might be faster but is less clear: -dnl LTLIBOBJS="`for obj in $LTLIBOBJS; do echo $obj; done | sort | sed 's@^@ @'`" -LTLIBOBJS="`echo $LTLIBOBJS | tr -s ' ' | tr ' ' '\n' | sort | tr '\n' ' '`" - dnl for convenience, sort the samples in alphabetical order dnl dnl FIXME For some mysterious reasons, sometimes the directories are duplicated @@ -2168,11 +2636,20 @@ AC_SUBST(WX_MAJOR_VERSION_NUMBER) AC_SUBST(WX_MINOR_VERSION_NUMBER) AC_SUBST(WX_RELEASE_NUMBER) AC_SUBST(WX_LIBRARY_NAME) +AC_SUBST(WX_LIBRARY_NAME_STATIC) +AC_SUBST(WX_LIBRARY_NAME_SHARED) AC_SUBST(WX_LIBRARY) +AC_SUBST(WX_TARGET_LIBRARY) +AC_SUBST(WX_LIBRARY_LINK1) +AC_SUBST(WX_LIBRARY_LINK2) +AC_SUBST(WX_LIBRARY_LINK3) -dnl suppress libtool's informational messages - they duplicate its command line -LIBTOOL="$LIBTOOL --silent" -AC_SUBST(LIBTOOL) +dnl are we supposed to create the links? +AC_SUBST(WX_CREATE_LINKS) +AC_SUBST(WX_CREATE_INSTALLED_LINKS) + +AC_SUBST(SHARED_LD) +AC_SUBST(PIC_FLAG) dnl debugging options AC_SUBST(WXDEBUG_DEFINE) @@ -2183,9 +2660,13 @@ AC_SUBST(TOOLKIT_DEF) AC_SUBST(TOOLKIT_DIR) AC_SUBST(TOOLKIT_INCLUDE) -dnl additional sources -AC_SUBST(EXTRA_VPATH) -AC_SUBST(LTLIBOBJS) +dnl what to compile +AC_SUBST(GUIOBJS) +AC_SUBST(GUIHEADERS) +AC_SUBST(COMMONOBJS) +AC_SUBST(GENERICOBJS) +AC_SUBST(UNIXOBJS) +AC_SUBST(GUIDIST) dnl additional subdirectories where we will build AC_SUBST(SRC_SUBDIRS) @@ -2198,110 +2679,82 @@ AC_SUBST(USER_SUBDIRS) dnl additional libraries AC_SUBST(EXTRA_LIBS) AC_SUBST(LIBS) - -dnl create the configuration header file from the template -dnl -dnl NB: automake can't work correctly if our header lives in a directory which -dnl is only determined at configure time, so we create it on the top-level -dnl and make a link to allow '#include "wx/setup.h"' to still work -AM_CONFIG_HEADER(setup.h) +AC_SUBST(LD_LIBS) dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE dnl itself (this is macro is required if SUBDIRS variable is used in Makefile.am dnl - and we do use it) AC_PROG_MAKE_SET +AC_CONFIG_HEADER(setup.h:setup.h.in) + + 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 dnl colon) AC_OUTPUT([ wx-config - makefile.unx + src/make.env + src/makeprog.env + src/makelib.env Makefile - src/Makefile - -dnl just for testing, will remove soon (VZ) -dnl src/msw/Makefile -dnl include/Makefile include/wx/Makefile include/wx/generic/Makefile -dnl include/wx/msw/Makefile -dnl samples/Makefile samples/minimal/Makefile - - src/gtk/Makefile - src/motif/Makefile - src/msw/Makefile - include/Makefile - include/wx/Makefile - include/wx/generic/Makefile - include/wx/gtk/Makefile - include/wx/motif/Makefile - include/wx/msw/Makefile - include/wx/msw/gnuwin32/Makefile - include/wx/msw/ctl3d/Makefile - include/wx/protocol/Makefile - include/wx/unix/Makefile - include/wx/html/Makefile - misc/Makefile - misc/afm/Makefile - misc/gs_afm/Makefile samples/Makefile samples/bombs/Makefile samples/caret/Makefile samples/checklst/Makefile samples/config/Makefile samples/controls/Makefile - samples/db/Makefile - samples/dialogs/Makefile - samples/dnd/Makefile - samples/docview/Makefile - samples/docvwmdi/Makefile - samples/drawing/Makefile - samples/dynamic/Makefile - samples/forty/Makefile - samples/fractal/Makefile - samples/grid/Makefile - samples/help/Makefile - samples/image/Makefile - samples/internat/Makefile - samples/layout/Makefile - samples/listctrl/Makefile - samples/mdi/Makefile - samples/memcheck/Makefile - samples/minifram/Makefile - samples/minimal/Makefile - samples/notebook/Makefile - samples/png/Makefile + samples/dialogs/Makefile + samples/docview/Makefile + samples/docvwmdi/Makefile + samples/dnd/Makefile + samples/drawing/Makefile + samples/dynamic/Makefile + samples/image/Makefile + samples/layout/Makefile + samples/listctrl/Makefile + samples/mdi/Makefile + samples/minifram/Makefile + samples/minimal/Makefile + samples/notebook/Makefile samples/printing/Makefile samples/proplist/Makefile - samples/resource/Makefile - samples/sashtest/Makefile - samples/scroll/Makefile - samples/splitter/Makefile - samples/text/Makefile - samples/thread/Makefile - samples/toolbar/Makefile - samples/treectrl/Makefile - samples/typetest/Makefile - samples/validate/Makefile - samples/wxpoem/Makefile - samples/wxsocket/Makefile - samples/html/Makefile - samples/html/about/Makefile - samples/html/help/Makefile - samples/html/test/Makefile - samples/html/printing/Makefile - samples/html/widget/Makefile - samples/html/virtual/Makefile - samples/html/zip/Makefile + samples/sashtest/Makefile + samples/scroll/Makefile + samples/splitter/Makefile + samples/text/Makefile + samples/thread/Makefile + samples/toolbar/Makefile + samples/treectrl/Makefile + samples/typetest/Makefile + samples/validate/Makefile + samples/wxpoem/Makefile + samples/wxsocket/Makefile + samples/html/Makefile + samples/html/about/Makefile + samples/html/help/Makefile + samples/html/printing/Makefile + samples/html/test/Makefile + samples/html/zip/Makefile + samples/html/virtual/Makefile + samples/html/widget/Makefile + utils/Makefile + utils/wxMMedia2/Makefile + utils/wxMMedia2/lib/Makefile + utils/wxMMedia2/sample/Makefile ], [ chmod +x wx-config -dnl The following line is more elegant but test -e is not supported by all -dnl test varieties. -dnl if test ! -e include/wx/${TOOLKIT_DIR}/setup.h; then - cat include/wx/${TOOLKIT_DIR}/setup.h >/dev/null 2>&1 - if test $? != 0; then - ${LN_S} `pwd`/setup.h include/wx/${TOOLKIT_DIR}/setup.h - fi + if test ! -d include; then + mkdir include + fi + if test ! -d include/wx; then + mkdir include/wx + fi + if test ! -d include/wx/${TOOLKIT_DIR}; then + mkdir include/wx/${TOOLKIT_DIR} + fi + cp -f setup.h include/wx/${TOOLKIT_DIR}/setup.h ], [ LN_S="${ac_cv_prog_LN_S}"