Bug#261315: glib1.2: libtool update for GNU/k*BSD - patch against 1.2.10-14

[Petr Salinger]

tags 261315 + patch
retitle 261315 glib1.2(GNU/k*BSD): FTBFS: out of date libtool scripts
thanks

Hi,

enclosed please find patch against 1.2.10-14,
it contains both fixed libtool for GNU/kFreeBSD
and fixed underquoted glib.m4.

Many thanks

                Petr
only in patch2:
unchanged:
--- glib1.2-1.2.10.orig/glib.m4
+++ glib1.2-1.2.10/glib.m4
@@ -5,7 +5,7 @@
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
 dnl gthread is specified in MODULES, pass to glib-config
 dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
 [dnl 
 dnl Get the cflags and libraries from the glib-config script
 dnl
only in patch2:
unchanged:
--- glib1.2-1.2.10.orig/ltconfig
+++ glib1.2-1.2.10/ltconfig
@@ -1957,7 +1957,7 @@
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux-gnu*|kfreebsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
diff -u glib1.2-1.2.10/aclocal.m4 glib1.2-1.2.10/aclocal.m4
--- glib1.2-1.2.10/aclocal.m4
+++ glib1.2-1.2.10/aclocal.m4
@@ -2278,7 +2278,7 @@
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux-gnu*|kfreebsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -3491,7 +3491,7 @@
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux-gnu*|kfreebsd*-gnu)
   case $host_cpu in
   alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
     lt_cv_deplibs_check_method=pass_all ;;
diff -u glib1.2-1.2.10/configure glib1.2-1.2.10/configure
--- glib1.2-1.2.10/configure
+++ glib1.2-1.2.10/configure
@@ -1873,7 +1873,7 @@
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux-gnu*|kfreebsd*-gnu)
   case $host_cpu in
   alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
     lt_cv_deplibs_check_method=pass_all ;;
@@ -4127,7 +4127,7 @@
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux-gnu*|kfreebsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no