diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2010-01-30 01:33:49 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2010-01-30 01:33:49 +0000 |
| commit | ec35e91f1d1ef06008da3b60c49d7f0642b9c8db (patch) | |
| tree | 6f37eaa4350b6be303c36b33ffbb064711d02bfc /configure.ac | |
| parent | 7934156fac05ab9295651cba242605ded918554c (diff) | |
| download | classpath-ec35e91f1d1ef06008da3b60c49d7f0642b9c8db.tar.gz | |
Update GNU Classpath build system to handle newer autotools.
2010-01-30 Andrew John Hughes <ahughes@redhat.com>
* autogen.sh:
Allow libtool 2.* through.
* configure.ac:
Updated via autoupdate.
* m4/lib-ld.m4,
* m4/lib-link.m4,
* m4/lib-prefix.m4:
Drop old libtool macros which
result in build failure.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 1ad83508f..fd807166a 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,7 @@ dnl define([AC_CACHE_SAVE], )dnl AC_INIT([GNU Classpath],[0.99-pre],[classpath@gnu.org],[classpath]) AC_CONFIG_SRCDIR(java/lang/System.java) +AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_TARGET @@ -36,7 +37,7 @@ AC_SUBST(CLASSPATH_MODULE) CLASSPATH_CONVENIENCE="-no-undefined" AC_SUBST(CLASSPATH_CONVENIENCE) -AC_PREREQ(2.59) +AC_PREREQ(2.65) AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability]) AC_CONFIG_HEADERS([include/config.h]) AC_PREFIX_DEFAULT(/usr/local/classpath) @@ -376,7 +377,7 @@ dnl ----------------------------------------------------------- AC_PROG_CXX dnl Initialize libtool AC_DISABLE_STATIC -AC_PROG_LIBTOOL +LT_INIT AC_PROG_AWK AC_PROG_CC AM_PROG_CC_C_O @@ -690,35 +691,26 @@ if test "x${COMPILE_JNI}" = xyes; then dnl Check for MSG_NOSIGNAL dnl ********************************************************************** AC_MSG_CHECKING(for MSG_NOSIGNAL) - AC_TRY_COMPILE([#include <sys/socket.h>], - [ int f = MSG_NOSIGNAL; ], - [ AC_MSG_RESULT(yes) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[ int f = MSG_NOSIGNAL; ]])],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_MSG_NOSIGNAL, 1, - [Define this symbol if you have MSG_NOSIGNAL]) ], - [ AC_MSG_RESULT(no)] - ) + [Define this symbol if you have MSG_NOSIGNAL]) ],[ AC_MSG_RESULT(no) + ]) dnl ********************************************************************** dnl Check for SO_NOSIGPIPE (Darwin equivalent for MSG_NOSIGNAL) dnl ********************************************************************** AC_MSG_CHECKING(for SO_NOSIGPIPE ) - AC_TRY_COMPILE([#include <sys/socket.h>], - [ int f = SO_NOSIGPIPE; ], - [ AC_MSG_RESULT(yes) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[ int f = SO_NOSIGPIPE; ]])],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SO_NOSIGPIPE, 1, - [Define this symbol if you have SO_NOSIGPIPE]) ], - [ AC_MSG_RESULT(no)] - ) + [Define this symbol if you have SO_NOSIGPIPE]) ],[ AC_MSG_RESULT(no) + ]) dnl ********************************************************************** dnl Check for MSG_WAITALL dnl ********************************************************************** AC_MSG_CHECKING(for MSG_WAITALL) - AC_TRY_COMPILE([#include <sys/socket.h>], - [ int f = MSG_WAITALL; ], - [ AC_MSG_RESULT(yes) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[ int f = MSG_WAITALL; ]])],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_MSG_WAITALL, 1, - [Define this symbol if you have MSG_WAITALL]) ], - [ AC_MSG_RESULT(no)] - ) + [Define this symbol if you have MSG_WAITALL]) ],[ AC_MSG_RESULT(no) + ]) dnl Check for plugin support headers and libraries. if test "x${COMPILE_PLUGIN}" = xyes; then |