summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-07-18 21:07:15 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-07-18 21:07:15 +0100
commit15c812fce3fba2d69f55c18cd6a625a994b90c93 (patch)
tree0e80893424c9bd94cace2da5089e3b8ee5e3e2f8
parentbf1d3435b5824e010120b67c9aec40ea5d1ec29b (diff)
downloadnspr-15c812fce3fba2d69f55c18cd6a625a994b90c93.tar.gz
jhbuild/patches/nspr.config_64bits.patch
Enable 64-bit by default on 64-bit systems.
-rw-r--r--configure.in21
1 files changed, 18 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index d515e35..9df3682 100644
--- a/configure.in
+++ b/configure.in
@@ -57,7 +57,7 @@ USE_PTHREADS=
USE_USER_PTHREADS=
USE_NSPR_THREADS=
USE_N32=
-USE_64=
+USE_64=maybe
USE_CPLUS=
USE_IPV6=
USE_MDUPDATE=
@@ -334,11 +334,26 @@ AC_ARG_ENABLE(n32,
fi ])
AC_ARG_ENABLE(64bit,
- [ --enable-64bit Enable 64-bit support (on certain platforms)],
- [ if test "$enableval" = "yes"; then
+ [ --disable-64bit Disable 64-bit support (on 64-bit platforms)],
+ [ if test "$enableval" = "no"; then
+ USE_64=
+ else
USE_64=1
fi ])
+if test "${USE_64}"; then
+ AC_MSG_CHECKING(for 64-bit OS)
+ AC_TRY_COMPILE([],[int assert[(sizeof(long) == 8) ? 1: -1]],
+ result="yes", result="no")
+ AC_MSG_RESULT("$result")
+ if test "$result" = "no" && test "$USE_64" = 1; then
+ AC_MSG_ERROR([Can't --enable-64bit on non 64-bit platforms])
+ fi
+ if test "$result" = "yes"; then
+ USE_64=1
+ fi
+fi
+
AC_ARG_ENABLE(mdupdate,
[ --enable-mdupdate Enable use of certain compilers' mdupdate feature],
[ if test "$enableval" = "yes"; then