[libbluray-devel] Remove --disable-udf configure option

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Thu May 11 17:04:17 2017 +0300| [dec9a6bcf17e8ca34b3b2e3eab632a6e03832e8c] | committer: hpi1

Remove --disable-udf configure option

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=dec9a6bcf17e8ca34b3b2e3eab632a6e03832e8c
---

 Makefile.am               |  8 +-------
 configure.ac              | 18 ++----------------
 src/libbluray/disc/disc.c |  4 ----
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e7ea537e..b54fefe6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,11 +5,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-bdjava --enable-udf
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-if ENABLE_UDF
 POSIX_C_SOURCE=200809L
-else
-POSIX_C_SOURCE=200112L
-endif
 
 EXTRA_DIST = \
 	bootstrap \
@@ -40,7 +36,7 @@ libbluray_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(top_builddir)/src/libbluray \
 	$(BDJAVA_CFLAGS) \
-	$(UDF_CFLAGS) \
+	-I${top_srcdir}/contrib/libudfread/src/ \
 	$(LIBXML2_CFLAGS) \
 	$(FT2_CFLAGS) \
 	$(FONTCONFIG_CFLAGS)
@@ -188,7 +184,6 @@ pkginclude_HEADERS = \
 	src/libbluray/decoders/overlay.h \
 	src/util/log_control.h
 
-if ENABLE_UDF
 libbluray_la_SOURCES += \
 	src/libbluray/disc/udf_fs.h \
 	src/libbluray/disc/udf_fs.c\
@@ -200,7 +195,6 @@ libbluray_la_SOURCES += \
 	contrib/libudfread/src/ecma167.c \
 	contrib/libudfread/src/udfread.h \
 	contrib/libudfread/src/udfread.c
-endif
 
 
 if USING_BDJAVA
diff --git a/configure.ac b/configure.ac
index 9a50e9b4..11a5edcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,11 +86,6 @@ AC_ARG_ENABLE([bdjava],
   [use_bdjava=$enableval],
   [use_bdjava=yes])
 
-AC_ARG_ENABLE([udf],
-  [AS_HELP_STRING([--disable-udf], [disable UDF support @<:@default=enabled@:>@])],
-  [enable_udf=$enableval],
-  [enable_udf=yes])
-
 AC_ARG_ENABLE([bdjava-jar],
   [AS_HELP_STRING([--disable-bdjava-jar],
   [disable building of BD-Java JAR file @<:@default=enabled@:>@])],
@@ -254,23 +249,14 @@ dnl bootclasspath
 AC_SUBST(BDJ_BOOTCLASSPATH)
 
 dnl udf support (using git submodule)
-AS_IF([test "x$enable_udf" = "xyes"], [
     if test ! -f "${srcdir}/contrib/libudfread/src/udfread.h"; then
         AC_MSG_ERROR("libudfread source tree not found")
     fi
     AC_CHECK_HEADERS([unistd.h fcntl.h])
     AS_IF([test "${SYS}" != "mingw32"], [
-      AC_CHECK_FUNC([pread],, [AC_MSG_ERROR("Function pread not found. Try with --disable-udf.")])
+      AC_CHECK_FUNC([pread],, [AC_DEFINE([NEED_PREAD_IMPL], [1], [Define to 1 to use inefficient pread() replacement])])
     ])
 
-    AC_DEFINE([ENABLE_UDF], [1], [Define to 1 if libudfread is to be used for disc image access])
-    UDF_CFLAGS='-I${srcdir}/contrib/libudfread/src/'
-    AC_SUBST(UDF_CFLAGS)
-    ],
-  [enable_udf=no])
-
-AM_CONDITIONAL([ENABLE_UDF], [test $enable_udf = "yes" ])
-
 dnl generate documentation
 DX_INIT_DOXYGEN(libbluray, doc/doxygen-config, [doc/doxygen])
 
@@ -317,6 +303,6 @@ fi
 fi
 fi
 echo "  Metadata support (libxml2):    $with_libxml2"
-echo "  UDF filesystem support:        $enable_udf"
+echo "  UDF filesystem support:        yes"
 echo "  Build examples:                $use_examples"
 
diff --git a/src/libbluray/disc/disc.c b/src/libbluray/disc/disc.c
index f3f9d057..2906a0bd 100644
--- a/src/libbluray/disc/disc.c
+++ b/src/libbluray/disc/disc.c
@@ -38,9 +38,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef ENABLE_UDF
 #include "udf_fs.h"
-#endif
 
 struct bd_disc {
     BD_MUTEX  ovl_mutex;     /* protect access to overlay root */
@@ -314,7 +312,6 @@ BD_DISC *disc_open(const char *device_path,
 
         _set_paths(p, device_path);
 
-#ifdef ENABLE_UDF
         /* check if disc root directory can be opened. If not, treat it as device/image file. */
         BD_DIR_H *dp_img = device_path ? dir_open(device_path) : NULL;
         if (!dp_img) {
@@ -336,7 +333,6 @@ BD_DISC *disc_open(const char *device_path,
             dir_close(dp_img);
             BD_DEBUG(DBG_FILE, "%s does not seem to be image file or device node\n", device_path);
         }
-#endif
 
         struct dec_dev dev = { p->fs_handle, p->pf_file_open_bdrom, p, (file_openFp)disc_open_path, p->disc_root, device_path };
         p->dec = dec_init(&dev, enc_info, keyfile_path, regs, psr_read, psr_write);