Apply patch for Debian from Samuel Thibault.

diff --git a/aclocal.m4 b/aclocal.m4
index 54a597861529d9b39aa9bcc3223d40fcabe69edc..18a83ad33befca3e529dfa4906e3ceef0c464b09 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -8114,7 +8114,7 @@ $$1_PKG_ERRORS
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT])dnl
+_PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
        AC_MSG_RESULT([no])
@@ -8125,7 +8125,7 @@ path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
         ])
 else
        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

diff --git a/configure b/configure
index bd44ac79a11b127270717f715400193f2e9cb9cd..00947c226a6a18ff519e767483f7bbe3419f739e 100755 (executable)
Binary files a/configure and b/configure differ

diff --git a/configure.in b/configure.in
index 96b6587109bd0f2824fcb8925ad69ec1f931d49a..44f59ca74b359b0639ccbfad712f7ed712518a85 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -368,7 +368,7 @@ case "${host_os}" in
               THREAD_CFLAGS="-mt"
               ;;
            *)
-              SHARED_FLAGS="-shared -fPIC"
+              SHARED_FLAGS="-fPIC"
               THREAD_CFLAGS="-pthread"
               ;;
         esac

diff --git a/ltmain.sh b/ltmain.sh
index 7ed280bc9525daa93de726e1100f11de4b113de2..fa4b1e1f8ae4378e5bc1119d65ac20337f2445fa 100644 (file)
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -65,7 +65,7 @@
 #       compiler:              $LTCC
 #       compiler flags:                $LTCFLAGS
 #       linker:                $LD (gnu? $with_gnu_ld)
-#       $progname:             (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#       $progname:             (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
 #       automake:              $automake_version
 #       autoconf:              $autoconf_version
 #
@@ -73,7 +73,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
 TIMESTAMP=""
 package_revision=1.3017