- release 9

[packages/avidemux.git] / avidemux-autoconf.patch

diff -urN avidemux-2.1.2.org/admin/detect-autoconf.sh avidemux-2.1.2/admin/detect-autoconf.sh
--- avidemux-2.1.2.org/admin/detect-autoconf.sh	2005-07-02 14:41:15.000000000 +0200
+++ avidemux-2.1.2/admin/detect-autoconf.sh	2007-01-04 17:16:16.539072500 +0100
@@ -21,16 +21,16 @@
     AUTOCONF="`$WHICH autoconf253`"
   elif test -x "`$WHICH autoconf-2.52`" ; then
     AUTOCONF="`$WHICH autoconf-2.52`"
-  elif test -x "`$WHICH autoconf2.50`" ; then
-    AUTOCONF="`$WHICH autoconf2.50`"
+  elif test -x "`$WHICH autoconf`" ; then
+    AUTOCONF="`$WHICH autoconf`"
   fi
 }
 
 checkAutoheader()
 {
-  if test -x "`$WHICH autoheader-2.5x`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.5x`"
-    AUTOM4TE="`$WHICH autom4te-2.5x`"
+  if test -x "`$WHICH autoheader`" ; then
+    AUTOHEADER="`$WHICH autoheader`"
+    AUTOM4TE="`$WHICH autom4te`"
   elif test -x "`$WHICH autoheader-2.53`" ; then
     AUTOHEADER="`$WHICH autoheader-2.53`"
     AUTOM4TE="`$WHICH autom4te-2.53`"
@@ -47,9 +47,9 @@
 checkAutomakeAclocal ()
 {
   if test -z "$UNSERMAKE"; then
-    if test -x "`$WHICH automake-1.8`" ; then
-      AUTOMAKE="`$WHICH automake-1.8`"
-      ACLOCAL="`$WHICH aclocal-1.8`"
+    if test -x "`$WHICH automake`" ; then
+      AUTOMAKE="`$WHICH automake`"
+      ACLOCAL="`$WHICH aclocal`"
     elif test -x "`$WHICH automake-1.7`" ; then
       AUTOMAKE="`$WHICH automake-1.7`"
       ACLOCAL="`$WHICH aclocal-1.7`"
--- avidemux_2.4.4/configure.in.in.orig	2009-02-06 20:07:37.000000000 +0100
+++ avidemux_2.4.4/configure.in.in	2009-04-14 04:20:30.000000000 +0200
@@ -37,6 +37,7 @@
 
 dnl Perform program name transformation
 AC_ARG_PROGRAM
+AC_GNU_SOURCE
 dnl Automake doc recommends to do this only here. (Janos)
 AM_INIT_AUTOMAKE(avidemux,"2.4.4")
 ADM_SUBVERSION="0"
@@ -120,7 +121,7 @@
 
 
 dnl _________________ gettext _________________
-AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT
 GETTEXT_PACKAGE=avidemux
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [gettext package name])
 ADM_LOCALEDIR=${datadir}/locale
@@ -239,7 +240,8 @@
   *)
     AC_MSG_NOTICE(I'm assuming this is Linux)
     AC_PATH_XTRA
-    QTLIBS="-Wl,-rpath,$QTEXTRALIB -L$QTEXTRALIB -lQtGui  -lQtCore $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS  -lpthread"
+    QTLIBS=`$PKG_CONFIG QtGui --libs`
+    QTLIBS="-Wl,-rpath,$QTEXTRALIB -L$QTEXTRALIB $X_EXTRA_LIBS $QTLIBS"
     QTINC="-I$QTEXTRAINC -I$QTEXTRAINC/QtGui -I$QTEXTRAINC/QtCore -I$QTEXTRAINC/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I$QTEXTRAINC"
     QTBIN="$QTDIR/bin"
     ;;