From 5c0255d90bf07b0fc59a7fe74f35f4b704ebbab4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 8 Oct 2012 06:17:36 -0400 Subject: [PATCH] Auto-commit of generated files. --- autogen/Makefile.in | 2 + autogen/config.in | 3 + autogen/configure | 160 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 160 insertions(+), 5 deletions(-) diff --git a/autogen/Makefile.in b/autogen/Makefile.in index 14cb3c9c9c..db60a006a2 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in @@ -753,6 +753,8 @@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ VERSION = @VERSION@ VMLIMIT_OBJ = @VMLIMIT_OBJ@ +W32_LIBS = @W32_LIBS@ +W32_OBJ = @W32_OBJ@ WARN_CFLAGS = @WARN_CFLAGS@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WERROR_CFLAGS = @WERROR_CFLAGS@ diff --git a/autogen/config.in b/autogen/config.in index 8a8799db1c..7aaf6650fa 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -692,6 +692,9 @@ along with GNU Emacs. If not, see . */ Mac OS X. */ #undef HAVE_NS +/* Define to use native Windows GUI. */ +#undef HAVE_NTGUI + /* Define to 1 if libotf has OTF_get_variation_glyphs. */ #undef HAVE_OTF_GET_VARIATION_GLYPHS diff --git a/autogen/configure b/autogen/configure index 623d93bb39..163bbaf871 100755 --- a/autogen/configure +++ b/autogen/configure @@ -1204,6 +1204,8 @@ LIB_PTHREAD VMLIMIT_OBJ GMALLOC_OBJ HAVE_XSERVER +W32_LIBS +W32_OBJ LIB_STANDARD NS_OBJC_OBJ NS_OBJ @@ -1362,6 +1364,7 @@ with_toolkit_scroll_bars with_xaw3d with_xim with_ns +with_w32 with_gpm with_dbus with_gconf @@ -2081,6 +2084,7 @@ Optional Packages: --without-xaw3d don't use Xaw3d --without-xim don't use X11 XIM --with-ns use NeXTstep (Cocoa or GNUstep) windowing system + --with-w32 use native Windows GUI --without-gpm don't use -lgpm for mouse support on a GNU/Linux console --without-dbus don't compile with D-Bus support @@ -4093,6 +4097,14 @@ else fi +# Check whether --with-w32 was given. +if test "${with_w32+set}" = set; then : + withval=$with_w32; +else + with_w32=no +fi + + # Check whether --with-gpm was given. if test "${with_gpm+set}" = set; then : @@ -9568,6 +9580,7 @@ $as_echo "#define NS_HAVE_NSINTEGER 1" >>confdefs.h fi + INSTALL_ARCH_INDEP_EXTRA=install-etc ns_self_contained=no NS_OBJ= @@ -9603,6 +9616,38 @@ CPPFLAGS="$tmp_CPPFLAGS" +HAVE_W32=no +W32_OBJ= +W32_LIBS= +if test "${with_w32}" != no; then + if test "${opsys}" != "cygwin"; then + as_fn_error "Using w32 with an autotools build is only supported for Cygwin." "$LINENO" 5 + fi + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" +if test "x$ac_cv_header_windows_h" = x""yes; then : + HAVE_W32=yes +else + as_fn_error "\`--with-w32' was specified, but windows.h + cannot be found." "$LINENO" 5 +fi + + + +$as_echo "#define HAVE_NTGUI 1" >>confdefs.h + + W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o" + W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o" + W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" + W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" +fi + + + +if test "${HAVE_W32}" = "yes"; then + window_system=w32 + with_xft=no +fi + ## $window_system is now set to the window system we will ## ultimately use. @@ -9635,6 +9680,9 @@ case "${window_system}" in nextstep ) term_header=nsterm.h ;; + w32 ) + term_header=w32term.h + ;; esac if test -n "${term_header}"; then @@ -11700,6 +11748,10 @@ if test "${with_toolkit_scroll_bars}" != "no"; then elif test "${HAVE_NS}" = "yes"; then $as_echo "#define USE_TOOLKIT_SCROLL_BARS 1" >>confdefs.h + USE_TOOLKIT_SCROLL_BARS=yes + elif test "${HAVE_W32}" = "yes"; then + $as_echo "#define USE_TOOLKIT_SCROLL_BARS 1" >>confdefs.h + USE_TOOLKIT_SCROLL_BARS=yes fi fi @@ -12262,6 +12314,99 @@ fi ### Use -lXpm if available, unless `--with-xpm=no'. HAVE_XPM=no LIBXPM= + +if test "${HAVE_W32}" = "yes"; then + if test "${with_xpm}" != "no"; then + SAVE_CPPFLAGS="$CPPFLAGS" + SAVE_LDFLAGS="$LDFLAGS" + CPPFLAGS="$CPPFLAGS -I/usr/include/noX" + LDFLAGS="$LDFLAGS -L/usr/lib/noX" + ac_fn_c_check_header_mongrel "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_xpm_h" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmReadFileToImage in -lXpm" >&5 +$as_echo_n "checking for XpmReadFileToImage in -lXpm... " >&6; } +if test "${ac_cv_lib_Xpm_XpmReadFileToImage+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXpm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XpmReadFileToImage (); +int +main () +{ +return XpmReadFileToImage (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xpm_XpmReadFileToImage=yes +else + ac_cv_lib_Xpm_XpmReadFileToImage=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmReadFileToImage" >&5 +$as_echo "$ac_cv_lib_Xpm_XpmReadFileToImage" >&6; } +if test "x$ac_cv_lib_Xpm_XpmReadFileToImage" = x""yes; then : + HAVE_XPM=yes +fi + +fi + + + if test "${HAVE_XPM}" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmReturnAllocPixels preprocessor define" >&5 +$as_echo_n "checking for XpmReturnAllocPixels preprocessor define... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include "X11/xpm.h" +#ifndef XpmReturnAllocPixels +no_return_alloc_pixels +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "no_return_alloc_pixels" >/dev/null 2>&1; then : + HAVE_XPM=no +else + HAVE_XPM=yes +fi +rm -f conftest* + + + if test "${HAVE_XPM}" = "yes"; then + REAL_CPPFLAGS="$REAL_CPPFLAGS -I/usr/include/noX" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + CPPFLAGS="$SAVE_CPPFLAGS" + LDFLAGS="$SAVE_LDFLAGS" + fi + fi + fi + + if test "${HAVE_XPM}" = "yes"; then + +$as_echo "#define HAVE_XPM 1" >>confdefs.h + + LIBXPM=-lXpm + fi +fi + if test "${HAVE_X11}" = "yes"; then if test "${with_xpm}" != "no"; then ac_fn_c_check_header_mongrel "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default" @@ -12348,10 +12493,11 @@ $as_echo "#define HAVE_XPM 1" >>confdefs.h fi + ### Use -ljpeg if available, unless `--with-jpeg=no'. HAVE_JPEG=no LIBJPEG= -if test "${HAVE_X11}" = "yes"; then +if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_jpeg}" != "no"; then ac_fn_c_check_header_mongrel "$LINENO" "jerror.h" "ac_cv_header_jerror_h" "$ac_includes_default" if test "x$ac_cv_header_jerror_h" = x""yes; then : @@ -12430,7 +12576,7 @@ fi ### Use -lpng if available, unless `--with-png=no'. HAVE_PNG=no LIBPNG= -if test "${HAVE_X11}" = "yes"; then +if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_png}" != "no"; then # Debian unstable as of July 2003 has multiple libpngs, and puts png.h # in /usr/include/libpng. @@ -12520,7 +12666,7 @@ fi ### Use -ltiff if available, unless `--with-tiff=no'. HAVE_TIFF=no LIBTIFF= -if test "${HAVE_X11}" = "yes"; then +if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_tiff}" != "no"; then ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" if test "x$ac_cv_header_tiffio_h" = x""yes; then : @@ -12584,7 +12730,8 @@ fi ### Use -lgif or -lungif if available, unless `--with-gif=no'. HAVE_GIF=no LIBGIF= -if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then +if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \ + || test "${HAVE_W32}" = "yes"; then ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default" if test "x$ac_cv_header_gif_lib_h" = x""yes; then : # EGifPutExtensionLast only exists from version libungif-4.1.0b1. @@ -12805,6 +12952,9 @@ $as_echo "#define NS_IMPL_GNUSTEP 1" >>confdefs.h OTHER_FILES=ns-app fi +if test "${HAVE_W32}" = "yes"; then + HAVE_MENUS=yes +fi ### Use session management (-lSM -lICE) if available HAVE_X_SM=no @@ -16078,7 +16228,7 @@ fi if test "$opsys" = "cygwin"; then - CYGWIN_OBJ="sheap.o" + CYGWIN_OBJ="sheap.o cygw32.o" ## Cygwin differs because of its unexec(). PRE_ALLOC_OBJ= POST_ALLOC_OBJ=lastfile.o -- 2.20.1