summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorRoberto C. Sanchez <roberto@connexer.com>2014-03-29 10:54:01 -0400
committerRoberto C. Sanchez <roberto@connexer.com>2014-03-29 10:54:01 -0400
commit71a39f4652cd51df814c930dd268f3c9ad2aee86 (patch)
tree5994350a603908c4e4d660bc9d72c4ec43dd648e /configure.ac
parent03134fa5f6f25d92724ce4c183f9bbe12a9e37dc (diff)
Imported Upstream version 1.6.0+dfsg
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac15
1 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 6a92a04..1f5a565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
# Version change: Change line 8 only !
# Change it immediately after a release
-AC_INIT(sword, 1.5.11, sword-bugs@crosswire.org)
+AC_INIT(sword, 1.6.0, sword-bugs@crosswire.org)
AC_CONFIG_SRCDIR(sword.bmp)
AC_PREREQ(2.52)
AC_REVISION($Revision: 1.45 $)
@@ -15,6 +15,7 @@ AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(include/config.h)
+AC_CONFIG_MACRO_DIR([m4])
# ---------------------------------------------------------------------
# Check Programs
@@ -80,18 +81,18 @@ AM_MAINTAINER_MODE
if test x$enable_debug = xyes; then
GCJFLAGS="-g -O0"
if test x$ac_cv_prog_cc_g = xyes; then
- AM_CFLAGS="-g3 -O0 -Wall"
+ AM_CFLAGS="-g3 -O0 -Wall -Werror"
else
- AM_CFLAGS="-O0 -Wall"
+ AM_CFLAGS="-O0 -Wall -Werror"
fi
if test x$ac_cv_prog_cxx_g = xyes; then
- AM_CXXFLAGS="-g3 -O0 -Wall"
+ AM_CXXFLAGS="-g3 -O0 -Wall -Werror"
else
- AM_CXXFLAGS="-O0 -Wall"
+ AM_CXXFLAGS="-O0 -Wall -Werror"
fi
else
- AM_CFLAGS="-O2"
- AM_CXXFLAGS="-O2"
+ AM_CFLAGS="-O3"
+ AM_CXXFLAGS="-O3"
fi
# ---------------------------------------------------------------------