Added autoheader support. Also added ./bootstrap to go from a freshly

checked out tree to something ./configure'able.

.gitignore

@@ -4,5 +4,3 @@ configure
 config.cache
 config.log
 config.status
-*~
-*.bak

Makefile.in

@@ -10,11 +10,13 @@ distclean:
 	rm -f config.cache config.log config.status Makefile
 	rm -f common/config.h
 	find . -name \*~ | xargs rm -f
+	find . -name \*.bak | xargs rm -f
 	for dir in $(SUBDIRS); do \
 	$(MAKE) -C $$dir $@ || exit; \
 	done
 
 clean-autoconf mrproper: distclean
+	rm -f common/config.h.in
 	rm -f configure
 
 %:

acconfig.h

@@ -0,0 +1,17 @@
+/* Version string */
+#define        VERSION         FIXME_DEFINE_THIS!
+
+/* Define if you have the XFree86 DGA extension */
+#undef HAS_DGA
+
+/* Define if you have an old Mesa that defines APIENTRY instead
+   of GLAPIENTRY */
+#undef GLAPIENTRY_IS_APIENTRY
+
+#ifdef GLAPIENTRY_IS_APIENTRY
+#  define GLAPIENTRY   APIENTRY
+#endif
+
+/* Define this if you have GL_COLOR_INDEX8_EXT in GL/gl.h */
+#undef HAVE_GL_COLOR_INDEX8_EXT
+

bootstrap

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+autoheader
+autoconf

common/.gitignore

@@ -0,0 +1,2 @@
+config.h.in
+config.h

common/config.h.in

@@ -1,33 +0,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
-#ifndef __CONFIG__CONFIG_H
-#define __CONFIG__CONFIG_H
-
-#define	VERSION		"0.1.0"
-
-#undef GLAPIENTRY_IS_APIENTRY
-
-#undef HAS_DGA
-
-#ifdef GLAPIENTRY_IS_APIENTRY
-#  define GLAPIENTRY	APIENTRY
-#endif
-#endif // __CONFIG__CONFIG_H

configure.in

@@ -1,6 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(common/crc.h)
-AC_CONFIG_HEADER(common/config.h)
+
+# Version of this release
+QF_VERSION="0.1.0"
+
 AC_CANONICAL_SYSTEM
 AC_LANG_C
 
@@ -22,13 +25,8 @@ dnl Checks for X11 support
 AC_PATH_XTRA
 if test "x$no_x" = x; then
    HAS_X11=yes
-   if test "x$x_libraries" != x; then
-      X_LIB_PATH_L=-L${x_libraries};
-   else
-      X_LIB_PATH_L=
-   fi
    AC_CHECK_LIB(Xext, XShmQueryExtension, [X11_SHM_LIB=-lXext],
-     [X11_SHM_LIB=""], ${X_LIB_PATH_L})
+     [X11_SHM_LIB=""], [ $X_LIBS $X_EXTRA_LIBS ])
 fi
 
 dnl Check for DGA support
@@ -118,8 +116,8 @@ if test "x$HAS_OGL" != xno; then
       AC_MSG_CHECKING(for GL_COLOR_INDEX8_EXT in GL/gl.h)
       AC_TRY_COMPILE([#include "GL/gl.h"],
         [ int x = (int) GL_COLOR_INDEX8_EXT;],
-        HAS_INDEX8=1 AC_MSG_RESULT(yes),
+        AC_DEFINE(HAVE_GL_COLOR_INDEX8_EXT,1) AC_MSG_RESULT(yes),
-        HAS_INDEX8=0 AC_MSG_RESULT(no))
+        AC_MSG_RESULT(no))
 
       AC_MSG_CHECKING(for GLAPIENTRY in GL/gl.h)
       AC_TRY_COMPILE([#include "GL/gl.h"],
@@ -231,7 +229,6 @@ if test "x$HAS_TDFXGL" != xno; then
    fi
 fi
 if test "x$HAS_TDFXGL" = xyes; then
-   AC_DEFINE(HAS_TDFXGL,1)
    TDFXGL_CFLAGS="$GLIDE_CFLAGS"
    TDFXGL_LIBS="$TDFXGL_LIBS $GLIDE_LIBS -l$TDFXGL_NAME"
 else
@@ -411,12 +408,13 @@ AC_SUBST(X11_VID_SRC)
 dnl Check for system services
 AC_EXEEXT
 AC_OBJEXT
-AC_PATH_XTRA
 
 ##########################################################
 #
 # Output files
 #
+
+AC_DEFINE_UNQUOTED(VERSION,"$QF_VERSION")
 AC_CONFIG_HEADER(common/config.h)
 AC_OUTPUT(qw_client/Makefile qw_server/Makefile uquake/Makefile Makefile)
 

qw_client/.gitignore

@@ -1,3 +1 @@
 Makefile
-*~
-*.bak

qw_server/.gitignore

@@ -1,3 +1 @@
 Makefile
-*~
-*.bak

uquake/.gitignore

@@ -1,3 +1 @@
 Makefile
-*~
-*.bak