[Pkg-pulseaudio-devel] r106 - in /libasyncns/trunk/debian: control patches/01_resolv-configure-check.dpatch rules

[neurocyte-guest at users.alioth.debian.org]

Author: neurocyte-guest
Date: Tue Feb 20 11:31:46 2007
New Revision: 106

URL: http://svn.debian.org/wsvn/pkg-pulseaudio/?sc=1&rev=106
Log:
Add autoconf output to patch instead of running it at build time.

Modified:
    libasyncns/trunk/debian/control
    libasyncns/trunk/debian/patches/01_resolv-configure-check.dpatch
    libasyncns/trunk/debian/rules

Modified: libasyncns/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/libasyncns/trunk/debian/control?rev=106&op=diff
==============================================================================
--- libasyncns/trunk/debian/control (original)
+++ libasyncns/trunk/debian/control Tue Feb 20 11:31:46 2007
@@ -1,8 +1,7 @@
 Source: libasyncns
 Priority: optional
 Maintainer: CJ van den Berg <cj at vdbonline.com>
-Build-Depends: debhelper (>= 5), autotools-dev, dpatch, autoconf
-Build-Conflicts: autoconf2.13
+Build-Depends: debhelper (>= 5), autotools-dev, dpatch
 Standards-Version: 3.7.2
 Section: libs
 

Modified: libasyncns/trunk/debian/patches/01_resolv-configure-check.dpatch
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/libasyncns/trunk/debian/patches/01_resolv-configure-check.dpatch?rev=106&op=diff
==============================================================================
--- libasyncns/trunk/debian/patches/01_resolv-configure-check.dpatch (original)
+++ libasyncns/trunk/debian/patches/01_resolv-configure-check.dpatch Tue Feb 20 11:31:46 2007
@@ -6,10 +6,76 @@
 
 @DPATCH@
 
-Index: libasyncns/configure.ac
-===================================================================
---- libasyncns/configure.ac	(revision 30)
-+++ libasyncns/configure.ac	(working copy)
+diff -ur libasyncns-0.2-orig/configure libasyncns-0.2/configure
+--- libasyncns-0.2-orig/configure	2007-02-16 14:58:22.000000000 +0100
++++ libasyncns-0.2/configure	2007-02-20 11:05:38.000000000 +0100
+@@ -21662,6 +21662,52 @@
+   LIBS="-lresolv $LIBS"
+ 
+ else
++   save_libs="$LIBS"
++      LIBS="-lresolv $LIBS"
++      { echo "$as_me:$LINENO: checking for res_query in -lresolv (alternate version)" >&5
++echo $ECHO_N "checking for res_query in -lresolv (alternate version)... $ECHO_C" >&6; }
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <resolv.h>
++int
++main ()
++{
++res_query(0,0,0,0,0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++   { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	 { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++          LIBS="$save_libs"
+ 
+ { echo "$as_me:$LINENO: checking for res_query in -lbind" >&5
+ echo $ECHO_N "checking for res_query in -lbind... $ECHO_C" >&6; }
+@@ -21739,6 +21785,10 @@
+ 
+ fi
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
+ 
+ 
+ fi
+diff -ur libasyncns-0.2-orig/configure.ac libasyncns-0.2/configure.ac
+--- libasyncns-0.2-orig/configure.ac	2007-02-16 14:51:54.000000000 +0100
++++ libasyncns-0.2/configure.ac	2007-02-20 11:05:23.000000000 +0100
 @@ -96,8 +96,16 @@
  
  AC_CHECK_FUNC(res_query, , 

Modified: libasyncns/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/libasyncns/trunk/debian/rules?rev=106&op=diff
==============================================================================
--- libasyncns/trunk/debian/rules (original)
+++ libasyncns/trunk/debian/rules Tue Feb 20 11:31:46 2007
@@ -21,7 +21,6 @@
 
 config.status: patch-stamp configure
 	dh_testdir
-	autoconf
 	./configure $(CONFIGURE_FLAGS)
 
 build: build-stamp