diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-05-27 02:05:43 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2006-05-27 02:05:43 +0000 |
| commit | be7a90d95b812ebdf732461249c6f591063e7ee9 (patch) | |
| tree | 192c5190d199afec7ad8b344c1407988f0bff5ed /configure.ac | |
| parent | 66b1ff6a9b9387efe54193567da1aa6e5a746c1b (diff) | |
| download | classpath-be7a90d95b812ebdf732461249c6f591063e7ee9.tar.gz | |
* configure.ac: Check for magic.h and -lmagic.
* vm/reference/java/net/VMURLConnection.java: New file.
* include/java_net_VMURLConnection.h: New file.
* include/Makefile.am (H_FILES): Add VMURLConnection.h.
($(top_srcdir)/include/java_net_VMURLConnection.h): New target.
* native/jni/java-net/Makefile.am (libjavanet_la_SOURCES):
Mention new file.
(libjavanet_la_LIBADD): Add $(LIBMAGIC).
* native/jni/java-net/java_net_VMURLConnection.c: New file.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index bdd30893a..c4b8412dd 100644 --- a/configure.ac +++ b/configure.ac @@ -289,7 +289,8 @@ if test "x${COMPILE_JNI}" = xyes; then sys/select.h \ crt_externs.h \ fcntl.h \ - sys/mman.h]) + sys/mman.h \ + magic.h]) AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t])) AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t])) @@ -307,6 +308,10 @@ if test "x${COMPILE_JNI}" = xyes; then mmap munmap mincore msync madvise getpagesize sysconf \ ]) + LIBMAGIC= + AC_CHECK_LIB(magic, magic_open, LIBMAGIC=-lmagic) + AC_SUBST(LIBMAGIC) + AC_HEADER_TIME AC_STRUCT_TM AC_STRUCT_TIMEZONE |