Use the new forms of AC_INIT and AM_INIT_AUTOMAKE. Do not bother defining the package and version variables, we do that ourself. Add the datadir to the CPPFLAGS.
This commit is contained in:
@@ -1,11 +1,10 @@
|
|||||||
# only tested with autoconf 2.57
|
AC_PREREQ(2.59)
|
||||||
AC_PREREQ(2.60)
|
AC_INIT(StepMania, CVS, [[email protected]], StepMania)
|
||||||
AC_INIT
|
|
||||||
AC_CONFIG_SRCDIR([src/StepMania.cpp])
|
AC_CONFIG_SRCDIR([src/StepMania.cpp])
|
||||||
AC_CONFIG_AUX_DIR(autoconf)
|
AC_CONFIG_AUX_DIR(autoconf)
|
||||||
AC_CANONICAL_TARGET
|
AC_CANONICAL_TARGET
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE(StepMania, 3.001)
|
AM_INIT_AUTOMAKE([no-define])
|
||||||
AC_CONFIG_HEADERS([src/config.h])
|
AC_CONFIG_HEADERS([src/config.h])
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
|
||||||
@@ -22,6 +21,7 @@ AM_PROG_CC_C_O
|
|||||||
test "$DEFAULT_CFLAGS" = "yes" && CFLAGS="-Wall -W -Wno-unused -Wno-switch"
|
test "$DEFAULT_CFLAGS" = "yes" && CFLAGS="-Wall -W -Wno-unused -Wno-switch"
|
||||||
test "$DEFAULT_CXXFLAGS" = "yes" && CXXFLAGS="-Wall -W -Wno-unused -Wno-switch"
|
test "$DEFAULT_CXXFLAGS" = "yes" && CXXFLAGS="-Wall -W -Wno-unused -Wno-switch"
|
||||||
test "$DEFAULT_LDFLAGS" = "yes" && LDFLAGS=""
|
test "$DEFAULT_LDFLAGS" = "yes" && LDFLAGS=""
|
||||||
|
CPPFLAGS="$CPPFLAGS -DDATADIR=\"${datadir}\""
|
||||||
|
|
||||||
compile=release
|
compile=release
|
||||||
AC_ARG_WITH(debug, AS_HELP_STRING([--with-debug],[Enable debug mode]), with_debug=$withval, with_debug=no)
|
AC_ARG_WITH(debug, AS_HELP_STRING([--with-debug],[Enable debug mode]), with_debug=$withval, with_debug=no)
|
||||||
|
|||||||
Reference in New Issue
Block a user