Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken --enable-xxx 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1238 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2007-03-15 20:18:28 +00:00
parent 63838c8b2a
commit e293bf97a3
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
configure.ac
View File

@ -35,20 +35,20 @@ case $host_os in
host_os_darwin=yes
;;
esac
AM_CONDITIONAL([MINGW32], [test "x$host_os_mingw32" = "xyes"])
AM_CONDITIONAL([DARWIN], [test "x$host_os_darwin" = "xyes"])
AM_CONDITIONAL([MINGW32], test "x$host_os_mingw32" = "xyes")
AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes")
# Installation directories
AC_ARG_WITH(icondir,
AS_HELP_STRING([--with-icondir=DIR],[icon files [DATADIR/icons]]),
[], [ with_icondir=$datadir/icons ])
[ with_icondir=$withval ], [ with_icondir=$datadir/icons ])
AC_ARG_WITH(applicationdir,
AS_HELP_STRING([--with-applicationdir=DIR],[application files [DATADIR/applications]]),
[], [ with_applicationdir=$datadir/applications ])
[ with_applicationdir=$withval ], [ with_applicationdir=$datadir/applications ])
AC_SUBST(icondir, $with_icondir)
@ -60,6 +60,22 @@ fi
# Commandline options:
AC_ARG_ENABLE([data],
AS_HELP_STRING([--enable-data],[Build data packages [no]]),
[ enable_data=$enableval ], [ enable_data=no ])
AM_CONDITIONAL(DATA, test "x$enable_data" = "xyes")
AC_MSG_CHECKING([whether to build data packages])
AC_MSG_RESULT([$enable_data])
AC_ARG_ENABLE([installer],
AS_HELP_STRING([--enable-installer],[Build NSIS installer [no]]),
[ enable_installer=$enableval ], [ enable_installer=no ])
AM_CONDITIONAL(INSTALLER, test "x$enable_installer" = "xyes")
AC_MSG_CHECKING([whether to build NSIS installer])
AC_MSG_RESULT([$enable_installer])
AC_ARG_WITH(makensis,
AS_HELP_STRING([--with-makensis],[Path to makensis]))
@ -72,21 +88,6 @@ AC_ARG_WITH(installer_version,
AS_HELP_STRING([--with-installer-version],[Version of the installer. i.e. 1.2.3.4]))
AC_ARG_ENABLE([data],
AS_HELP_STRING([--enable-data],[Build data packages])
[], [ enable_data=no ])
AM_CONDITIONAL(DATA, test "x$enable_data" = "xyes")
AC_MSG_CHECKING([whether to build data packages])
AC_MSG_RESULT([$enable_data])
AC_ARG_ENABLE([installer],
AS_HELP_STRING([--enable-installer],[Build NSIS installer])
[], [ enable_installer=no ])
AM_CONDITIONAL(INSTALLER, test "x$enable_installer" = "xyes")
AC_MSG_CHECKING([whether to build NSIS installer])
AC_MSG_RESULT([$enable_installer])
if test "x$enable_installer" = "xyes" ; then
if test "x$with_makensis" = "x" ; then
AC_CHECK_TOOL([MAKENSIS], [makensis], [no])
@ -119,8 +120,8 @@ fi
# -Wno-unused-label is necessary because flex produces unused labels that we cannot fix
# Add later for stricter checking: -Wextra -Wmissing-declarations -Wstrict-prototypes
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug[=strict/yes/relaxed/no]],[Compile debug version [no]])
[], [ enable_debug=no ])
AS_HELP_STRING([--enable-debug[=strict/yes/relaxed/no]],[Compile debug version [no]]),
[ enable_debug=$enableval ], [ enable_debug=no ])
AC_MSG_CHECKING([whether to compile in debug mode])
AC_MSG_RESULT([$enable_debug])
if test "x$enable_debug" = "xyes" ; then
@ -219,6 +220,7 @@ else
AC_MSG_ERROR([OpenGL is currently mandatory])
fi
if test "x$enable_openal" != "xno" ; then
if test "x$host_os_darwin" = "xyes" ; then
AC_MSG_CHECKING([for OpenAL framework])