ref: 89fa06e5402c4a0d4a288503ce8d41d4dfa59cb7
parent: e52ca315e57b232777ac4d12022a907b9c23dca4
author: Simon Howard <[email protected]>
date: Tue Dec 3 23:56:33 EST 2013
Rename configure.in to configure.ac, to comply with modern autotools guidelines. Subversion-branch: /branches/v2-branch Subversion-revision: 2758
--- /dev/null
+++ b/configure.ac
@@ -1,0 +1,160 @@
+AC_INIT(Chocolate Doom, 2.0.0-beta3, [email protected], chocolate-doom)
+
+PACKAGE_SHORTDESC="Conservative Doom source port"
+PACKAGE_COPYRIGHT="Copyright (C) 1993-2013"
+PACKAGE_LICENSE="GNU General Public License, version 2"
+PACKAGE_MAINTAINER="Simon Howard"
+PACKAGE_URL="http://www.chocolate-doom.org/"
+
+AC_CONFIG_AUX_DIR(autotools)
+
+orig_CFLAGS="$CFLAGS"
+
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_CHECK_PROG(HAVE_PYTHON, python, true, false)
+
+OPT_LEVEL=2
+
+# Engine room, we need more speed!
+
+AC_ARG_ENABLE(penis-extension,
+[ --enable-penis-extension Enable counterproductive compiler optimisations ],
+[ OPT_LEVEL=3 ])
+
+# If this is gcc, we have some options we'd like to turn on. Turn on
+# optimisation and debugging symbols.
+
+if test "$GCC" = "yes"
+then
+ WARNINGS="-Wall -Wdeclaration-after-statement -Wredundant-decls"
+ CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS"
+fi
+
+dnl Search for SDL ...
+
+AM_PATH_SDL(1.1.3)
+
+# Add the SDL compiler flags to the default compiler flag variables.
+# It is important to do this now, before checking for headers and
+# library functions. The reason being that on Windows, sdl-config
+# sets the -mno-cygwin compiler option in order to generate MinGW
+# executables. If we don't do this now, we might end up discovering
+# header files that are not actually available to us when we come
+# to compile.
+
+CFLAGS="$CFLAGS $SDL_CFLAGS"
+LDFLAGS="$LDFLAGS $SDL_LIBS"
+
+# On some platforms, SDL renames main() to SDL_main() using a #define,
+# so that its own main, stored in the SDLmain library, can be run first.
+# Unfortunately, this causes problems for autoconf, which builds
+# test programs to probe the system. All library/header/symbol checks
+# must be run in this block, that performs a workaround for the problem.
+
+AC_SDL_MAIN_WORKAROUND([
+
+ # Check for SDL_mixer.
+
+ AC_CHECK_LIB(SDL_mixer,Mix_LoadMUS,[
+ SDLMIXER_LIBS="$SDLMIXER_LIBS -lSDL_mixer"
+ ],[
+ echo "*** Could not find SDL_mixer. Please install it."
+ exit -1
+ ])
+
+ # Check for SDL_net.
+
+ AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[
+ SDLNET_LIBS="$SDLNET_LIBS -lSDL_net"
+ ],[
+ echo "*** Could not find SDL_net. Please install it."
+ exit -1
+ ])
+
+ # Check for libsamplerate.
+
+ AC_CHECK_LIB(samplerate, src_new)
+ AC_CHECK_LIB(m, log)
+
+ AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h])
+ AC_CHECK_FUNCS(mmap sched_setaffinity ioperm)
+
+ # OpenBSD I/O i386 library for I/O port access.
+ # (64 bit has the same thing with a different name!)
+
+ AC_CHECK_LIB(i386, i386_iopl)
+ AC_CHECK_LIB(amd64, amd64_iopl)
+])
+
+AC_CHECK_TOOL(WINDRES, windres, )
+AC_CHECK_TOOL(STRIP, strip, )
+
+AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "")
+AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON)
+
+dnl Automake v1.8.0 is required, please upgrade!
+
+AM_INIT_AUTOMAKE([1.8.0])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+WINDOWS_RC_VERSION=`echo $PACKAGE_VERSION | sed 's/-.*//; s/\./, /g; s/$/, 0/'`
+
+# This controls the prefix added to the start of program names. For example,
+# if this is changed to "lemon-", the programs generated will be named
+# lemon-doom, lemon-heretic, etc.
+
+PROGRAM_PREFIX=chocolate-
+
+AC_SUBST(PROGRAM_PREFIX)
+AC_DEFINE_UNQUOTED(PROGRAM_PREFIX, "$PROGRAM_PREFIX",
+ Change this when you create your awesome forked version)
+
+AM_CONFIG_HEADER(config.h:config.hin)
+
+AC_SUBST(WINDOWS_RC_VERSION)
+AC_SUBST(SDLMIXER_CFLAGS)
+AC_SUBST(SDLMIXER_LIBS)
+
+AC_SUBST(SDLNET_CFLAGS)
+AC_SUBST(SDLNET_LIBS)
+
+AC_SUBST(ac_aux_dir)
+
+AC_SUBST(PACKAGE_SHORTDESC)
+AC_SUBST(PACKAGE_COPYRIGHT)
+AC_SUBST(PACKAGE_LICENSE)
+AC_SUBST(PACKAGE_MAINTAINER)
+AC_SUBST(PACKAGE_URL)
+
+dnl Shut up the datarootdir warnings.
+AC_DEFUN([AC_DATAROOTDIR_CHECKED])
+
+AC_OUTPUT([
+Makefile
+man/Makefile
+opl/Makefile
+opl/examples/Makefile
+pcsound/Makefile
+pkg/Makefile
+pkg/config.make
+pkg/osx/Info-gnustep.plist
+pkg/osx/Info.plist
+rpm.spec
+data/Makefile
+src/Makefile
+src/doom.desktop
+src/doom-screensaver.desktop
+src/doom/Makefile
+src/heretic/Makefile
+src/hexen/Makefile
+src/resource.rc
+src/setup-res.rc
+src/setup/Makefile
+src/setup/setup.desktop
+src/setup/setup-manifest.xml
+src/strife/Makefile
+textscreen/Makefile
+textscreen/examples/Makefile
+])
+
--- a/configure.in
+++ /dev/null
@@ -1,160 +1,0 @@
-AC_INIT(Chocolate Doom, 2.0.0-beta3, [email protected], chocolate-doom)
-
-PACKAGE_SHORTDESC="Conservative Doom source port"
-PACKAGE_COPYRIGHT="Copyright (C) 1993-2013"
-PACKAGE_LICENSE="GNU General Public License, version 2"
-PACKAGE_MAINTAINER="Simon Howard"
-PACKAGE_URL="http://www.chocolate-doom.org/"
-
-AC_CONFIG_AUX_DIR(autotools)
-
-orig_CFLAGS="$CFLAGS"
-
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_CHECK_PROG(HAVE_PYTHON, python, true, false)
-
-OPT_LEVEL=2
-
-# Engine room, we need more speed!
-
-AC_ARG_ENABLE(penis-extension,
-[ --enable-penis-extension Enable counterproductive compiler optimisations ],
-[ OPT_LEVEL=3 ])
-
-# If this is gcc, we have some options we'd like to turn on. Turn on
-# optimisation and debugging symbols.
-
-if test "$GCC" = "yes"
-then
- WARNINGS="-Wall -Wdeclaration-after-statement -Wredundant-decls"
- CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS"
-fi
-
-dnl Search for SDL ...
-
-AM_PATH_SDL(1.1.3)
-
-# Add the SDL compiler flags to the default compiler flag variables.
-# It is important to do this now, before checking for headers and
-# library functions. The reason being that on Windows, sdl-config
-# sets the -mno-cygwin compiler option in order to generate MinGW
-# executables. If we don't do this now, we might end up discovering
-# header files that are not actually available to us when we come
-# to compile.
-
-CFLAGS="$CFLAGS $SDL_CFLAGS"
-LDFLAGS="$LDFLAGS $SDL_LIBS"
-
-# On some platforms, SDL renames main() to SDL_main() using a #define,
-# so that its own main, stored in the SDLmain library, can be run first.
-# Unfortunately, this causes problems for autoconf, which builds
-# test programs to probe the system. All library/header/symbol checks
-# must be run in this block, that performs a workaround for the problem.
-
-AC_SDL_MAIN_WORKAROUND([
-
- # Check for SDL_mixer.
-
- AC_CHECK_LIB(SDL_mixer,Mix_LoadMUS,[
- SDLMIXER_LIBS="$SDLMIXER_LIBS -lSDL_mixer"
- ],[
- echo "*** Could not find SDL_mixer. Please install it."
- exit -1
- ])
-
- # Check for SDL_net.
-
- AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[
- SDLNET_LIBS="$SDLNET_LIBS -lSDL_net"
- ],[
- echo "*** Could not find SDL_net. Please install it."
- exit -1
- ])
-
- # Check for libsamplerate.
-
- AC_CHECK_LIB(samplerate, src_new)
- AC_CHECK_LIB(m, log)
-
- AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h])
- AC_CHECK_FUNCS(mmap sched_setaffinity ioperm)
-
- # OpenBSD I/O i386 library for I/O port access.
- # (64 bit has the same thing with a different name!)
-
- AC_CHECK_LIB(i386, i386_iopl)
- AC_CHECK_LIB(amd64, amd64_iopl)
-])
-
-AC_CHECK_TOOL(WINDRES, windres, )
-AC_CHECK_TOOL(STRIP, strip, )
-
-AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "")
-AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON)
-
-dnl Automake v1.8.0 is required, please upgrade!
-
-AM_INIT_AUTOMAKE([1.8.0])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-WINDOWS_RC_VERSION=`echo $PACKAGE_VERSION | sed 's/-.*//; s/\./, /g; s/$/, 0/'`
-
-# This controls the prefix added to the start of program names. For example,
-# if this is changed to "lemon-", the programs generated will be named
-# lemon-doom, lemon-heretic, etc.
-
-PROGRAM_PREFIX=chocolate-
-
-AC_SUBST(PROGRAM_PREFIX)
-AC_DEFINE_UNQUOTED(PROGRAM_PREFIX, "$PROGRAM_PREFIX",
- Change this when you create your awesome forked version)
-
-AM_CONFIG_HEADER(config.h:config.hin)
-
-AC_SUBST(WINDOWS_RC_VERSION)
-AC_SUBST(SDLMIXER_CFLAGS)
-AC_SUBST(SDLMIXER_LIBS)
-
-AC_SUBST(SDLNET_CFLAGS)
-AC_SUBST(SDLNET_LIBS)
-
-AC_SUBST(ac_aux_dir)
-
-AC_SUBST(PACKAGE_SHORTDESC)
-AC_SUBST(PACKAGE_COPYRIGHT)
-AC_SUBST(PACKAGE_LICENSE)
-AC_SUBST(PACKAGE_MAINTAINER)
-AC_SUBST(PACKAGE_URL)
-
-dnl Shut up the datarootdir warnings.
-AC_DEFUN([AC_DATAROOTDIR_CHECKED])
-
-AC_OUTPUT([
-Makefile
-man/Makefile
-opl/Makefile
-opl/examples/Makefile
-pcsound/Makefile
-pkg/Makefile
-pkg/config.make
-pkg/osx/Info-gnustep.plist
-pkg/osx/Info.plist
-rpm.spec
-data/Makefile
-src/Makefile
-src/doom.desktop
-src/doom-screensaver.desktop
-src/doom/Makefile
-src/heretic/Makefile
-src/hexen/Makefile
-src/resource.rc
-src/setup-res.rc
-src/setup/Makefile
-src/setup/setup.desktop
-src/setup/setup-manifest.xml
-src/strife/Makefile
-textscreen/Makefile
-textscreen/examples/Makefile
-])
-