From 9fe944471ab5828c0e4564780a57173a70cc4506 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Thu, 25 Jan 2007 19:51:33 +0000 Subject: configure, [...]: Rebuilt. 2007-01-25 Andrew Haley * configure, Makefile.in, include/config.h.in: Rebuilt. * Makefile.am (libgcj_la_LIBADD): Removed $(LIBMAGIC). * configure.ac: Don't check for libmagic. * java/net/natVMURLConnection.cc (p_magic_open, p_magic_load, p_magic_close, p_magic_buffer): New globals. (init): Look up 'magic' functions. (guessContentTypeFromBuffer): Updated. From-SVN: r121183 --- libjava/include/Makefile.in | 1 - libjava/include/config.h.in | 3 --- 2 files changed, 4 deletions(-) (limited to 'libjava/include') diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 6d82df3..50e054a 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -171,7 +171,6 @@ LIBGCJ_LD_SYMBOLIC_FUNCTIONS = @LIBGCJ_LD_SYMBOLIC_FUNCTIONS@ LIBGCJ_SPEC = @LIBGCJ_SPEC@ LIBICONV = @LIBICONV@ LIBLTDL = @LIBLTDL@ -LIBMAGIC = @LIBMAGIC@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index 3b6e891..6a5bc96 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -187,9 +187,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MAGIC_H -/* Define if you have magic_open(). */ -#undef HAVE_MAGIC_OPEN - /* Define to 1 if you have the `memcpy' function. */ #undef HAVE_MEMCPY -- cgit v1.1