← Back to branch summary

~ubuntu-branches/ubuntu/hardy/kdeartwork/hardy-backports

« back to all changes in this revision

Viewing changes to debian/patches/common/03_libtool_update.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2007-05-23 16:01:05 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20070523160105-ev2i2rmvb2en06xe
Tags: 4:3.5.7-1ubuntu1
Merge with Debian for new upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/common/03_libtool_update.diff
1
1
diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
2
 
--- a/admin/libtool.m4.in       2006-03-17 16:38:41.000000000 -0500
3
 
+++ b/admin/libtool.m4.in       2006-03-24 19:22:40.000000000 -0500
 
2
--- a/admin/libtool.m4.in       2007-05-14 12:58:18.000000000 +0200
 
3
+++ b/admin/libtool.m4.in       2007-05-14 23:36:38.000000000 +0200
4
4
@@ -1,28 +1,13 @@
5
5
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
6
6
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
685
685
-  libsuff=
686
686
-  if test "x$LINUX_64_MODE" = x64; then
687
687
-    # Some platforms are per default 64-bit, so there's no /lib64
688
 
-    if test -d /lib64; then
 
688
-    if test -d /lib64 -a ! -h /lib64; then
689
689
-      libsuff=64
690
690
-    fi
691
691
-  fi
3795
3795
   lt_ac_count=0
3796
3796
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
3797
3797
diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
3798
 
--- a/admin/ltmain.sh   2006-03-17 16:38:41.000000000 -0500
3799
 
+++ b/admin/ltmain.sh   2006-03-24 19:22:40.000000000 -0500
 
3798
--- a/admin/ltmain.sh   2007-05-14 12:58:18.000000000 +0200
 
3799
+++ b/admin/ltmain.sh   2007-05-14 23:36:38.000000000 +0200
3800
3800
@@ -1,7 +1,7 @@
3801
3801
 # ltmain.sh - Provide generalized library-building support services.
3802
3802
 # NOTE: Changing this file will not affect anything until you rerun configure.