Commit cb11bd95 authored by Eli Zaretskii's avatar Eli Zaretskii

Finished with config.nt diffs. Problem with mmsystem.h remains.

parent da6c9624
......@@ -1080,6 +1080,7 @@ case $opsys in
;;
mingw32 )
LIB_MATH=
SYSTEM_TYPE=windows-nt
;;
dnl NB this may be adjusted below.
netbsd | openbsd )
......@@ -1156,11 +1157,9 @@ AC_DEFUN([PKG_CHECK_MODULES], [
fi
])
test "$opsys" = "mingw32" && with_sound=no
if test "${with_sound}" != "no"; then
# Sound support for GNU/Linux and the free BSDs.
AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h,
# Sound support for GNU/Linux, the free BSDs, and MinGW.
AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h mmsystem.h,
have_sound_header=yes)
# Emulation library used on NetBSD.
AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
......@@ -1204,6 +1203,9 @@ if test "${with_sound}" != "no"; then
gnu-linux|freebsd|netbsd)
AC_DEFINE(HAVE_SOUND, 1, [Define to 1 if you have sound support.])
;;
mingw32)
AC_DEFINE(HAVE_SOUND, 1, [Define to 1 if you have sound support.])
;;
esac
fi
......@@ -2150,6 +2152,8 @@ if test "${with_gnutls}" = "yes" ; then
AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
fi
OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS
CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
LIBS="$LIBGNUTLS_LIBS $LIBS"
AC_CHECK_FUNCS(gnutls_certificate_set_verify_function, HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=yes)
......@@ -2160,6 +2164,8 @@ if test "${with_gnutls}" = "yes" ; then
# Windows loads GnuTLS dynamically
if test "${opsys}" = "mingw32"; then
CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS
LIBGNUTLS_LIBS=
fi
fi
......@@ -3423,8 +3429,11 @@ dnl AC_DEFINE(HAVE_TCATTR, 1, [Define to 1 if you have tcgetattr and tcsetatt
dnl fi
dnl Turned on June 1996 supposing nobody will mind it.
AC_DEFINE(AMPERSAND_FULL_NAME, 1, [Define to use the convention that &
in the full name stands for the login id.])
dnl MinGW emulates passwd database, so this feature doesn't make sense there.
if test "${opsys}" != "mingw32"; then
AC_DEFINE(AMPERSAND_FULL_NAME, 1, [Define to use the convention that &
in the full name stands for the login id.])
fi
dnl Every platform that uses configure supports this.
dnl There is a create-lockfiles option you can
......@@ -4155,6 +4164,12 @@ AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${emacs_config_options}",
AH_TEMPLATE(config_opsysfile, [Some platforms that do not use configure
define this to include extra configuration information.])
case $opsys in
mingw32)
AC_DEFINE(config_opsysfile, <ms-w32.h>, [])
;;
esac
XMENU_OBJ=
XOBJ=
FONT_OBJ=
......
......@@ -67,7 +67,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8))
#define HAVE___BUILTIN_UNWIND_INIT 1
# ifndef HAVE___BUILTIN_UNWIND_INIT
# define HAVE___BUILTIN_UNWIND_INIT 1
# endif
#endif
/* This isn't perfect, as some systems might have the page file in
......@@ -152,8 +154,12 @@ extern char *getenv ();
#endif
#ifdef HAVE_NTGUI
#define HAVE_WINDOW_SYSTEM 1
#define HAVE_MENUS 1
# ifndef HAVE_WINDOW_SYSTEM
# define HAVE_WINDOW_SYSTEM 1
# endif
# ifndef HAVE_MENUS
# define HAVE_MENUS 1
# endif
#endif
/* Get some redefinitions in place. */
......@@ -449,10 +455,14 @@ extern void * memrchr (void const *, int, size_t);
#if defined (__MINGW32__)
/* Define to 1 if the system has the type `long long int'. */
# define HAVE_LONG_LONG_INT 1
# ifndef HAVE_LONG_LONG_INT
# define HAVE_LONG_LONG_INT 1
# endif
/* Define to 1 if the system has the type `unsigned long long int'. */
# define HAVE_UNSIGNED_LONG_LONG_INT 1
# ifndef HAVE_UNSIGNED_LONG_LONG_INT
# define HAVE_UNSIGNED_LONG_LONG_INT 1
# endif
#endif
......
......@@ -16,8 +16,8 @@ ac_cv_func_shutdown=yes
ac_cv_func_setitimer=yes
# Implemented as sys_sendto in w32.c
ac_cv_func_sendto=yes
# Implemented as sys_recfrom in w32.c
ac_cv_func_recfrom=yes
# Implemented as sys_recvfrom in w32.c
ac_cv_func_recvfrom=yes
# Implemented as sys_getsockname in w32.c
ac_cv_func_getsockname=yes
# Implemented as sys_getpeername in w32.c
......@@ -45,6 +45,9 @@ ac_cv_func_fsync=yes
ac_cv_func_fdatasync=yes
# Implemented in w32proc.c
ac_cv_func_pthread_sigmask=yes
# Avoid gnulib replacement
gl_cv_func_pthread_sigmask_return_works=yes
gl_cv_func_pthread_sigmask_unblock_works="not relevant"
# Implemented in w32proc.c
emacs_cv_langinfo_codeset=yes
# Declared in ms-w32.h
......@@ -62,3 +65,4 @@ gt_cv_func_unsetenv_ret='int'
gl_cv_func_unsetenv_works=yes
gl_cv_func_stat_dir_slash=yes
gl_cv_func_stat_file_slash=yes
ac_cv_func_random=yes
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment