[SCM] vlc/master: Prevent m4 errors in dh_autoreconf

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Jul 24 13:50:32 UTC 2013


The following commit has been merged in the master branch:
commit c1b3cad1a1880bb13052b958c86e44468f96da51
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jul 24 15:41:15 2013 +0200

    Prevent m4 errors in dh_autoreconf

diff --git a/debian/patches/configure-m4-undefine.patch b/debian/patches/configure-m4-undefine.patch
new file mode 100644
index 0000000..17fbda9
--- /dev/null
+++ b/debian/patches/configure-m4-undefine.patch
@@ -0,0 +1,16 @@
+Description: Guard m4_undefine with m4_ifdef
+ Otherwise m4 fails with m4_undefine: undefined macro: AC_DEPLIBS_CHECK_METHOD.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2013-07-24
+
+--- vlc-2.0.7.orig/configure.ac
++++ vlc-2.0.7/configure.ac
+@@ -411,7 +411,7 @@ LT_INIT([dlopen win32-dll shared disable
+ LT_LANG([C++])
+ LT_LANG([Windows Resource])
+ 
+-m4_undefine([AC_DEPLIBS_CHECK_METHOD])
++m4_ifdef([AC_DEPLIBS_CHECK_METHOD], [m4_undefine([AC_DEPLIBS_CHECK_METHOD])])
+ m4_defun([AC_DEPLIBS_CHECK_METHOD],[])
+ 
+ lt_cv_deplibs_check_method=pass_all
diff --git a/debian/patches/series b/debian/patches/series
index 83b3ec2..a4beb2e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ v4l-kfreebsd.patch
 link-binaries-with-c++.patch
 fix-ftbfs-flac-1.3.patch
 dvbpsi.patch
+configure-m4-undefine.patch

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list