Disable glibc runtime check if configure passed due to disable-{nls, mozilla}

Signed-off-by: David Flynn <davidf@rd.bbc.co.uk>
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

diff --git a/configure.ac b/configure.ac
index 7328ccff49d6286cb68b0da7e29ce7113198619c..36e9840fd1b2fd1837785c2f1501f6959e1e0b2d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -559,6 +559,8 @@ AC_PREPROC_IFELSE([
 work-around for this. Check with your distribution vendor on how to update the
 glibc run-time. Alternatively, build with --disable-nls --disable-mozilla and
 be sure to not use LibVLC from other applications/wrappers.])
+  ], [
+    AC_DEFINE(DISABLE_BUGGY_GLIBC_CHECK, 1, [Disables runtime check for buggy glibc.])
   ])
 ])
 

diff --git a/src/misc/linux_specific.c b/src/misc/linux_specific.c
index a9165c1b3171a2b6a3585f36e3b4a719b18a6e74..79c880742b1dc4635f68a2899541e5b379cf5109 100644 (file)
--- a/src/misc/linux_specific.c
+++ b/src/misc/linux_specific.c
@@ -90,7 +90,9 @@ void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[])
         fputs ("LibVLC has detected an unusable buggy GNU/libc version.\n"
                "Please update to version 2.8 or newer.\n", stderr);
         fflush (stderr);
+#ifndef DISABLE_BUGGY_GLIBC_CHECK
         abort ();
+#endif
     }
 #endif