2005-06-26 Tollef Fog Heen <tfheen@err.no>

Author: tfheen
Date: 2005-06-26 18:42:54 GMT
2005-06-26  Tollef Fog Heen  <tfheen@err.no>

    * glib-patches/configure.in-fd_set.diff: Patch to grep for fd_set
    rather than fd_mask.  Thanks to David Wolfe for the fix.  This
    should make pkg-config happier on QNX.

diff --git a/ChangeLog b/ChangeLog
index e97a653d1116ab0fcdee926875c77cfa6235af88..606af0f0c3de7bd918a41b31bf8fd53154c3966a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-26  Tollef Fog Heen  <tfheen@err.no>
+
+       * glib-patches/configure.in-fd_set.diff: Patch to grep for fd_set
+       rather than fd_mask.  Thanks to David Wolfe for the fix.  This
+       should make pkg-config happier on QNX.
+
 2005-06-03  Tollef Fog Heen  <tfheen@err.no>
 
        * pkg.m4, README, pkg-config.1: s/configure.in/configure.ac/,

diff --git a/glib-patches/configure.in-fd_set.diff b/glib-patches/configure.in-fd_set.diff
new file mode 100644 (file)
index 0000000..16249ca
--- /dev/null
+++ b/glib-patches/configure.in-fd_set.diff
@@ -0,0 +1,13 @@
+diff -ru glib-1.2.8.orig/configure.in glib-1.2.8/configure.in
+--- glib-1.2.8.orig/configure.in       2005-06-26 20:38:20.468504000 +0200
++++ glib-1.2.8/configure.in    2005-06-26 20:40:14.057549097 +0200
+@@ -315,7 +315,7 @@
+ if test $gtk_ok = yes; then
+     AC_MSG_RESULT([yes, found in sys/types.h])
+ else
+-    AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
++    AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes)
+     if test $gtk_ok = yes; then
+         AC_DEFINE(HAVE_SYS_SELECT_H)
+         AC_MSG_RESULT([yes, found in sys/select.h])
+Only in glib-1.2.8: configure.in~