avifile (1:0.7.48~20090503.ds-2) autotools.patch

Description: Various autotools-related fixes
 Always build with -g.
 Fix autoreconf failure with autoconf/2.64.
 Link against fontconfig to avoid unresolved symbols.
 Fix FTBFS with binutils-gold.
Author: Yavor Doganov <yavor@gnu.org>
Last-Update: 2009-11-02

2009-11-02  Yavor Doganov  <yavor@gnu.org>

	* configure.in: Don't perform -g surgery on CFLAGS/CXXFLAGS.
	(win32, x86opt): Use quadrigrpaphs and properly quote
	AC_ARG_ENABLE arguments.
	(xft): Append -lfontconfig to XFT_LIBS.
	* autogen.sh: Exit with an error if autoreconf fails.
	* libavqt/Makefile.am (LINK_AVIPLAY): Remove AMM_LINK_SHARED
	conditional.
	* samples/misc/Makefile.am (avibench_LDADD):
	* samples/qtvidcap/Makefile.am (kv4lsetup_LDADD)
	(avirec_LDADD, avicap_LDADD): Add $(X_LIBS).

--- avifile-0.7.48~20090503.ds.orig/configure.in
+++ avifile-0.7.48~20090503.ds/configure.in
@@ -477,7 +477,10 @@
     dnl this is another funny modification of the Xft2 installation
     dnl after roughly 3 months they have again changed configuration
     dnl and Debian is properly supporting only pkg-config
-    PKG_CHECK_MODULES(XFT, xft, [], AC_MSG_RESULT([reverting to use xft-config]))
+    ## Linking against libfontconfig is necessary, but -lfontconfig is
+    ## not in xft.pc's Libs, at least on Debian.
+    PKG_CHECK_MODULES([XFT], [xft], [XFT_LIBS="$XFT_LIBS -lfontconfig"],
+      [AC_MSG_RESULT([reverting to use xft-config])])
 
     if test -z "$XFT_LIBS"; then
 	dnl xft2 is a bit tricky and introduces  xft-config
@@ -730,7 +733,8 @@
 dnl ======================================
 dnl Check for Win32 dll libraries & plugin
 dnl ======================================
-AC_ARG_ENABLE(win32, AC_HELP_STRING(--enable-win32, [build Win DLLs plugin. [[arch specific]]]))
+AC_ARG_ENABLE([win32], [AS_HELP_STRING([--enable-win32],
+		       [build Win DLLs plugin. @<:@arch specific@:>@])])
 AC_ARG_WITH(win32_path, AC_HELP_STRING(--with-win32-path=PATH, [where Windows DLL files are located. [[=/usr/lib/win32]]]),
 	    WIN32_PATH=$withval, WIN32_PATH="/usr/lib/win32")
 AC_SUBST(WIN32_PATH)
@@ -748,8 +752,9 @@
     AC_IF_YES(enableval, AC_DEFINE(QUIET, 1, [Define if you want to have quiet library.]))
 )
 
-AC_ARG_ENABLE(x86opt, AC_HELP_STRING(--disable-x86opt, [x86 optimizations MMX,MMX2,SSE... [[arch specific]]]),
-	      [], enable_x86opt=yes)
+AC_ARG_ENABLE([x86opt], [AS_HELP_STRING([--disable-x86opt],
+			[x86 optimizations MMX,MMX2,SSE... @<:@arch specific@:>@])],
+	      [], [enable_x86opt=yes])
 
 
 dnl ======================
@@ -921,10 +926,6 @@
     dnl this is for my yet released kprof profiler
 	PROFFLAG="-finstrument-functions "
     fi
-else
-    CFLAGS=`echo $CFLAGS | sed s/-g//`
-    CXXFLAGS=`echo $CXXFLAGS | sed s/-g//`
-    FFMPEG_CFLAGS=`echo $FFMPEG_CFLAGS | sed s/-g//`
 fi
 
 WIN32_CFLAGS=`echo $CFLAGS | sed s/-fomit-frame-pointer//g`
--- avifile-0.7.48~20090503.ds.orig/autogen.sh
+++ avifile-0.7.48~20090503.ds/autogen.sh
@@ -203,4 +203,5 @@
     $use_aclocal --print-ac-dir
     echo "Please report your problem on kabi@users.sourceforge.net"
     echo "with this log of build process together with system description."
+    exit 1
 fi
--- avifile-0.7.48~20090503.ds.orig/libavqt/Makefile.am
+++ avifile-0.7.48~20090503.ds/libavqt/Makefile.am
@@ -22,9 +22,7 @@
 # hierarchyview.cpp \
 # propertyeditor.cpp
 
-if AMM_LINK_SHARED
 LINK_AVIPLAY = ../lib/libaviplay.la
-endif
 
 #testt
 
--- avifile-0.7.48~20090503.ds.orig/samples/misc/Makefile.am
+++ avifile-0.7.48~20090503.ds/samples/misc/Makefile.am
@@ -4,7 +4,7 @@
 # ae test plustest imtest qualtest
 #asfdump_SOURCES=asfdump.cpp
 #asftest_SOURCES=asftest.cpp
-avibench_LDADD = $(LIBRARY)
+avibench_LDADD = $(LIBRARY) $(X_LIBS)
 avibench_SOURCES = benchmark.cpp
 avicat_LDADD = $(LIBRARY)
 avicat_SOURCES = avicat.cpp
--- avifile-0.7.48~20090503.ds.orig/samples/qtvidcap/Makefile.am
+++ avifile-0.7.48~20090503.ds/samples/qtvidcap/Makefile.am
@@ -70,7 +70,7 @@
 
 avicap_LDADD =\
  ../../libavqt/libqavm.la\
- $(QT_LIBS) $(LIBRARY)
+ $(QT_LIBS) $(LIBRARY) $(X_LIBS)
 
 avirec_SOURCES =\
  deinterlace-rgb.cpp\
@@ -87,10 +87,10 @@
  v4lxif.h\
  wintv.h\
  qt_visual.c
-avirec_LDADD = $(LIBRARY)
+avirec_LDADD = $(LIBRARY) $(X_LIBS)
 
 kv4lsetup_SOURCES = kv4lsetup.cpp
-kv4lsetup_LDADD = $(LIBRARY)
+kv4lsetup_LDADD = $(LIBRARY) $(X_LIBS)
 
 #install-exec-local:
 #	@INSTALL@ -m4755 ./kv4lsetup $(DESTDIR)@bindir@