qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-21 20:11:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[build] Update for autoconf 2.71

Browse source 
Only because I didn't appreciate the warnings about things being
obsolete.
This commit is contained in:
Bill Currie 2021-11-20 12:13:46 +09:00
parent 88b3965794
commit ba8da88f56
20 changed files with 167 additions and 319 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
INSTALL
View file

@ -20,7 +20,7 @@ necessary packages installed.
\section req-pack Required Packages \section req-pack Required Packages
The following packages are required to build QuakeForge: The following packages are required to build QuakeForge:
\li GNU autoconf 2.50 or later \li GNU autoconf 2.71 or later
\li GNU automake 1.6 or later \li GNU automake 1.6 or later
\li GNU libtool 1.4 or later \li GNU libtool 1.4 or later
\li GNU bison 2.6 or later \li GNU bison 2.6 or later

6
bootstrap
View file

@ -71,11 +71,11 @@ if test -n "$ac" ; then
AC_VER_MINOR=`echo $AC_VER | cut -f2 -d'.' | sed 's/[^0-9]*$//'` AC_VER_MINOR=`echo $AC_VER | cut -f2 -d'.' | sed 's/[^0-9]*$//'`
if test "$AC_VER_MAJOR" -lt "2" ; then if test "$AC_VER_MAJOR" -lt "2" ; then
errors="Autoconf 2.61 or greater needed to build configure.\n$errors" errors="Autoconf 2.71 or greater needed to build configure.\n$errors"
fi fi
if test "$AC_VER_MAJOR" -eq "2" -a "$AC_VER_MINOR" -lt "61" ; then if test "$AC_VER_MAJOR" -eq "2" -a "$AC_VER_MINOR" -lt "71" ; then
errors="Autoconf 2.61 or greater needed to build configure.\n$errors" errors="Autoconf 2.71 or greater needed to build configure.\n$errors"
fi fi
fi fi
else else

12
config.d/asm.m4
View file

@ -17,10 +17,8 @@ esac
AM_CONDITIONAL(ASM_ARCH, test "x$ASM_ARCH" = "xyes") AM_CONDITIONAL(ASM_ARCH, test "x$ASM_ARCH" = "xyes")
AC_MSG_CHECKING(for underscore prefix in names) AC_MSG_CHECKING(for underscore prefix in names)
AC_TRY_LINK( AC_LINK_IFELSE(
[asm(".long _bar"); [AC_LANG_PROGRAM([[asm(".long _bar"); int bar;]], [[]])],
int bar;], [AC_DEFINE(HAVE_SYM_PREFIX_UNDERSCORE, 1, Define this if C symbols are prefixed with an underscore) AC_MSG_RESULT(yes)],
[], [AC_MSG_RESULT(no)
AC_DEFINE(HAVE_SYM_PREFIX_UNDERSCORE, 1, [Define this if C symbols are prefixed with an underscore]) AC_MSG_RESULT(yes), ])
AC_MSG_RESULT(no)
)

37
config.d/compiling.m4
View file

@ -16,15 +16,16 @@ AC_MSG_RESULT([$leave_cflags_alone])
AC_MSG_CHECKING(for C99 inline) AC_MSG_CHECKING(for C99 inline)
c99_inline=no c99_inline=no
AC_TRY_LINK( AC_LINK_IFELSE(
[inline int foo (int x) { return x * x; } [AC_LANG_PROGRAM(
int (*bar) (int) = foo;], [[inline int foo (int x) { return x * x; }
[], int (*bar) (int) = foo;]],
c99_inline=no [[]])],
AC_MSG_RESULT(no), [c99_inline=no
c99_inline=yes AC_MSG_RESULT(no)],
AC_DEFINE(HAVE_C99INLINE, extern, [define this if using c99 inline]) [c99_inline=yes
AC_MSG_RESULT(yes) AC_DEFINE(HAVE_C99INLINE, extern, define this if using c99 inline)
AC_MSG_RESULT(yes)]
) )
AH_VERBATIM([HAVE_C99INLINE], AH_VERBATIM([HAVE_C99INLINE],
[#undef HAVE_C99INLINE [#undef HAVE_C99INLINE
@ -169,25 +170,17 @@ if test "x$optimize" = xyes -a "x$leave_cflags_alone" != "xyes"; then
else else
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $MORE_CFLAGS" CFLAGS="$CFLAGS $MORE_CFLAGS"
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[AC_MSG_RESULT(yes)],[CFLAGS="$save_CFLAGS"
[],
[],
AC_MSG_RESULT(yes),
CFLAGS="$save_CFLAGS"
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
) ])
fi fi
if test $CC_MAJ = 2 -a $CC_MIN = 96; then if test $CC_MAJ = 2 -a $CC_MIN = 96; then
AC_MSG_CHECKING(if align options work) AC_MSG_CHECKING(if align options work)
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2" CFLAGS="$CFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2"
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[light="$light -malign-loops=2 -malign-jumps=2 -malign-functions=2"
[], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[], ])
light="$light -malign-loops=2 -malign-jumps=2 -malign-functions=2"
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
CFLAGS="$CFLAGS $light" CFLAGS="$CFLAGS $light"
else else

30
config.d/fbdev.m4
View file

@ -10,27 +10,15 @@ fi
if test "x$HAVE_FBDEV" = xyes; then if test "x$HAVE_FBDEV" = xyes; then
AC_MSG_CHECKING(for FB_AUX_VGA_PLANES_VGA4) AC_MSG_CHECKING(for FB_AUX_VGA_PLANES_VGA4)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "linux/fb.h"]], [[int foo = FB_AUX_VGA_PLANES_VGA4;]])],[AC_DEFINE(HAVE_FB_AUX_VGA_PLANES_VGA4, 1, Define this if you have FB_AUX_VGA_PLANES_VGA4)
[#include "linux/fb.h"], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[int foo = FB_AUX_VGA_PLANES_VGA4;], ])
AC_DEFINE(HAVE_FB_AUX_VGA_PLANES_VGA4, 1, [Define this if you have FB_AUX_VGA_PLANES_VGA4])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
AC_MSG_CHECKING(for FB_AUX_VGA_PLANES_CFB4) AC_MSG_CHECKING(for FB_AUX_VGA_PLANES_CFB4)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "linux/fb.h"]], [[int foo = FB_AUX_VGA_PLANES_CFB4;]])],[AC_DEFINE(HAVE_FB_AUX_VGA_PLANES_CFB4, 1, Define this if you have FB_AUX_VGA_PLANES_CFB4)
[#include "linux/fb.h"], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[int foo = FB_AUX_VGA_PLANES_CFB4;], ])
AC_DEFINE(HAVE_FB_AUX_VGA_PLANES_CFB4, 1, [Define this if you have FB_AUX_VGA_PLANES_CFB4])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
AC_MSG_CHECKING(for FB_AUX_VGA_PLANES_CFB8) AC_MSG_CHECKING(for FB_AUX_VGA_PLANES_CFB8)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "linux/fb.h"]], [[int foo = FB_AUX_VGA_PLANES_CFB8;]])],[AC_DEFINE(HAVE_FB_AUX_VGA_PLANES_CFB8, 1, Define this if you have FB_AUX_VGA_PLANES_CFB4)
[#include "linux/fb.h"], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[int foo = FB_AUX_VGA_PLANES_CFB8;], ])
AC_DEFINE(HAVE_FB_AUX_VGA_PLANES_CFB8, 1, [Define this if you have FB_AUX_VGA_PLANES_CFB4])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
fi fi

41
config.d/header_files.m4
View file

@ -3,7 +3,6 @@ dnl Checks for header files.
dnl ================================================================== dnl ==================================================================
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_MAJOR AC_HEADER_MAJOR
AC_HEADER_SYS_WAIT AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS( AC_CHECK_HEADERS(
@ -33,37 +32,21 @@ fi
AC_FUNC_ALLOCA AC_FUNC_ALLOCA
AC_MSG_CHECKING(for fnmatch in fnmatch.h) AC_MSG_CHECKING(for fnmatch in fnmatch.h)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "fnmatch.h"]], [[int (*foo)() = fnmatch;]])],[AC_DEFINE(HAVE_FNMATCH_PROTO, 1, Define this if fnmatch is prototyped in fnmatch.h)
[#include "fnmatch.h"], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[int (*foo)() = fnmatch;], ])
AC_DEFINE(HAVE_FNMATCH_PROTO, 1, [Define this if fnmatch is prototyped in fnmatch.h])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
AC_MSG_CHECKING(for strnlen in string.h) AC_MSG_CHECKING(for strnlen in string.h)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "string.h"]], [[int (*foo)() = strnlen;]])],[AC_DEFINE(HAVE_STRNLEN_PROTO, 1, Define this if strnlen is prototyped in string.h)
[#include "string.h"], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[int (*foo)() = strnlen;], ])
AC_DEFINE(HAVE_STRNLEN_PROTO, 1, [Define this if strnlen is prototyped in string.h])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
AC_MSG_CHECKING(for strndup in string.h) AC_MSG_CHECKING(for strndup in string.h)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "string.h"]], [[int (*foo)() = strndup;]])],[AC_DEFINE(HAVE_STRNDUP_PROTO, 1, Define this if strndup is prototyped in string.h)
[#include "string.h"], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[int (*foo)() = strndup;], ])
AC_DEFINE(HAVE_STRNDUP_PROTO, 1, [Define this if strndup is prototyped in string.h])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
AC_MSG_CHECKING(for strcasestr in string.h) AC_MSG_CHECKING(for strcasestr in string.h)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "string.h"]], [[int (*foo)() = strcasestr;]])],[AC_DEFINE(HAVE_STRCASESTR_PROTO, 1, Define this if strcasestr is prototyped in string.h)
[#include "string.h"], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[int (*foo)() = strcasestr;], ])
AC_DEFINE(HAVE_STRCASESTR_PROTO, 1, [Define this if strcasestr is prototyped in string.h])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)

52
config.d/library_functions.m4
View file

@ -5,7 +5,7 @@ dnl ==================================================================
AC_FUNC_ALLOCA AC_FUNC_ALLOCA
AC_FUNC_MEMCMP AC_FUNC_MEMCMP
AC_FUNC_MMAP AC_FUNC_MMAP
AC_TYPE_SIGNAL
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_CHECK_FUNCS( AC_CHECK_FUNCS(
access _access bsearch_r connect dlopen execvp fcntl ftime _ftime \ access _access bsearch_r connect dlopen execvp fcntl ftime _ftime \
@ -39,21 +39,13 @@ AC_SUBST(DL_LIBS)
if test "x$DL_LIBS" != "x"; then if test "x$DL_LIBS" != "x"; then
AC_MSG_CHECKING([for RTLD_NOW]) AC_MSG_CHECKING([for RTLD_NOW])
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dlfcn.h>]], [[int foo = RTLD_NOW]])],[AC_DEFINE(HAVE_RTLD_NOW, 1, Define if you have RTLD_NOW.)
[#include <dlfcn.h>], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[int foo = RTLD_NOW], ])
AC_DEFINE(HAVE_RTLD_NOW, 1, [Define if you have RTLD_NOW.])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
AC_MSG_CHECKING([for RTLD_DEEPBIND]) AC_MSG_CHECKING([for RTLD_DEEPBIND])
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dlfcn.h>]], [[int foo = RTLD_DEEPBIND]])],[AC_DEFINE(HAVE_RTLD_DEEPBIND, 1, Define if you have RTLD_DEEPBIND.)
[#include <dlfcn.h>], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[int foo = RTLD_DEEPBIND], ])
AC_DEFINE(HAVE_RTLD_DEEPBIND, 1, [Define if you have RTLD_DEEPBIND.])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
fi fi
dnl Checks for stricmp/strcasecmp dnl Checks for stricmp/strcasecmp
@ -81,36 +73,24 @@ fi
AC_CHECK_FUNCS(usleep) AC_CHECK_FUNCS(usleep)
AC_MSG_CHECKING(for fnmatch) AC_MSG_CHECKING(for fnmatch)
AC_TRY_LINK( AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[fnmatch();]])],[BUILD_FNMATCH=no
[], AC_MSG_RESULT(yes)],[BUILD_FNMATCH=yes
[fnmatch();],
BUILD_FNMATCH=no
AC_MSG_RESULT(yes),
BUILD_FNMATCH=yes
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
) ])
AM_CONDITIONAL(BUILD_FNMATCH, test "x$BUILD_FNMATCH" = "xyes") AM_CONDITIONAL(BUILD_FNMATCH, test "x$BUILD_FNMATCH" = "xyes")
AC_MSG_CHECKING(for opendir) AC_MSG_CHECKING(for opendir)
AC_TRY_LINK( AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[opendir();]])],[BUILD_DIRENT=no
[], AC_MSG_RESULT(yes)],[BUILD_DIRENT=yes
[opendir();],
BUILD_DIRENT=no
AC_MSG_RESULT(yes),
BUILD_DIRENT=yes
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
) ])
AM_CONDITIONAL(BUILD_DIRENT, test "x$BUILD_DIRENT" = "xyes") AM_CONDITIONAL(BUILD_DIRENT, test "x$BUILD_DIRENT" = "xyes")
AC_MSG_CHECKING(for getopt_long) AC_MSG_CHECKING(for getopt_long)
AC_TRY_LINK( AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[getopt_long();]])],[BUILD_GETOPT=no
[], AC_MSG_RESULT(yes)],[BUILD_GETOPT=yes
[getopt_long();],
BUILD_GETOPT=no
AC_MSG_RESULT(yes),
BUILD_GETOPT=yes
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
) ])
AM_CONDITIONAL(BUILD_GETOPT, test "x$BUILD_GETOPT" = "xyes") AM_CONDITIONAL(BUILD_GETOPT, test "x$BUILD_GETOPT" = "xyes")
AC_MSG_CHECKING(for log2f) AC_MSG_CHECKING(for log2f)

37
config.d/networking.m4
View file

@ -60,19 +60,16 @@ fi
AC_MSG_CHECKING([for connect in -lwsock32]) AC_MSG_CHECKING([for connect in -lwsock32])
SAVELIBS="$LIBS" SAVELIBS="$LIBS"
LIBS="$LIBS -lwsock32" LIBS="$LIBS -lwsock32"
AC_TRY_LINK([ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <winsock.h> #include <winsock.h>
], ]], [[
[
connect(0, NULL, 42); connect(0, NULL, 42);
], ]])],[NET_LIBS="$NET_LIBS -lwsock32 -lwinmm"
NET_LIBS="$NET_LIBS -lwsock32 -lwinmm"
ac_cv_func_connect=yes ac_cv_func_connect=yes
ac_cv_func_gethostbyname=yes ac_cv_func_gethostbyname=yes
HAVE_WSOCK=yes HAVE_WSOCK=yes
AC_MSG_RESULT(yes), AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
AC_MSG_RESULT(no) ])
)
LIBS="$SAVELIBS" LIBS="$SAVELIBS"
AC_MSG_CHECKING(for UDP support) AC_MSG_CHECKING(for UDP support)
@ -87,16 +84,13 @@ if test "x$ac_cv_func_connect" != "xyes"; then
AC_MSG_CHECKING([for connect in -lwsock32]) AC_MSG_CHECKING([for connect in -lwsock32])
SAVELIBS="$LIBS" SAVELIBS="$LIBS"
LIBS="$LIBS -lwsock32" LIBS="$LIBS -lwsock32"
AC_TRY_LINK([ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <winsock.h> #include <winsock.h>
], ]], [[
[
connect (0, NULL, 42); connect (0, NULL, 42);
], ]])],[NET_LIBS="$NET_LIBS -lwsock32 -lwinmm"
NET_LIBS="$NET_LIBS -lwsock32 -lwinmm" AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
AC_MSG_RESULT(yes), ])
AC_MSG_RESULT(no)
)
LIBS="$SAVELIBS" LIBS="$SAVELIBS"
fi fi
AC_SUBST(NET_LIBS) AC_SUBST(NET_LIBS)
@ -104,12 +98,9 @@ AC_SUBST(NET_LIBS)
AC_MSG_CHECKING([for getifaddrs]) AC_MSG_CHECKING([for getifaddrs])
SAVELIBS="$LIBS" SAVELIBS="$LIBS"
LIBS="$LIBS $NET_LIBS" LIBS="$LIBS $NET_LIBS"
AC_TRY_LINK([], AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
[
getifaddrs (0); getifaddrs (0);
], ]])],[AC_DEFINE(HAVE_GETIFADDRS, 1, Define this if you have getifaddrs())
AC_DEFINE(HAVE_GETIFADDRS, 1, [Define this if you have getifaddrs()]) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
AC_MSG_RESULT(yes), ])
AC_MSG_RESULT(no)
)
LIBS="$SAVELIBS" LIBS="$SAVELIBS"

1
config.d/programs.m4
View file

@ -32,6 +32,7 @@ AS_VERSION_COMPARE([$BISON_VER], [2.6],
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
) )
AC_PROG_LEX(noyywrap)
AM_PROG_LEX AM_PROG_LEX
if echo $LEX | grep -v flex > /dev/null; then if echo $LEX | grep -v flex > /dev/null; then
AC_MSG_ERROR(GNU flex is required but was not found) AC_MSG_ERROR(GNU flex is required but was not found)

20
config.d/pthread.m4
View file

@ -11,22 +11,14 @@ if test "x$ac_cv_header_pthread_h" = "xyes"; then
;; ;;
*openbsd*) *openbsd*)
LIBS="$LIBS -pthread" LIBS="$LIBS -pthread"
AC_TRY_LINK( AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_attr_t type;
[#include <pthread.h>], pthread_attr_setstacksize(&type, 0x100000);]])],[PTHREAD_LDFLAGS=-pthread],[PTHREAD_LDFLAGS=-lpthread
[pthread_attr_t type; ])
pthread_attr_setstacksize(&type, 0x100000);],
[PTHREAD_LDFLAGS=-pthread],
[PTHREAD_LDFLAGS=-lpthread]
)
;; ;;
*) LIBS="$LIBS -lpthread" *) LIBS="$LIBS -lpthread"
AC_TRY_LINK( AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_attr_t type;
[#include <pthread.h>], pthread_attr_setstacksize(&type, 0x100000);]])],[PTHREAD_LDFLAGS=-lpthread],[PTHREAD_LDFLAGS=-pthread
[pthread_attr_t type; ])
pthread_attr_setstacksize(&type, 0x100000);],
[PTHREAD_LDFLAGS=-lpthread],
[PTHREAD_LDFLAGS=-pthread]
)
;; ;;
esac esac
LIBS="$save_LIBS" LIBS="$save_LIBS"

135
config.d/typedefs_structs_compiler.m4
View file

@ -5,29 +5,19 @@ dnl ==================================================================
AC_C_CONST AC_C_CONST
AC_C_INLINE AC_C_INLINE
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
AC_STRUCT_ST_BLKSIZE
AC_HEADER_TIME
AC_STRUCT_TM AC_STRUCT_TM
if test "x$ac_cv_header_unistd_h" = xyes; then if test "x$ac_cv_header_unistd_h" = xyes; then
AC_MSG_CHECKING(for _SC_PAGESIZE) AC_MSG_CHECKING(for _SC_PAGESIZE)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[int foo = _SC_PAGESIZE;]])],[AC_DEFINE(HAVE__SC_PAGESIZE,1,Define this if you have _SC_PAGESIZE)
[#include <unistd.h>], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[int foo = _SC_PAGESIZE;], ])
AC_DEFINE(HAVE__SC_PAGESIZE,1,[Define this if you have _SC_PAGESIZE])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
fi fi
AC_MSG_CHECKING(for __attribute__) AC_MSG_CHECKING(for __attribute__)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[static __attribute__ ((unused)) const char *foo = "bar";]], [[]])],[AC_DEFINE(HAVE___ATTRIBUTE__)
[static __attribute__ ((unused)) const char *foo = "bar";], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[], ])
AC_DEFINE(HAVE___ATTRIBUTE__)
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
AH_VERBATIM([HAVE___ATTRIBUTE__], AH_VERBATIM([HAVE___ATTRIBUTE__],
[/* Define this if the GCC __attribute__ keyword is available */ [/* Define this if the GCC __attribute__ keyword is available */
#undef HAVE___ATTRIBUTE__ #undef HAVE___ATTRIBUTE__
@ -36,14 +26,10 @@ AH_VERBATIM([HAVE___ATTRIBUTE__],
#endif]) #endif])
AC_MSG_CHECKING(for __attribute__ ((visibility))) AC_MSG_CHECKING(for __attribute__ ((visibility)))
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[void foo (void);
[void foo (void); __attribute__ ((sivibility ("default"))) void foo (void) {}]], [[]])],[AC_DEFINE(HAVE___ATTRIBUTE__VISIBILITY)
__attribute__ ((sivibility ("default"))) void foo (void) {}], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[], ])
AC_DEFINE(HAVE___ATTRIBUTE__VISIBILITY)
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
AH_VERBATIM([HAVE___ATTRIBUTE__VISIBILITY], AH_VERBATIM([HAVE___ATTRIBUTE__VISIBILITY],
[/* Define this if the GCC visibility __attribute__ is available */ [/* Define this if the GCC visibility __attribute__ is available */
#undef HAVE___ATTRIBUTE__VISIBILITY #undef HAVE___ATTRIBUTE__VISIBILITY
@ -55,14 +41,10 @@ AH_VERBATIM([HAVE___ATTRIBUTE__VISIBILITY],
if test "x$SYSTYPE" = "xWIN32"; then if test "x$SYSTYPE" = "xWIN32"; then
AC_MSG_CHECKING(for __attribute__ ((gcc_struct))) AC_MSG_CHECKING(for __attribute__ ((gcc_struct)))
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[typedef struct { int foo; }
[typedef struct { int foo; } __attribute__ ((gcc_struct)) gcc_struct_test;]], [[]])],[AC_DEFINE(HAVE___ATTRIBUTE__GCC_STRUCT)
__attribute__ ((gcc_struct)) gcc_struct_test;], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[], ])
AC_DEFINE(HAVE___ATTRIBUTE__GCC_STRUCT)
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
fi fi
AH_VERBATIM([HAVE___ATTRIBUTE__GCC_STRUCT], AH_VERBATIM([HAVE___ATTRIBUTE__GCC_STRUCT],
[/* Define this if the GCC gcc_struct __attribute__ is available */ [/* Define this if the GCC gcc_struct __attribute__ is available */
@ -74,13 +56,9 @@ AH_VERBATIM([HAVE___ATTRIBUTE__GCC_STRUCT],
#endif]) #endif])
AC_MSG_CHECKING(for __builtin_expect) AC_MSG_CHECKING(for __builtin_expect)
AC_TRY_LINK( AC_LINK_IFELSE([AC_LANG_PROGRAM([[int x;]], [[if (__builtin_expect(!x, 1)) {}]])],[AC_DEFINE(HAVE___BUILTIN_EXPECT)
[int x;], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[if (__builtin_expect(!x, 1)) {}], ])
AC_DEFINE(HAVE___BUILTIN_EXPECT)
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
AH_VERBATIM([HAVE___BUILTIN_EXPECT], AH_VERBATIM([HAVE___BUILTIN_EXPECT],
[/* Define this if the GCC __builtin_expect keyword is available */ [/* Define this if the GCC __builtin_expect keyword is available */
#undef HAVE___BUILTIN_EXPECT #undef HAVE___BUILTIN_EXPECT
@ -89,78 +67,47 @@ AH_VERBATIM([HAVE___BUILTIN_EXPECT],
#endif]) #endif])
AC_MSG_CHECKING(for type of fpos_t) AC_MSG_CHECKING(for type of fpos_t)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[fpos_t x = 0]])],[AC_MSG_RESULT(off_t)],[AC_DEFINE(HAVE_FPOS_T_STRUCT, 1, Define this if FPOS_T is a struct)
[#include <stdio.h>],
[fpos_t x = 0],
AC_MSG_RESULT(off_t),
AC_DEFINE(HAVE_FPOS_T_STRUCT, 1, [Define this if FPOS_T is a struct])
AC_MSG_RESULT(struct) AC_MSG_RESULT(struct)
) ])
AC_MSG_CHECKING(for socklen_t in sys/types.h) AC_MSG_CHECKING(for socklen_t in sys/types.h)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]], [[socklen_t x = 0;]])],[AC_DEFINE(HAVE_SOCKLEN_T, 1, Define this if your system has socklen_t)
[#include <sys/types.h>], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[ socklen_t x = 0;],
AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define this if your system has socklen_t])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
dnl FreeBSD 4.0 has it in sys/socket.h dnl FreeBSD 4.0 has it in sys/socket.h
AC_MSG_CHECKING(for socklen_t in sys/socket.h) AC_MSG_CHECKING(for socklen_t in sys/socket.h)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
[#include <sys/types.h> #include <sys/socket.h>]], [[socklen_t x = 0;]])],[AC_DEFINE(HAVE_SOCKLEN_T, 1, Define this if your system has socklen_t)
#include <sys/socket.h>], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[ socklen_t x = 0;], ])
AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define this if your system has socklen_t]) AC_MSG_RESULT(yes), ])
AC_MSG_RESULT(no)
)
)
if test "x$ac_cv_header_sys_uio_h" = xyes; then if test "x$ac_cv_header_sys_uio_h" = xyes; then
AC_MSG_CHECKING(for struct in_pktinfo) AC_MSG_CHECKING(for struct in_pktinfo)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
[#include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/uio.h>], #include <sys/uio.h>]], [[struct in_pktinfo x;]])],[AC_DEFINE(HAVE_IN_PKTINFO, 1, Define this if your system has struct in_pktinfo)
[struct in_pktinfo x;], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
AC_DEFINE(HAVE_IN_PKTINFO, 1, [Define this if your system has struct in_pktinfo]) ])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
fi fi
AC_MSG_CHECKING(for size_t in sys/types.h) AC_MSG_CHECKING(for size_t in sys/types.h)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]], [[ size_t x = 0;]])],[AC_DEFINE(HAVE_SIZE_T, 1, Define this if your system has size_t) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[#include <sys/types.h>], ])
[ size_t x = 0;],
AC_DEFINE(HAVE_SIZE_T, 1, [Define this if your system has size_t]) AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
dnl maybe these two (at least the 2nd) should be checked only if ipv6 is enabled? dnl maybe these two (at least the 2nd) should be checked only if ipv6 is enabled?
AC_MSG_CHECKING(for ss_len in struct sockaddr_storage) AC_MSG_CHECKING(for ss_len in struct sockaddr_storage)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
[#include <sys/types.h> #include <sys/socket.h>]], [[ void f(void) { struct sockaddr_storage ss; ss.ss_len=0; }]])],[AC_DEFINE(HAVE_SS_LEN, 1, Define this if you have ss_len member in struct sockaddr_storage (BSD)) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
#include <sys/socket.h>], ])
[ void f(void) { struct sockaddr_storage ss; ss.ss_len=0; }],
AC_DEFINE(HAVE_SS_LEN, 1, [Define this if you have ss_len member in struct sockaddr_storage (BSD)]) AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
AC_MSG_CHECKING(for sin6_len in struct sockaddr_in6) AC_MSG_CHECKING(for sin6_len in struct sockaddr_in6)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
[#include <sys/types.h> #include <netinet/in.h>]], [[ void f(void) { struct sockaddr_in6 s6; s6.sin6_len=0; }]])],[AC_DEFINE(HAVE_SIN6_LEN, 1, Define this if you have sin6_len member in struct sockaddr_in6 (BSD)) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
#include <netinet/in.h>], ])
[ void f(void) { struct sockaddr_in6 s6; s6.sin6_len=0; }],
AC_DEFINE(HAVE_SIN6_LEN, 1, [Define this if you have sin6_len member in struct sockaddr_in6 (BSD)]) AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
AC_MSG_CHECKING(for sa_len in struct sockaddr) AC_MSG_CHECKING(for sa_len in struct sockaddr)
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
[#include <sys/types.h> #include <netinet/in.h>]], [[ void f(void) { struct sockaddr sa; sa.sa_len=0; }]])],[AC_DEFINE(HAVE_SA_LEN, 1, Define this if you have sa_len member in struct sockaddr (BSD)) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
#include <netinet/in.h>], ])
[ void f(void) { struct sockaddr sa; sa.sa_len=0; }],
AC_DEFINE(HAVE_SA_LEN, 1, [Define this if you have sa_len member in struct sockaddr (BSD)]) AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)

2
config.d/versions.m4
View file

@ -15,7 +15,7 @@ AC_DEFINE_UNQUOTED(QW_VERSION, "$QW_VERSION",
AC_DEFINE_UNQUOTED(QW_QSG_VERSION, "$QW_QSG_VERSION", AC_DEFINE_UNQUOTED(QW_QSG_VERSION, "$QW_QSG_VERSION",
[Define this to the QSG standard version you support in QuakeWorld]) [Define this to the QSG standard version you support in QuakeWorld])
AC_ARG_ENABLE([version-info], AC_HELP_STRING([--enable-version-info=CURRENT:REVISION:AGE], AC_ARG_ENABLE([version-info], AS_HELP_STRING([--enable-version-info=CURRENT:REVISION:AGE],
[Override the value passed to libtool -version-info.]), [Override the value passed to libtool -version-info.]),
[], [enable_version_info=1:0:0]) [], [enable_version_info=1:0:0])
QUAKE_LIBRARY_VERSION_INFO=$enable_version_info QUAKE_LIBRARY_VERSION_INFO=$enable_version_info

8
configure.ac
View file

@ -1,8 +1,8 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61) AC_PREREQ([2.71])
dnl This is the only place where the package name and version appear dnl This is the only place where the package name and version appear
AC_INIT([QuakeForge], m4_esyscmd([config.d/git-version-gen --prefix '' .tarball-version])) AC_INIT([QuakeForge],m4_esyscmd(config.d/git-version-gen --prefix '' .tarball-version))
AM_INIT_AUTOMAKE([foreign subdir-objects]) AM_INIT_AUTOMAKE([foreign subdir-objects])
dnl LT_INIT messes with CFLAGS (evil bastard) dnl LT_INIT messes with CFLAGS (evil bastard)
@ -11,7 +11,7 @@ if test "x${CFLAGS-unset}" = xunset; then
fi fi
saved_CFLAGS="$CFLAGS" saved_CFLAGS="$CFLAGS"
dnl LT_INIT([win32-dll]) dnl LT_INIT([win32-dll])
AM_PROG_LIBTOOL LT_INIT
CFLAGS="$saved_CFLAGS" CFLAGS="$saved_CFLAGS"
AC_REVISION([$Revision$]) dnl AC_REVISION([$Revision$]) dnl
@ -23,7 +23,7 @@ AC_CANONICAL_HOST
m4_include(config.d/versions.m4) m4_include(config.d/versions.m4)
AC_LANG_C AC_LANG([C])
if test "$x{AR-unset}" = xunset; then if test "$x{AR-unset}" = xunset; then
AR="ar" AR="ar"

12
m4/libFLAC.m4
View file

@ -46,7 +46,7 @@ dnl
dnl Now check if the installed libFLAC is sufficiently new. dnl Now check if the installed libFLAC is sufficiently new.
dnl dnl
rm -f conf.libFLACtest rm -f conf.libFLACtest
AC_TRY_RUN([ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -58,7 +58,7 @@ int main ()
return 0; return 0;
} }
],, no_libFLAC=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ]])],[],[no_libFLAC=yes],[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
@ -74,11 +74,10 @@ int main ()
echo "*** Could not run libFLAC test program, checking why..." echo "*** Could not run libFLAC test program, checking why..."
CFLAGS="$CFLAGS $LIBFLAC_CFLAGS" CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
LIBS="$LIBS $LIBFLAC_LIBS" LIBS="$LIBS $LIBFLAC_LIBS"
AC_TRY_LINK([ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h> #include <stdio.h>
#include <FLAC/format.h> #include <FLAC/format.h>
], [ return 0; ], ]], [[ return 0; ]])],[ echo "*** The test program compiled, but did not run. This usually means"
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding libFLAC or finding the wrong" echo "*** that the run-time linker is not finding libFLAC or finding the wrong"
echo "*** version of libFLAC. If it is not finding libFLAC, you'll need to set your" echo "*** version of libFLAC. If it is not finding libFLAC, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
@ -86,8 +85,7 @@ int main ()
echo "*** is required on your system" echo "*** is required on your system"
echo "***" echo "***"
echo "*** If you have an old version installed, it is best to remove it, although" echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],[ echo "*** The test program failed to compile or link. See the file config.log for the"
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means libFLAC was incorrectly installed" echo "*** exact error that occured. This usually means libFLAC was incorrectly installed"
echo "*** or that you have moved libFLAC since it was installed. In the latter case, you" echo "*** or that you have moved libFLAC since it was installed. In the latter case, you"
echo "*** may want to edit the libFLAC-config script: $LIBFLAC_CONFIG" ]) echo "*** may want to edit the libFLAC-config script: $LIBFLAC_CONFIG" ])

12
m4/libOggFLAC.m4
View file

@ -46,7 +46,7 @@ dnl
dnl Now check if the installed libOggFLAC is sufficiently new. dnl Now check if the installed libOggFLAC is sufficiently new.
dnl dnl
rm -f conf.libOggFLACtest rm -f conf.libOggFLACtest
AC_TRY_RUN([ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -58,7 +58,7 @@ int main ()
return 0; return 0;
} }
],, no_libOggFLAC=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ]])],[],[no_libOggFLAC=yes],[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
@ -74,11 +74,10 @@ int main ()
echo "*** Could not run libOggFLAC test program, checking why..." echo "*** Could not run libOggFLAC test program, checking why..."
CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS" CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS"
LIBS="$LIBS $LIBOGGFLAC_LIBS" LIBS="$LIBS $LIBOGGFLAC_LIBS"
AC_TRY_LINK([ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h> #include <stdio.h>
#include <OggFLAC/stream_decoder.h> #include <OggFLAC/stream_decoder.h>
], [ return 0; ], ]], [[ return 0; ]])],[ echo "*** The test program compiled, but did not run. This usually means"
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding libOggFLAC or finding the wrong" echo "*** that the run-time linker is not finding libOggFLAC or finding the wrong"
echo "*** version of libOggFLAC. If it is not finding libOggFLAC, you'll need to set your" echo "*** version of libOggFLAC. If it is not finding libOggFLAC, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
@ -86,8 +85,7 @@ int main ()
echo "*** is required on your system" echo "*** is required on your system"
echo "***" echo "***"
echo "*** If you have an old version installed, it is best to remove it, although" echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],[ echo "*** The test program failed to compile or link. See the file config.log for the"
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means libOggFLAC was incorrectly installed" echo "*** exact error that occured. This usually means libOggFLAC was incorrectly installed"
echo "*** or that you have moved libOggFLAC since it was installed. In the latter case, you" echo "*** or that you have moved libOggFLAC since it was installed. In the latter case, you"
echo "*** may want to edit the libOggFLAC-config script: $LIBOGGFLAC_CONFIG" ]) echo "*** may want to edit the libOggFLAC-config script: $LIBOGGFLAC_CONFIG" ])

2
m4/libcurl.m4
View file

@ -61,7 +61,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP]) AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP])
AC_ARG_WITH(libcurl, AC_ARG_WITH(libcurl,
AC_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]), AS_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]),
[_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])]) [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
if test "$_libcurl_with" != "no" ; then if test "$_libcurl_with" != "no" ; then

12
m4/ogg.m4
View file

@ -45,7 +45,7 @@ dnl
dnl Now check if the installed Ogg is sufficiently new. dnl Now check if the installed Ogg is sufficiently new.
dnl dnl
rm -f conf.oggtest rm -f conf.oggtest
AC_TRY_RUN([ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -57,7 +57,7 @@ int main ()
return 0; return 0;
} }
],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ]])],[],[no_ogg=yes],[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
@ -73,11 +73,10 @@ int main ()
echo "*** Could not run Ogg test program, checking why..." echo "*** Could not run Ogg test program, checking why..."
CFLAGS="$CFLAGS $OGG_CFLAGS" CFLAGS="$CFLAGS $OGG_CFLAGS"
LIBS="$LIBS $OGG_LIBS" LIBS="$LIBS $OGG_LIBS"
AC_TRY_LINK([ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h> #include <stdio.h>
#include <ogg/ogg.h> #include <ogg/ogg.h>
], [ return 0; ], ]], [[ return 0; ]])],[ echo "*** The test program compiled, but did not run. This usually means"
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding Ogg or finding the wrong" echo "*** that the run-time linker is not finding Ogg or finding the wrong"
echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your" echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
@ -85,8 +84,7 @@ int main ()
echo "*** is required on your system" echo "*** is required on your system"
echo "***" echo "***"
echo "*** If you have an old version installed, it is best to remove it, although" echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],[ echo "*** The test program failed to compile or link. See the file config.log for the"
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means Ogg was incorrectly installed" echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
echo "*** or that you have moved Ogg since it was installed." ]) echo "*** or that you have moved Ogg since it was installed." ])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"

41
m4/quakeforge.m4
View file

@ -5,9 +5,7 @@ dnl AC_HAVE_STRUCT_FIELD(struct, field, headers)
AC_DEFUN([AC_HAVE_STRUCT_FIELD], [ AC_DEFUN([AC_HAVE_STRUCT_FIELD], [
define(cache_val, translit(ac_cv_type_$1_$2, [A-Z ], [a-z_])) define(cache_val, translit(ac_cv_type_$1_$2, [A-Z ], [a-z_]))
AC_CACHE_CHECK([for $2 in $1], cache_val,[ AC_CACHE_CHECK([for $2 in $1], cache_val,[
AC_TRY_COMPILE([$3],[$1 x; x.$2;], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$3]], [[$1 x; x.$2;]])],[cache_val=yes],[cache_val=no])])
cache_val=yes,
cache_val=no)])
if test "$cache_val" = yes; then if test "$cache_val" = yes; then
define(foo, translit(HAVE_$1_$2, [a-z ], [A-Z_])) define(foo, translit(HAVE_$1_$2, [a-z ], [A-Z_]))
AC_DEFINE(foo, 1, [Define if $1 has field $2.]) AC_DEFINE(foo, 1, [Define if $1 has field $2.])
@ -20,18 +18,15 @@ dnl Checks if function/macro va_copy() is available
dnl Defines HAVE_VA_COPY on success. dnl Defines HAVE_VA_COPY on success.
AC_DEFUN([AC_FUNC_VA_COPY], AC_DEFUN([AC_FUNC_VA_COPY],
[AC_CACHE_CHECK([for va_copy], ac_cv_func_va_copy, [AC_CACHE_CHECK([for va_copy], ac_cv_func_va_copy,
[AC_TRY_LINK([ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#ifdef HAVE_STDARG_H #ifdef HAVE_STDARG_H
# include <stdarg.h> # include <stdarg.h>
#else #else
# include <varargs.h> # include <varargs.h>
#endif], #endif]], [[
[
va_list a, b; va_list a, b;
va_copy(a, b);], va_copy(a, b);]])],[ac_cv_func_va_copy=yes],[ac_cv_func_va_copy=no])])
[ac_cv_func_va_copy=yes],
[ac_cv_func_va_copy=no])])
if test $ac_cv_func_va_copy = yes; then if test $ac_cv_func_va_copy = yes; then
AC_DEFINE(HAVE_VA_COPY, 1, [Define if va_copy is available]) AC_DEFINE(HAVE_VA_COPY, 1, [Define if va_copy is available])
fi]) fi])
@ -40,18 +35,15 @@ dnl Checks if function/macro __va_copy() is available
dnl Defines HAVE__VA_COPY on success. dnl Defines HAVE__VA_COPY on success.
AC_DEFUN([AC_FUNC__VA_COPY], AC_DEFUN([AC_FUNC__VA_COPY],
[AC_CACHE_CHECK([for __va_copy], ac_cv_func__va_copy, [AC_CACHE_CHECK([for __va_copy], ac_cv_func__va_copy,
[AC_TRY_LINK([ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#ifdef HAVE_STDARG_H #ifdef HAVE_STDARG_H
# include <stdarg.h> # include <stdarg.h>
#else #else
# include <varargs.h> # include <varargs.h>
#endif], #endif]], [[
[
va_list a, b; va_list a, b;
__va_copy(a, b);], __va_copy(a, b);]])],[ac_cv_func__va_copy=yes],[ac_cv_func__va_copy=no])])
[ac_cv_func__va_copy=yes],
[ac_cv_func__va_copy=no])])
if test $ac_cv_func__va_copy = yes; then if test $ac_cv_func__va_copy = yes; then
AC_DEFINE(HAVE__VA_COPY, 1, [Define if __va_copy is available]) AC_DEFINE(HAVE__VA_COPY, 1, [Define if __va_copy is available])
fi]) fi])
@ -60,19 +52,16 @@ dnl Checks if va_list is an array
dnl Defines VA_LIST_IS_ARRAY on success. dnl Defines VA_LIST_IS_ARRAY on success.
AC_DEFUN([AC_TYPE_VA_LIST], AC_DEFUN([AC_TYPE_VA_LIST],
[AC_CACHE_CHECK([if va_list is an array], ac_cv_type_va_list_array, [AC_CACHE_CHECK([if va_list is an array], ac_cv_type_va_list_array,
[AC_TRY_LINK([ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#ifdef HAVE_STDARG_H #ifdef HAVE_STDARG_H
# include <stdarg.h> # include <stdarg.h>
#else #else
# include <varargs.h> # include <varargs.h>
#endif #endif
], ]], [[
[
va_list a, b; va_list a, b;
a = b;], a = b;]])],[ac_cv_type_va_list_array=no],[ac_cv_type_va_list_array=yes])])
[ac_cv_type_va_list_array=no],
[ac_cv_type_va_list_array=yes])])
if test $ac_cv_type_va_list_array = yes; then if test $ac_cv_type_va_list_array = yes; then
AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define if va_list is an array]) AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define if va_list is an array])
fi]) fi])
@ -179,13 +168,9 @@ AC_MSG_CHECKING(whether $1 works)
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $1" CFLAGS="$CFLAGS $1"
qf_opt_ok=no qf_opt_ok=no
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[qf_opt_ok=yes
[], AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
[], ])
qf_opt_ok=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
if test "x$qf_opt_ok" = xyes; then if test "x$qf_opt_ok" = xyes; then
true true

12
m4/sdl.m4
View file

@ -63,7 +63,7 @@ dnl Now check if the installed SDL is sufficiently new. (Also sanity
dnl checks the results of sdl-config to some extent dnl checks the results of sdl-config to some extent
dnl dnl
rm -f conf.sdltest rm -f conf.sdltest
AC_TRY_RUN([ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -120,7 +120,7 @@ int main (int argc, char *argv[])
} }
} }
],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ]])],[],[no_sdl=yes],[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS" CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
@ -144,7 +144,7 @@ int main (int argc, char *argv[])
CFLAGS="$CFLAGS $SDL_CFLAGS" CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS" LIBS="$LIBS $SDL_LIBS"
AC_TRY_LINK([ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h> #include <stdio.h>
#include "SDL.h" #include "SDL.h"
@ -152,8 +152,7 @@ int main(int argc, char *argv[])
{ return 0; } { return 0; }
#undef main #undef main
#define main K_and_R_C_main #define main K_and_R_C_main
], [ return 0; ], ]], [[ return 0; ]])],[ echo "*** The test program compiled, but did not run. This usually means"
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SDL or finding the wrong" echo "*** that the run-time linker is not finding SDL or finding the wrong"
echo "*** version of SDL. If it is not finding SDL, you'll need to set your" echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
@ -161,8 +160,7 @@ int main(int argc, char *argv[])
echo "*** is required on your system" echo "*** is required on your system"
echo "***" echo "***"
echo "*** If you have an old version installed, it is best to remove it, although" echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],[ echo "*** The test program failed to compile or link. See the file config.log for the"
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means SDL was incorrectly installed" echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** or that you have moved SDL since it was installed. In the latter case, you" echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])

12
m4/vorbis.m4
View file

@ -49,7 +49,7 @@ dnl
dnl Now check if the installed Vorbis is sufficiently new. dnl Now check if the installed Vorbis is sufficiently new.
dnl dnl
rm -f conf.vorbistest rm -f conf.vorbistest
AC_TRY_RUN([ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -73,7 +73,7 @@ int main ()
return 0; return 0;
} }
],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ]])],[],[no_vorbis=yes],[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
@ -89,11 +89,10 @@ int main ()
echo "*** Could not run Vorbis test program, checking why..." echo "*** Could not run Vorbis test program, checking why..."
CFLAGS="$CFLAGS $VORBIS_CFLAGS" CFLAGS="$CFLAGS $VORBIS_CFLAGS"
LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
AC_TRY_LINK([ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h> #include <stdio.h>
#include <vorbis/codec.h> #include <vorbis/codec.h>
], [ return 0; ], ]], [[ return 0; ]])],[ echo "*** The test program compiled, but did not run. This usually means"
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding Vorbis or finding the wrong" echo "*** that the run-time linker is not finding Vorbis or finding the wrong"
echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your" echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
@ -101,8 +100,7 @@ int main ()
echo "*** is required on your system" echo "*** is required on your system"
echo "***" echo "***"
echo "*** If you have an old version installed, it is best to remove it, although" echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],[ echo "*** The test program failed to compile or link. See the file config.log for the"
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means Vorbis was incorrectly installed" echo "*** exact error that occured. This usually means Vorbis was incorrectly installed"
echo "*** or that you have moved Vorbis since it was installed." ]) echo "*** or that you have moved Vorbis since it was installed." ])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"