blob: 882f7cf5685b4d034a9a93f79f5b126fe9cc596c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
$NetBSD: patch-configure.ac,v 1.5 2016/12/06 15:21:00 ryoon Exp $
* Adapt ant path for pkgsrc.
--- configure.ac.orig 2016-10-28 14:50:26.000000000 +0000
+++ configure.ac
@@ -6069,14 +6069,14 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG
], [AC_MSG_RESULT([no])])
AC_LANG_POP([C++])
- AC_MSG_CHECKING([whether $CXX defines __cxa_exceptions in cxxabi.h])
+ AC_MSG_CHECKING([whether $CXX defines __cxa_exception in cxxabi.h])
AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
#include <cstddef>
#include <cxxabi.h>
- std::size_t f() { return sizeof(__cxxabiv1::__cxa_exceptions); }
+ std::size_t f() { return sizeof(__cxxabiv1::__cxa_exception); }
])], [
- AC_DEFINE([HAVE_CXXABI_H_CXA_EXCEPTIONS],[1])
+ AC_DEFINE([HAVE_CXXABI_H_CXA_EXCEPTION],[1])
AC_MSG_RESULT([yes])
], [AC_MSG_RESULT([no])])
AC_LANG_POP([C++])
@@ -11966,8 +11966,8 @@ EOF
dnl Checking for ant.jar
if test "$ANT_HOME" != "NO_ANT_HOME"; then
AC_MSG_CHECKING([Ant lib directory])
- if test -f $ANT_HOME/lib/ant.jar; then
- ANT_LIB="$ANT_HOME/lib"
+ if test -f $ANT_HOME/lib/java/ant/ant.jar; then
+ ANT_LIB="$ANT_HOME/lib/java/ant"
else
if test -f $ANT_HOME/ant.jar; then
ANT_LIB="$ANT_HOME"
|
