SHA256
1
0
forked from pool/libbluray
libbluray/libbluray-autotools.patch

68 lines
2.1 KiB
Diff

--- configure.ac.orig 2015-04-10 08:48:23.000000000 +0200
+++ configure.ac 2015-04-30 13:56:24.249955300 +0200
@@ -111,9 +111,10 @@
[BDJ_BOOTCLASSPATH=])
dnl required programs
-AC_PROG_CC
+AC_PROG_CC_STDC
AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
+AC_USE_SYSTEM_EXTENSIONS
+LT_INIT([disable-static pic-only])
dnl required types
AC_TYPE_SIGNAL
@@ -128,23 +129,12 @@
dnl required system services
AC_SYS_LARGEFILE
+AC_FUNC_FSEEKO
dnl required functions
AC_CHECK_FUNC([snprintf],, [AC_MSG_ERROR($function_not_found)])
-dnl required libraries
-dnl pthreads (not on win32)
-AS_IF([test "${SYS}" != "mingw32"], [
- AC_CHECK_HEADERS([pthread.h], ,
- [AC_MSG_ERROR([pthread required])])
- AC_SEARCH_LIBS([pthread_create], [pthread], ,
- [AC_MSG_ERROR([pthread required])])
- AC_SEARCH_LIBS([dlopen], [dl])
- DLOPEN_LIBS="$ac_cv_search_dlopen"
- AS_CASE([$DLOPEN_LIBS],
- [no|none\ required], [DLOPEN_LIBS=""])
- AC_SUBST([DLOPEN_LIBS])
-])
+AC_CHECK_HEADERS_ONCE([pthread.h])
dnl libxml2 for metadata parser
AS_IF([test "x$with_libxml2" != "xno"], [
--- Makefile.am.orig 2015-03-20 11:50:37.000000000 +0100
+++ Makefile.am 2015-04-30 13:56:25.578037800 +0200
@@ -11,10 +11,10 @@
POSIX_C_SOURCE=200112L
endif
-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) -D_REENTRANT
SET_INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/libbluray -I$(top_builddir)/src/libbluray $(BDJAVA_CFLAGS)
-AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(UDF_CFLAGS)
+AM_CFLAGS = -pthread $(LIBXML2_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(UDF_CFLAGS)
+AM_CPPFLAGS = $(SET_INCLUDES) -include config.h
EXTRA_DIST = \
bootstrap \
@@ -149,8 +149,8 @@
endif
endif
-libbluray_la_LDFLAGS= -version-info $(LT_VERSION_INFO) -export-symbols-regex "^bd_"
-libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS) $(FONTCONFIG_LIBS)
+libbluray_la_LDFLAGS= -no-undefined -version-info $(LT_VERSION_INFO)
+libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS) $(FONTCONFIG_LIBS) -ldl
noinst_HEADERS = \
jni/jni.h \