mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 03:16:17 +01:00
acglib.m4 provide defaults for POLL sysdefs, simple enums don't work with
* acglib.m4 * configure.in: provide defaults for POLL sysdefs, simple enums don't work with bitwise logic. Reported by Daniel Skarda <0rfelyus@atrey.karlin.mff.cuni.cz> -Yosh
This commit is contained in:
parent
b13a3368b3
commit
6e7e2575d7
@ -1,3 +1,10 @@
|
||||
Fri Dec 25 19:56:33 PST 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* acglib.m4
|
||||
* configure.in: provide defaults for POLL sysdefs, simple enums
|
||||
don't work with bitwise logic. Reported by Daniel Skarda
|
||||
<0rfelyus@atrey.karlin.mff.cuni.cz>
|
||||
|
||||
Wed Dec 23 00:43:25 CST 1998 Shawn T. Amundson <amundson@gtk.org>
|
||||
|
||||
* Released GLib 1.1.10
|
||||
|
@ -1,3 +1,10 @@
|
||||
Fri Dec 25 19:56:33 PST 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* acglib.m4
|
||||
* configure.in: provide defaults for POLL sysdefs, simple enums
|
||||
don't work with bitwise logic. Reported by Daniel Skarda
|
||||
<0rfelyus@atrey.karlin.mff.cuni.cz>
|
||||
|
||||
Wed Dec 23 00:43:25 CST 1998 Shawn T. Amundson <amundson@gtk.org>
|
||||
|
||||
* Released GLib 1.1.10
|
||||
|
@ -1,3 +1,10 @@
|
||||
Fri Dec 25 19:56:33 PST 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* acglib.m4
|
||||
* configure.in: provide defaults for POLL sysdefs, simple enums
|
||||
don't work with bitwise logic. Reported by Daniel Skarda
|
||||
<0rfelyus@atrey.karlin.mff.cuni.cz>
|
||||
|
||||
Wed Dec 23 00:43:25 CST 1998 Shawn T. Amundson <amundson@gtk.org>
|
||||
|
||||
* Released GLib 1.1.10
|
||||
|
@ -1,3 +1,10 @@
|
||||
Fri Dec 25 19:56:33 PST 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* acglib.m4
|
||||
* configure.in: provide defaults for POLL sysdefs, simple enums
|
||||
don't work with bitwise logic. Reported by Daniel Skarda
|
||||
<0rfelyus@atrey.karlin.mff.cuni.cz>
|
||||
|
||||
Wed Dec 23 00:43:25 CST 1998 Shawn T. Amundson <amundson@gtk.org>
|
||||
|
||||
* Released GLib 1.1.10
|
||||
|
@ -1,3 +1,10 @@
|
||||
Fri Dec 25 19:56:33 PST 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* acglib.m4
|
||||
* configure.in: provide defaults for POLL sysdefs, simple enums
|
||||
don't work with bitwise logic. Reported by Daniel Skarda
|
||||
<0rfelyus@atrey.karlin.mff.cuni.cz>
|
||||
|
||||
Wed Dec 23 00:43:25 CST 1998 Shawn T. Amundson <amundson@gtk.org>
|
||||
|
||||
* Released GLib 1.1.10
|
||||
|
@ -1,3 +1,10 @@
|
||||
Fri Dec 25 19:56:33 PST 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* acglib.m4
|
||||
* configure.in: provide defaults for POLL sysdefs, simple enums
|
||||
don't work with bitwise logic. Reported by Daniel Skarda
|
||||
<0rfelyus@atrey.karlin.mff.cuni.cz>
|
||||
|
||||
Wed Dec 23 00:43:25 CST 1998 Shawn T. Amundson <amundson@gtk.org>
|
||||
|
||||
* Released GLib 1.1.10
|
||||
|
@ -1,3 +1,10 @@
|
||||
Fri Dec 25 19:56:33 PST 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* acglib.m4
|
||||
* configure.in: provide defaults for POLL sysdefs, simple enums
|
||||
don't work with bitwise logic. Reported by Daniel Skarda
|
||||
<0rfelyus@atrey.karlin.mff.cuni.cz>
|
||||
|
||||
Wed Dec 23 00:43:25 CST 1998 Shawn T. Amundson <amundson@gtk.org>
|
||||
|
||||
* Released GLib 1.1.10
|
||||
|
@ -1,3 +1,10 @@
|
||||
Fri Dec 25 19:56:33 PST 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* acglib.m4
|
||||
* configure.in: provide defaults for POLL sysdefs, simple enums
|
||||
don't work with bitwise logic. Reported by Daniel Skarda
|
||||
<0rfelyus@atrey.karlin.mff.cuni.cz>
|
||||
|
||||
Wed Dec 23 00:43:25 CST 1998 Shawn T. Amundson <amundson@gtk.org>
|
||||
|
||||
* Released GLib 1.1.10
|
||||
|
34
acglib.m4
34
acglib.m4
@ -83,7 +83,8 @@ undefine([AC_CV_NAME])dnl
|
||||
dnl GLIB_SYSDEFS (INCLUDES, DEFS_LIST, OFILE [, PREFIX])
|
||||
AC_DEFUN(GLIB_SYSDEFS,
|
||||
[glib_sysdefso="translit($3, [-_a-zA-Z0-9 *], [-_a-zA-Z0-9])"
|
||||
AC_MSG_CHECKING(system definitions for $2)
|
||||
glib_sysdef_msg=`echo $2 | sed 's/:[[^ ]]*//g'`
|
||||
AC_MSG_CHECKING(system definitions for $glib_sysdef_msg)
|
||||
cat >confrun.c <<_______EOF
|
||||
#include <stdio.h>
|
||||
$1
|
||||
@ -91,18 +92,31 @@ int main (int c, char **v) {
|
||||
FILE *f = fopen ("$glib_sysdefso", "a");
|
||||
if (!f) return 1;
|
||||
_______EOF
|
||||
for glib_sysdef in $2 ; do
|
||||
echo "#ifdef $glib_sysdef" >>confrun.c
|
||||
echo " fprintf (f, \"#define GLIB_SYSDEF_%s %s%d\\n\", \"$glib_sysdef\", \"$4\", $glib_sysdef);" >>confrun.c
|
||||
echo "#else" >>confrun.c
|
||||
echo " fprintf (f, \"#define GLIB_SYSDEF_%s\\n\", \"$glib_sysdef\");" >>confrun.c
|
||||
echo "#endif" >>confrun.c
|
||||
for glib_sysdef_input in $2 ; do
|
||||
glib_sysdef=`echo $glib_sysdef_input | sed 's/^\([[^:]]*\):.*$/\1/'`
|
||||
glib_default=`echo $glib_sysdef_input | sed 's/^[[^:]]*:\(.*\)$/\1/'`
|
||||
echo "#ifdef $glib_sysdef" >>confrun.c
|
||||
echo " fprintf (f, \"#define GLIB_SYSDEF_%s %s%d\\n\", \"$glib_sysdef\", \"$4\", $glib_sysdef);" >>confrun.c
|
||||
echo "#else" >>confrun.c
|
||||
if test $glib_sysdef != $glib_default; then
|
||||
echo " fprintf (f, \"#define GLIB_SYSDEF_%s %s%d\\n\", \"$glib_sysdef\", \"$4\", $glib_default);" >>confrun.c
|
||||
else
|
||||
echo " fprintf (f, \"#define GLIB_SYSDEF_%s\\n\", \"$glib_sysdef\");" >>confrun.c
|
||||
fi
|
||||
echo "#endif" >>confrun.c
|
||||
done
|
||||
echo "return 0; }" >>confrun.c
|
||||
AC_TRY_RUN(`cat confrun.c`, AC_MSG_RESULT(done),
|
||||
for glib_sysdef in $2 ; do
|
||||
echo "#define GLIB_SYSDEF_$glib_sysdef" >>$glib_sysdefso
|
||||
[ for glib_sysdef_input in $2 ; do
|
||||
glib_sysdef=`echo $glib_sysdef_input | sed 's/^\([[^:]]*\):.*$/\1/'`
|
||||
glib_default=`echo $glib_sysdef_input | sed 's/^[[^:]]*:\(.*\)$/\1/'`
|
||||
if test $glib_sysdef != $glib_default; then
|
||||
glib_default=" $4$glib_default"
|
||||
else
|
||||
glib_default=
|
||||
fi
|
||||
echo "#define GLIB_SYSDEF_$glib_sysdef$glib_default" >>$glib_sysdefso
|
||||
done
|
||||
AC_MSG_RESULT(failed),)
|
||||
AC_MSG_RESULT(failed)])
|
||||
rm -f confrun.c
|
||||
])
|
||||
|
@ -737,7 +737,7 @@ dnl *** GLib POLL* compatibility defines ***
|
||||
dnl ****************************************
|
||||
GLIB_SYSDEFS([#include <sys/types.h>
|
||||
#include <sys/poll.h>],
|
||||
POLLIN POLLOUT POLLPRI POLLERR POLLHUP POLLNVAL,
|
||||
POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32,
|
||||
glibconfig-sysdefs.h,
|
||||
=)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user