Configure changes needed for wxGTK/win32.
In configure moved WX_ARG_FEATURE(regkey outside of if. Have configure under windows skip linking to X11. Have configure check for "USE_WIN32" instead of for "wxUSE_MSW". wxUSE_FSWATCHER wxUSE_SNGLINST_CHECKER wxUSE_SOCKETS wxUSE_DIB
This commit is contained in:
Tim S
parent
cb67b07629
commit
a44d4f9833
25
configure
vendored
25
configure
vendored
@ -7913,6 +7913,8 @@ fi
|
||||
|
||||
eval "$wx_cv_use_iniconf"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=$wxUSE_ALL_FEATURES
|
||||
@ -7942,7 +7944,6 @@ fi
|
||||
|
||||
eval "$wx_cv_use_regkey"
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
@ -22106,7 +22107,9 @@ rm -f core conftest.err conftest.$ac_objext \
|
||||
if test -z "$wx_cv_lib_gtk"; then
|
||||
wx_cv_lib_gtk=none
|
||||
else
|
||||
GTK_LIBS="$GTK_LIBS -lX11"
|
||||
if test "$USE_WIN32" != 1 ; then
|
||||
GTK_LIBS="$GTK_LIBS -lX11"
|
||||
fi
|
||||
|
||||
wx_cv_cflags_gtk=$GTK_CFLAGS
|
||||
wx_cv_libs_gtk=$GTK_LIBS
|
||||
@ -28749,7 +28752,7 @@ else
|
||||
$as_echo "$as_me: WARNING: wxGetDiskSpace() function won't work without statfs()" >&2;}
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
|
||||
if test "$wxUSE_SNGLINST_CHECKER" = "yes" -a "$USE_WIN32" != 1 ; then
|
||||
for ac_func in fcntl flock
|
||||
do :
|
||||
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||
@ -31289,7 +31292,7 @@ fi
|
||||
|
||||
|
||||
if test "$wxUSE_FSWATCHER" = "yes"; then
|
||||
if test "$wxUSE_MSW" != "1"; then
|
||||
if test "$USE_WIN32" != 1; then
|
||||
if test "$wxUSE_UNIX" = "yes"; then
|
||||
for ac_header in sys/inotify.h
|
||||
do :
|
||||
@ -32983,7 +32986,7 @@ done
|
||||
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
if test "$USE_WIN32" != 1 ; then
|
||||
ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
|
||||
if test "x$ac_cv_func_socket" = xyes; then :
|
||||
|
||||
@ -33046,7 +33049,7 @@ fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes" ; then
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
if test "$USE_WIN32" != 1 ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what is the type of the third argument of getsockname" >&5
|
||||
$as_echo_n "checking what is the type of the third argument of getsockname... " >&6; }
|
||||
if ${wx_cv_type_getsockname3+:} false; then :
|
||||
@ -34771,11 +34774,6 @@ if test "$wxUSE_MSW" = 1 ; then
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DIB" = "yes"; then
|
||||
$as_echo "#define wxUSE_WXDIB 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
|
||||
$as_echo "#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1" >>confdefs.h
|
||||
|
||||
@ -34854,6 +34852,11 @@ $as_echo "$as_me: WARNING: Debug help API and wxStackWalker won't be available"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DIB" = "yes"; then
|
||||
$as_echo "#define wxUSE_WXDIB 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_INICONF" = "yes"; then
|
||||
$as_echo "#define wxUSE_INICONF 1" >>confdefs.h
|
||||
|
||||
|
||||
33
configure.in
33
configure.in
@ -749,9 +749,10 @@ WX_ARG_FEATURE(threads, [ --enable-threads use threads], wxUSE_THREA
|
||||
if test "$wxUSE_MSW" = 1 ; then
|
||||
WX_ARG_DISABLE(dbghelp, [ --enable-dbghelp use dbghelp.dll API (Win32 only)], wxUSE_DBGHELP)
|
||||
WX_ARG_ENABLE(iniconf, [ --enable-iniconf use wxIniConfig (Win32 only)], wxUSE_INICONF)
|
||||
WX_ARG_FEATURE(regkey, [ --enable-regkey use wxRegKey class (Win32 only)], wxUSE_REGKEY)
|
||||
fi
|
||||
|
||||
WX_ARG_FEATURE(regkey, [ --enable-regkey use wxRegKey class (Win32 only)], wxUSE_REGKEY)
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@ -2782,8 +2783,10 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
dnl looks better in AC_MSG_RESULT
|
||||
wx_cv_lib_gtk=none
|
||||
else
|
||||
dnl we use symbols from X11 directly so we should link with it
|
||||
GTK_LIBS="$GTK_LIBS -lX11"
|
||||
if test "$USE_WIN32" != 1 ; then
|
||||
dnl we use symbols from X11 directly so we should link with it
|
||||
GTK_LIBS="$GTK_LIBS -lX11"
|
||||
fi
|
||||
|
||||
dnl we need to cache GTK_CFLAGS and GTK_LIBS for the
|
||||
dnl subsequent runs
|
||||
@ -4343,7 +4346,7 @@ fi
|
||||
|
||||
dnl check for fcntl() or at least flock() needed by Unix implementation of
|
||||
dnl wxSingleInstanceChecker
|
||||
if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
|
||||
if test "$wxUSE_SNGLINST_CHECKER" = "yes" -a "$USE_WIN32" != 1 ; then
|
||||
AC_CHECK_FUNCS(fcntl flock, break)
|
||||
|
||||
if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
|
||||
@ -5291,10 +5294,10 @@ dnl File system watcher checks
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
if test "$wxUSE_FSWATCHER" = "yes"; then
|
||||
dnl wxFileSystemWatcher is always available under MSW but we need either
|
||||
dnl wxFileSystemWatcher is always available under Windows but we need either
|
||||
dnl inotify or kqueue support in the system for it under Unix (this
|
||||
dnl includes OS X which does have kqueue but no other platforms)
|
||||
if test "$wxUSE_MSW" != "1"; then
|
||||
if test "$USE_WIN32" != 1; then
|
||||
if test "$wxUSE_UNIX" = "yes"; then
|
||||
AC_CHECK_HEADERS(sys/inotify.h,,, [AC_INCLUDES_DEFAULT()])
|
||||
if test "$ac_cv_header_sys_inotify_h" = "yes"; then
|
||||
@ -5927,8 +5930,8 @@ dnl wxSocket
|
||||
dnl ------------------------------------------------------------------------
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
dnl under MSW we always have sockets
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
dnl under Windows we always have sockets
|
||||
if test "$USE_WIN32" != 1 ; then
|
||||
dnl under Solaris and OS/2, socket functions live in -lsocket
|
||||
AC_CHECK_FUNC(socket,,
|
||||
[
|
||||
@ -5947,10 +5950,8 @@ if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes" ; then
|
||||
dnl this test may be appropriate if building under cygwin
|
||||
dnl right now I'm assuming it also uses the winsock stuff
|
||||
dnl like mingw does.. -- RL
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
dnl under Windows we always have sockets
|
||||
if test "$USE_WIN32" != 1 ; then
|
||||
dnl determine the type of third argument for getsockname
|
||||
dnl This test needs to be done in C++ mode since gsocket.cpp now
|
||||
dnl is C++ code and pointer cast that are possible even without
|
||||
@ -7211,10 +7212,6 @@ if test "$wxUSE_MSW" = 1 ; then
|
||||
AC_DEFINE(wxUSE_DC_CACHEING)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DIB" = "yes"; then
|
||||
AC_DEFINE(wxUSE_WXDIB)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
|
||||
AC_DEFINE(wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
|
||||
fi
|
||||
@ -7263,6 +7260,10 @@ if test "$USE_WIN32" = 1 ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DIB" = "yes"; then
|
||||
AC_DEFINE(wxUSE_WXDIB)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_INICONF" = "yes"; then
|
||||
AC_DEFINE(wxUSE_INICONF)
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user