libbluray/libbluray-autotools.patch

65 lines
1.9 KiB
Diff

--- configure.ac.orig 2014-12-17 18:01:33.515364222 +0100
+++ configure.ac 2014-12-17 18:01:33.523364060 +0100
@@ -102,9 +102,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
@@ -119,23 +120,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"], [
--- src/Makefile.am.orig 2014-12-17 18:01:35.803318166 +0100
+++ src/Makefile.am 2014-12-17 18:01:35.831317614 +0100
@@ -1,7 +1,7 @@
-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT
SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray -Ilibbluray/bdnav $(BDJAVA_CFLAGS)
-AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) $(FT2_CFLAGS)
+AM_CFLAGS = -pthread $(LIBXML2_CFLAGS) $(FT2_CFLAGS)
+AM_CPPFLAGS = $(SET_INCLUDES) -include config.h
EXTRA_DIST = \
libbluray/bdj/build.xml \
@@ -120,8 +120,8 @@
endif
-libbluray_la_LDFLAGS= -version-info $(LT_VERSION_INFO)
-libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS)
+libbluray_la_LDFLAGS= -no-undefined -version-info $(LT_VERSION_INFO)
+libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS) -ldl
pkginclude_HEADERS = \
file/filesystem.h \