more cvs->svn conversion stuff and fix double include of config.h

This commit is contained in:
Bill Currie 2005-10-23 14:11:38 +00:00 committed by Jeff Teunissen
parent 87cc09233c
commit 088ae9d697
4 changed files with 4 additions and 15 deletions

View file

@ -12,7 +12,7 @@ AC_VALIDATE_CACHED_SYSTEM_TUPLE(
dnl This is the only place where the package version appears dnl This is the only place where the package version appears
AM_INIT_AUTOMAKE(quakeforge, 0.5.5-CVS) AM_INIT_AUTOMAKE(quakeforge, 0.5.5-SVN)
dnl Define the proper name and extra version numbers for package dnl Define the proper name and extra version numbers for package
PROGRAM=QuakeForge PROGRAM=QuakeForge
@ -1269,7 +1269,7 @@ dnl ==================================================================
dnl Misc checks dnl Misc checks
dnl ================================================================== dnl ==================================================================
if test -d $srcdir/CVS; then if test -d $srcdir/.svn; then
cvs_def_enabled="!= xno" cvs_def_enabled="!= xno"
cvs_def_disabled="= xyes" cvs_def_disabled="= xyes"
else else
@ -2350,8 +2350,8 @@ AC_MSG_RESULT([
libWildMidi Support : $HAVE_WILDMIDI libWildMidi Support : $HAVE_WILDMIDI
]) ])
if test -d $srcdir/CVS; then if test -d $srcdir/.svn; then
echo "WARNING: Hackers at work, watch for falling bits of code." echo "WARNING: Hackers at work, watch for falling bits of code."
echo "(This is from a development CVS tree. Expect problems)" echo "(This is from a development subversion tree. Expect problems)"
echo echo
fi fi

View file

@ -29,9 +29,6 @@
#ifndef __compat_h #ifndef __compat_h
#define __compat_h #define __compat_h
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_STDARG_H #ifdef HAVE_STDARG_H
# include <stdarg.h> # include <stdarg.h>
#endif #endif

View file

@ -29,10 +29,6 @@
#ifndef __qf_varrays_h #ifndef __qf_varrays_h
#define __qf_varrays_h #define __qf_varrays_h
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_WINDOWS_H #ifdef HAVE_WINDOWS_H
# include <windows.h> # include <windows.h>
#endif #endif

View file

@ -29,10 +29,6 @@
#ifndef _WINQUAKE_H #ifndef _WINQUAKE_H
#define _WINQUAKE_H #define _WINQUAKE_H
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef _WIN32 #ifdef _WIN32
#ifndef __GNUC__ #ifndef __GNUC__