From 84ad232ed0b1dd542ff7e2a33ba70b8357760abd Mon Sep 17 00:00:00 2001
From: Jeff Teunissen <deek@d2dc.net>
Date: Thu, 11 Jan 2001 10:07:19 +0000
Subject: [PATCH] Getting ready for 0.2.99beta6...

---
 configure.in            | 7 ++++++-
 debian/Makefile.am      | 2 ++
 doc/Makefile.am         | 1 +
 doc/man/Makefile.am     | 1 +
 doc/texinfo/Makefile.am | 2 ++
 include/Makefile.am     | 2 ++
 source/Makefile.am      | 4 ++++
 7 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 7a51dff..8ebad06 100644
--- a/configure.in
+++ b/configure.in
@@ -737,6 +737,10 @@ QF_maGiC_VALUE
 	], JOYTYPE="Linux")
 fi
 
+if test -z "$JOYTYPE" -a "x$ac_cv_header_dinput_h" = "xyes"; then
+	JOYTYPE="Win32"
+fi
+
 if test "$JOYTYPE"; then
 	AC_MSG_RESULT([yes ($JOYTYPE)])
 else
@@ -745,7 +749,8 @@ fi
 AC_SUBST(JOY_LIBS)
 AC_SUBST(JOY_CFLAGS)
 AM_CONDITIONAL(JOYTYPE_LINUX, test "$JOYTYPE" = "Linux")
-AM_CONDITIONAL(JOYTYPE_NULL, test "$JOYTYPE" != "Linux")
+AM_CONDITIONAL(JOYTYPE_WIN32, test "$JOYTYPE" = "Win32")
+AM_CONDITIONAL(JOYTYPE_NULL, test "$JOYTYPE" != "Linux" -a "$JOYTYPE" != "Win32")
 
 dnl ==================================================================
 dnl Checks for CD-ROM
diff --git a/debian/Makefile.am b/debian/Makefile.am
index 2b06a72..6ef6f7d 100644
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -1,4 +1,6 @@
 ## Process this file with automake to produce Makefile.in
+AUTOMAKE_OPTIONS=	foreign
+
 EXTRA_DIST=	changelog control copyright rules \
 		quakeforge.conf \
 		qf-client-3dfx.dirs qf-client-3dfx.docs qf-client-3dfx.files \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 81949b4..cac8faf 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,5 @@
 ## Process this file with automake to produce Makefile.in
+AUTOMAKE_OPTIONS=	foreign
 SUBDIRS = man texinfo
 
 EXTRA_DIST = readme.txt template.h
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 1101ab4..afdc7fb 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,4 +1,5 @@
 ## Process this file with automake to produce Makefile.in
+AUTOMAKE_OPTIONS=	foreign
 man_MANS = quakeforge.1
 
 EXTRA_DIST = $(man_MANS)
diff --git a/doc/texinfo/Makefile.am b/doc/texinfo/Makefile.am
index ea498de..8dda93d 100644
--- a/doc/texinfo/Makefile.am
+++ b/doc/texinfo/Makefile.am
@@ -1,4 +1,6 @@
 ## Process this file with automake to produce Makefile.in
+AUTOMAKE_OPTIONS=	foreign
+
 info_TEXINFOS = quakeforge.texinfo
 
 EXTRA_DIST = gpl.texinfo
diff --git a/include/Makefile.am b/include/Makefile.am
index c98ab7b..8b158e8 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,6 @@
 ## Process this file with automake to produce Makefile.in
+AUTOMAKE_OPTIONS=	foreign
+
 EXTRA_DIST = adivtab.h anorm_dots.h anorms.h asm_draw.h asm_i386.h block16.h \
 	block8.h bothdefs.h bspfile.h buildnum.h cdaudio.h checksum.h \
 	cl_cam.h cl_demo.h cl_ents.h cl_input.h cl_main.h cl_parse.h \
diff --git a/source/Makefile.am b/source/Makefile.am
index bd51df3..7cf17e4 100644
--- a/source/Makefile.am
+++ b/source/Makefile.am
@@ -26,6 +26,7 @@
 #
 #	$Id$
 #
+AUTOMAKE_OPTIONS=	foreign
 
 #
 # Stuff that is common to both client and server
@@ -149,6 +150,9 @@ EXTRA_libqfcd_a_SOURCES= cd_dos.c cd_linux.c cd_sdl.c cd_sgi.c cd_win.c cd_null.
 if JOYTYPE_LINUX
 libqfjs_a_SOURCES=	joy_linux.c
 endif
+if JOYTYPE_WIN32
+libqfjs_a_SOURCES=	joy_win.c
+endif
 if JOYTYPE_NULL
 libqfjs_a_SOURCES=	joy_null.c
 endif