From 901377bcefb7c2f6847dc10db2fa229ebce791e9 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 5 Dec 2002 20:33:26 +0000 Subject: [PATCH] Start of fixes for cross-compilation. Based on patches from Dimi Shahbaz, Thu Dec 5 15:24:14 2002 Owen Taylor Start of fixes for cross-compilation. Based on patches from Dimi Shahbaz, Dan Kegel, Johannes Stenzenbach, Amy Lin. (#58786) * configure.in: Don't run the Digital-Unix 4 -std1 check when cross_compiling. * configure.in: Use AC_TRY_COMPILE() rather than AC_TRY_RUN() for inline checks. (Daniel Egger) * configure.in: use AC_CHECK_SIZEOF rather than GLIB_SIZEOF for size_t. Remove unused checks for size of ptrdiff_t/intmax_t. * acglib.m4: Resync GLIB_SIZEOF of to the current AC_CHECK_SIZEOF, which handles cross-compilation. * acglib.m4: Remove no longer needed GLIB_SYSDEFS(), add GLIB_CHECK_VALUE() as a wrapper around the amazing _AC_COMPUTE_INT() autoconf 2.5x internal. * configure.in: Redo the POLL* value checks in a cross-compilation friendly way. Thu Dec 5 15:28:37 2002 Owen Taylor * glib/gtimer.c: Include glibconfig.h early so that we include when needed. * glib/gstrfuncs.c: Fix typo. --- ChangeLog | 33 +++++++++++++ ChangeLog.pre-2-10 | 33 +++++++++++++ ChangeLog.pre-2-12 | 33 +++++++++++++ ChangeLog.pre-2-2 | 33 +++++++++++++ ChangeLog.pre-2-4 | 33 +++++++++++++ ChangeLog.pre-2-6 | 33 +++++++++++++ ChangeLog.pre-2-8 | 33 +++++++++++++ acglib.m4 | 94 ++++++++++------------------------- configure.in | 140 ++++++++++++++++++++++++++++------------------------- glib/gtimer.c | 2 + glib/gunicollate.c | 2 +- 11 files changed, 332 insertions(+), 137 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a40e73..92af086 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +Thu Dec 5 15:24:14 2002 Owen Taylor + + Start of fixes for cross-compilation. Based on + patches from Dimi Shahbaz, Dan Kegel, Johannes Stenzenbach, + Amy Lin. (#58786) + + * configure.in: Don't run the Digital-Unix 4 -std1 check + when cross_compiling. + + * configure.in: Use AC_TRY_COMPILE() rather than + AC_TRY_RUN() for inline checks. (Daniel Egger) + + * configure.in: use AC_CHECK_SIZEOF rather than + GLIB_SIZEOF for size_t. Remove unused checks for + size of ptrdiff_t/intmax_t. + + * acglib.m4: Resync GLIB_SIZEOF of to the current + AC_CHECK_SIZEOF, which handles cross-compilation. + + * acglib.m4: Remove no longer needed GLIB_SYSDEFS(), + add GLIB_CHECK_VALUE() as a wrapper around the + amazing _AC_COMPUTE_INT() autoconf 2.5x internal. + + * configure.in: Redo the POLL* value checks in a + cross-compilation friendly way. + +Thu Dec 5 15:28:37 2002 Owen Taylor + + * glib/gtimer.c: Include glibconfig.h early so + that we include when needed. + + * glib/gstrfuncs.c: Fix typo. + Tue Dec 3 21:10:28 2002 Owen Taylor * configure.in: Add 3rd argument to remaining AC_DEFINES(), diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8a40e73..92af086 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,36 @@ +Thu Dec 5 15:24:14 2002 Owen Taylor + + Start of fixes for cross-compilation. Based on + patches from Dimi Shahbaz, Dan Kegel, Johannes Stenzenbach, + Amy Lin. (#58786) + + * configure.in: Don't run the Digital-Unix 4 -std1 check + when cross_compiling. + + * configure.in: Use AC_TRY_COMPILE() rather than + AC_TRY_RUN() for inline checks. (Daniel Egger) + + * configure.in: use AC_CHECK_SIZEOF rather than + GLIB_SIZEOF for size_t. Remove unused checks for + size of ptrdiff_t/intmax_t. + + * acglib.m4: Resync GLIB_SIZEOF of to the current + AC_CHECK_SIZEOF, which handles cross-compilation. + + * acglib.m4: Remove no longer needed GLIB_SYSDEFS(), + add GLIB_CHECK_VALUE() as a wrapper around the + amazing _AC_COMPUTE_INT() autoconf 2.5x internal. + + * configure.in: Redo the POLL* value checks in a + cross-compilation friendly way. + +Thu Dec 5 15:28:37 2002 Owen Taylor + + * glib/gtimer.c: Include glibconfig.h early so + that we include when needed. + + * glib/gstrfuncs.c: Fix typo. + Tue Dec 3 21:10:28 2002 Owen Taylor * configure.in: Add 3rd argument to remaining AC_DEFINES(), diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 8a40e73..92af086 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,36 @@ +Thu Dec 5 15:24:14 2002 Owen Taylor + + Start of fixes for cross-compilation. Based on + patches from Dimi Shahbaz, Dan Kegel, Johannes Stenzenbach, + Amy Lin. (#58786) + + * configure.in: Don't run the Digital-Unix 4 -std1 check + when cross_compiling. + + * configure.in: Use AC_TRY_COMPILE() rather than + AC_TRY_RUN() for inline checks. (Daniel Egger) + + * configure.in: use AC_CHECK_SIZEOF rather than + GLIB_SIZEOF for size_t. Remove unused checks for + size of ptrdiff_t/intmax_t. + + * acglib.m4: Resync GLIB_SIZEOF of to the current + AC_CHECK_SIZEOF, which handles cross-compilation. + + * acglib.m4: Remove no longer needed GLIB_SYSDEFS(), + add GLIB_CHECK_VALUE() as a wrapper around the + amazing _AC_COMPUTE_INT() autoconf 2.5x internal. + + * configure.in: Redo the POLL* value checks in a + cross-compilation friendly way. + +Thu Dec 5 15:28:37 2002 Owen Taylor + + * glib/gtimer.c: Include glibconfig.h early so + that we include when needed. + + * glib/gstrfuncs.c: Fix typo. + Tue Dec 3 21:10:28 2002 Owen Taylor * configure.in: Add 3rd argument to remaining AC_DEFINES(), diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8a40e73..92af086 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,36 @@ +Thu Dec 5 15:24:14 2002 Owen Taylor + + Start of fixes for cross-compilation. Based on + patches from Dimi Shahbaz, Dan Kegel, Johannes Stenzenbach, + Amy Lin. (#58786) + + * configure.in: Don't run the Digital-Unix 4 -std1 check + when cross_compiling. + + * configure.in: Use AC_TRY_COMPILE() rather than + AC_TRY_RUN() for inline checks. (Daniel Egger) + + * configure.in: use AC_CHECK_SIZEOF rather than + GLIB_SIZEOF for size_t. Remove unused checks for + size of ptrdiff_t/intmax_t. + + * acglib.m4: Resync GLIB_SIZEOF of to the current + AC_CHECK_SIZEOF, which handles cross-compilation. + + * acglib.m4: Remove no longer needed GLIB_SYSDEFS(), + add GLIB_CHECK_VALUE() as a wrapper around the + amazing _AC_COMPUTE_INT() autoconf 2.5x internal. + + * configure.in: Redo the POLL* value checks in a + cross-compilation friendly way. + +Thu Dec 5 15:28:37 2002 Owen Taylor + + * glib/gtimer.c: Include glibconfig.h early so + that we include when needed. + + * glib/gstrfuncs.c: Fix typo. + Tue Dec 3 21:10:28 2002 Owen Taylor * configure.in: Add 3rd argument to remaining AC_DEFINES(), diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8a40e73..92af086 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,36 @@ +Thu Dec 5 15:24:14 2002 Owen Taylor + + Start of fixes for cross-compilation. Based on + patches from Dimi Shahbaz, Dan Kegel, Johannes Stenzenbach, + Amy Lin. (#58786) + + * configure.in: Don't run the Digital-Unix 4 -std1 check + when cross_compiling. + + * configure.in: Use AC_TRY_COMPILE() rather than + AC_TRY_RUN() for inline checks. (Daniel Egger) + + * configure.in: use AC_CHECK_SIZEOF rather than + GLIB_SIZEOF for size_t. Remove unused checks for + size of ptrdiff_t/intmax_t. + + * acglib.m4: Resync GLIB_SIZEOF of to the current + AC_CHECK_SIZEOF, which handles cross-compilation. + + * acglib.m4: Remove no longer needed GLIB_SYSDEFS(), + add GLIB_CHECK_VALUE() as a wrapper around the + amazing _AC_COMPUTE_INT() autoconf 2.5x internal. + + * configure.in: Redo the POLL* value checks in a + cross-compilation friendly way. + +Thu Dec 5 15:28:37 2002 Owen Taylor + + * glib/gtimer.c: Include glibconfig.h early so + that we include when needed. + + * glib/gstrfuncs.c: Fix typo. + Tue Dec 3 21:10:28 2002 Owen Taylor * configure.in: Add 3rd argument to remaining AC_DEFINES(), diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8a40e73..92af086 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,36 @@ +Thu Dec 5 15:24:14 2002 Owen Taylor + + Start of fixes for cross-compilation. Based on + patches from Dimi Shahbaz, Dan Kegel, Johannes Stenzenbach, + Amy Lin. (#58786) + + * configure.in: Don't run the Digital-Unix 4 -std1 check + when cross_compiling. + + * configure.in: Use AC_TRY_COMPILE() rather than + AC_TRY_RUN() for inline checks. (Daniel Egger) + + * configure.in: use AC_CHECK_SIZEOF rather than + GLIB_SIZEOF for size_t. Remove unused checks for + size of ptrdiff_t/intmax_t. + + * acglib.m4: Resync GLIB_SIZEOF of to the current + AC_CHECK_SIZEOF, which handles cross-compilation. + + * acglib.m4: Remove no longer needed GLIB_SYSDEFS(), + add GLIB_CHECK_VALUE() as a wrapper around the + amazing _AC_COMPUTE_INT() autoconf 2.5x internal. + + * configure.in: Redo the POLL* value checks in a + cross-compilation friendly way. + +Thu Dec 5 15:28:37 2002 Owen Taylor + + * glib/gtimer.c: Include glibconfig.h early so + that we include when needed. + + * glib/gstrfuncs.c: Fix typo. + Tue Dec 3 21:10:28 2002 Owen Taylor * configure.in: Add 3rd argument to remaining AC_DEFINES(), diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8a40e73..92af086 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,36 @@ +Thu Dec 5 15:24:14 2002 Owen Taylor + + Start of fixes for cross-compilation. Based on + patches from Dimi Shahbaz, Dan Kegel, Johannes Stenzenbach, + Amy Lin. (#58786) + + * configure.in: Don't run the Digital-Unix 4 -std1 check + when cross_compiling. + + * configure.in: Use AC_TRY_COMPILE() rather than + AC_TRY_RUN() for inline checks. (Daniel Egger) + + * configure.in: use AC_CHECK_SIZEOF rather than + GLIB_SIZEOF for size_t. Remove unused checks for + size of ptrdiff_t/intmax_t. + + * acglib.m4: Resync GLIB_SIZEOF of to the current + AC_CHECK_SIZEOF, which handles cross-compilation. + + * acglib.m4: Remove no longer needed GLIB_SYSDEFS(), + add GLIB_CHECK_VALUE() as a wrapper around the + amazing _AC_COMPUTE_INT() autoconf 2.5x internal. + + * configure.in: Redo the POLL* value checks in a + cross-compilation friendly way. + +Thu Dec 5 15:28:37 2002 Owen Taylor + + * glib/gtimer.c: Include glibconfig.h early so + that we include when needed. + + * glib/gstrfuncs.c: Fix typo. + Tue Dec 3 21:10:28 2002 Owen Taylor * configure.in: Add 3rd argument to remaining AC_DEFINES(), diff --git a/acglib.m4 b/acglib.m4 index ead0fd3..97f2d14 100644 --- a/acglib.m4 +++ b/acglib.m4 @@ -50,30 +50,25 @@ AC_DEFUN(GLIB_ADD_TO_VAR,[ GLIB_STR_CONTAINS($[$1], [$2], [$1]="$[$1]", [$1]="$[$1] [$3]") ]) -dnl GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE]) -AC_DEFUN(GLIB_SIZEOF, -[pushdef([glib_Sizeof], GLIB_TR_SH([glib_cv_sizeof_$3]))dnl -AC_CACHE_CHECK([size of $2], glib_Sizeof, -[AC_TRY_RUN([#include -#if STDC_HEADERS -#include -#include -#endif -$1 -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof($2)); - exit(0); -}], - [glib_Sizeof=`cat conftestval` dnl'' -], - [glib_Sizeof=0], - ifelse([$4], [], [], [glib_Sizeof=$4]))]) -AC_DEFINE_UNQUOTED(GLIB_TR_CPP(glib_sizeof_$3), [$[]glib_Sizeof], [Size of $3]) -popdef([glib_Sizeof])dnl -]) +# GLIB_SIZEOF (INCLUDES, TYPE, ALIAS) +# --------------------------------------------------------------- +# The definition here is based of that of AC_CHECK_SIZEOF +AC_DEFUN([GLIB_SIZEOF], +[AS_LITERAL_IF([$3], [], + [AC_FATAL([$0: requires literal arguments])])dnl +AC_CACHE_CHECK([size of $2], AS_TR_SH([glib_cv_sizeof_$3]), +[ # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. + _AC_COMPUTE_INT([(long) (sizeof ($2))], + [AS_TR_SH([glib_cv_sizeof_$3])], + [AC_INCLUDES_DEFAULT([$1])], + [AC_MSG_ERROR([cannot compute sizeof ($2), 77])]) +])dnl +AC_DEFINE_UNQUOTED(GLIB_TR_CPP(glib_sizeof_$3), $AS_TR_SH([glib_cv_sizeof_$3]), + [The size of $3, as computed by sizeof.]) +])# GLIB_SIZEOF dnl GLIB_BYTE_CONTENTS (INCLUDES, TYPE, ALIAS, N_BYTES, INITIALIZER) AC_DEFUN(GLIB_BYTE_CONTENTS, @@ -102,51 +97,12 @@ AC_DEFINE_UNQUOTED(GLIB_TR_CPP(glib_byte_contents_$3), [$[]glib_ByteContents], popdef([glib_ByteContents])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])" -glib_sysdef_msg=`echo $2 | sed 's/:[[^ ]]*//g'` -if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then - glib_nl='\\n' -else - glib_nl='\n' -fi -AC_MSG_CHECKING(system definitions for $glib_sysdef_msg) -cat >confrun.c <<_______EOF -#include -$1 -int main (int c, char **v) { - FILE *f = fopen ("$glib_sysdefso", "a"); - if (!f) return 1; -_______EOF -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${glib_nl}\", \"$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${glib_nl}\", \"$glib_sysdef\", \"$4\", $glib_default);" >>confrun.c - else - echo " fprintf (f, \"#define GLIB_SYSDEF_%s${glib_nl}\", \"$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_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)]) -rm -f confrun.c -]) +# GLIB_CHECK_VALUE(SYMBOL, INCLUDES, ACTION-IF-FAIL) +# --------------------------------------------------------------- +AC_DEFUN([GLIB_CHECK_VALUE], +[AC_CACHE_CHECK([value of $1], AS_TR_SH([glib_cv_value_$1]), + [_AC_COMPUTE_INT([$1], AS_TR_SH([glib_cv_value_$1]), [$2], [$3])]) +])dnl # GLIB_CHECK_COMPILE_WARNINGS(PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------- diff --git a/configure.in b/configure.in index 2f7e727..ebc22e1 100644 --- a/configure.in +++ b/configure.in @@ -14,9 +14,6 @@ AC_INIT(glib/glib.h) # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} -# we rewrite this file -rm -f glibconfig-sysdefs.h - GLIB_AC_DIVERT_BEFORE_HELP([ # # The following version number definitions apply to GLib, GModule, GObject @@ -404,25 +401,29 @@ if test "x$GCC" = "xyes"; then fi fi +dnl dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R) -AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) -glib_save_LIBS=$LIBS -LIBS="$LIBS -lm" -AC_TRY_RUN([#include - int main (void) { return (log(1) != log(1.)); }], - AC_MSG_RESULT(none needed), - glib_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -std1" - AC_TRY_RUN([#include - int main (void) { return (log(1) != log(1.)); }], - AC_MSG_RESULT(-std1), - AC_MSG_RESULT() - CFLAGS=$glib_save_CFLAGS - AC_MSG_WARN( - [No ANSI prototypes found in library. (-std1 didn't work.)]) - ) -) -LIBS=$glib_save_LIBS +dnl +if test $cross_compiling != yes ; then + AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) + glib_save_LIBS=$LIBS + LIBS="$LIBS -lm" + AC_TRY_RUN([#include + int main (void) { return (log(1) != log(1.)); }], + AC_MSG_RESULT(none needed), + glib_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -std1" + AC_TRY_RUN([#include + int main (void) { return (log(1) != log(1.)); }], + AC_MSG_RESULT(-std1), + AC_MSG_RESULT() + CFLAGS=$glib_save_CFLAGS + AC_MSG_WARN( + [No ANSI prototypes found in library. (-std1 didn't work.)]) + ) + ) + LIBS=$glib_save_LIBS +fi dnl NeXTStep cc seems to need this AC_MSG_CHECKING([for extra flags for POSIX compliance]) @@ -545,7 +546,7 @@ dnl AC_C_INLINE is useless to us since it bails out too early, we need to dnl truely know which ones of `inline', `__inline' and `__inline__' are dnl actually supported. AC_CACHE_CHECK([for __inline],glib_cv_has__inline,[ - AC_TRY_RUN([ + AC_TRY_COMPILE([ __inline int foo () { return 0; } int main () { return foo (); } ], @@ -558,7 +559,7 @@ case x$glib_cv_has__inline in xyes) AC_DEFINE(G_HAVE___INLINE,1,[Have __inline keyword]) esac AC_CACHE_CHECK([for __inline__],glib_cv_has__inline__,[ - AC_TRY_RUN([ + AC_TRY_COMPILE([ __inline__ int foo () { return 0; } int main () { return foo (); } ], @@ -571,7 +572,7 @@ case x$glib_cv_has__inline__ in xyes) AC_DEFINE(G_HAVE___INLINE__,1,[Have __inline__ keyword]) esac AC_CACHE_CHECK([for inline], glib_cv_hasinline,[ - AC_TRY_RUN([ + AC_TRY_COMPILE([ #undef inline inline int foo () { return 0; } int main () { return foo (); } @@ -621,7 +622,7 @@ AC_MSG_RESULT($g_have_gnuc_varargs) AC_C_BIGENDIAN # check for header files -AC_CHECK_HEADERS([dirent.h float.h limits.h pwd.h sys/param.h sys/poll.h sys/select.h]) +AC_CHECK_HEADERS([dirent.h float.h limits.h pwd.h sys/param.h sys/poll.h sys/select.h sys/types.h]) AC_CHECK_HEADERS([sys/time.h sys/times.h unistd.h values.h stdint.h sched.h]) # Checks for libcharset @@ -646,30 +647,12 @@ AC_SUBST(STRIP_BEGIN) AC_SUBST(STRIP_END) # check additional type sizes -size_includes=[" -#include -#include -#include -#include -"] -if test "x$ac_cv_header_stdint_h" = "xyes"; then - size_includes=["$size_includes -#include -"] -fi -if test "x$ac_cv_header_unistd_h" = "xyes"; then - size_includes=["$size_includes -#include -"] -fi -GLIB_SIZEOF([$size_includes], size_t, size_t) -GLIB_SIZEOF([$size_includes], ptrdiff_t, ptrdiff_t) -GLIB_SIZEOF([$size_includes], intmax_t, intmax_t) +AC_CHECK_SIZEOF(size_t) dnl Try to figure out whether gsize, gssize should be long or int AC_MSG_CHECKING([for the appropriate definition for size_t]) -case $glib_cv_sizeof_size_t in +case $ac_cv_sizeof_size_t in $ac_cv_sizeof_short) glib_size_type=short ;; @@ -687,8 +670,8 @@ dnl If int/long are the same size, we see which one produces dnl warnings when used in the location as size_t. (This matters dnl on AIX with xlc) dnl -if test $glib_cv_sizeof_size_t = $ac_cv_sizeof_int && - test $glib_cv_sizeof_size_t = $ac_cv_sizeof_long ; then +if test $ac_cv_sizeof_size_t = $ac_cv_sizeof_int && + test $ac_cv_sizeof_size_t = $ac_cv_sizeof_long ; then GLIB_CHECK_COMPILE_WARNINGS([ #include int main () @@ -1695,15 +1678,14 @@ dnl ********************************************** dnl dnl if mutex_has_default = yes, we also got dnl mutex_default_type, mutex_default_init and mutex_header_file -GLIB_IF_VAR_EQ(mutex_has_default, yes, +if test $mutex_has_default = yes ; then glib_save_CPPFLAGS="$CPPFLAGS" glib_save_LIBS="$LIBS" LIBS="$LIBS $G_THREAD_LIBS" CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES" GLIB_SIZEOF([#include <$mutex_header_file>], $mutex_default_type, - gmutex, - ) + gmutex) GLIB_BYTE_CONTENTS([#include <$mutex_header_file>], $mutex_default_type, gmutex, @@ -1714,19 +1696,37 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes, fi CPPFLAGS="$glib_save_CPPFLAGS" LIBS="$glib_save_LIBS" - , -) - +fi dnl **************************************** dnl *** GLib POLL* compatibility defines *** dnl **************************************** -GLIB_SYSDEFS( -[#include -#include ], - POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32, - glibconfig-sysdefs.h, - =) + +glib_poll_includes=[" +#include +#include +"] + +if test $ac_cv_header_sys_types_h = yes && + test $ac_cv_header_sys_poll_h = yes ; then + glib_failed=false + GLIB_CHECK_VALUE(POLLIN, $glib_poll_includes, glib_failed=true) + GLIB_CHECK_VALUE(POLLOUT, $glib_poll_includes, glib_failed=true) + GLIB_CHECK_VALUE(POLLPRI, $glib_poll_includes, glib_failed=true) + GLIB_CHECK_VALUE(POLLERR, $glib_poll_includes, glib_failed=true) + GLIB_CHECK_VALUE(POLLHUP, $glib_poll_includes, glib_failed=true) + GLIB_CHECK_VALUE(POLLNVAL, $glib_poll_includes, glib_failed=true) + if $glib_failed ; then + AC_MSG_ERROR([Could not determine values for POLL* constants]) + fi +else + glib_cv_value_POLLIN=1 + glib_cv_value_POLLOUT=4 + glib_cv_value_POLLPRI=2 + glib_cv_value_POLLERR=8 + glib_cv_value_POLLHUP=16 + glib_cv_value_POLLNVAL=32 +fi dnl ********************** dnl *** Win32 API libs *** @@ -2116,13 +2116,12 @@ _______EOF #define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val)) #define G_BYTE_ORDER $g_byte_order -_______EOF - - if test -r glibconfig-sysdefs.h; then - cat glibconfig-sysdefs.h >>$outfile - fi - - cat >>$outfile <<_______EOF +#define GLIB_SYSDEF_POLLIN =$g_pollin +#define GLIB_SYSDEF_POLLOUT =$g_pollout +#define GLIB_SYSDEF_POLLPRI =$g_pollpri +#define GLIB_SYSDEF_POLLHUP =$g_pollhup +#define GLIB_SYSDEF_POLLERR =$g_pollerr +#define GLIB_SYSDEF_POLLNVAL =$g_pollnval #define G_MODULE_SUFFIX "$g_module_suffix" @@ -2247,7 +2246,7 @@ $ac_cv_sizeof___int64) gint64_constant='(val##i64)' ;; esac -glib_size_t=$glib_cv_sizeof_size_t +glib_size_t=$ac_cv_sizeof_size_t glib_size_type_define=$glib_size_type glib_void_p=$ac_cv_sizeof_long glib_long=$ac_cv_sizeof_void_p @@ -2342,6 +2341,13 @@ x$ac_cv_c_bigendian) ;; esac +g_pollin=$glib_cv_value_POLLIN +g_pollout=$glib_cv_value_POLLOUT +g_pollpri=$glib_cv_value_POLLPRI +g_pollhup=$glib_cv_value_POLLHUP +g_pollerr=$glib_cv_value_POLLERR +g_pollnval=$glib_cv_value_POLLNVAL + g_stack_grows=$glib_cv_stack_grows g_have_eilseq=$have_eilseq diff --git a/glib/gtimer.c b/glib/gtimer.c index 250a1ef..2e3e3c8 100644 --- a/glib/gtimer.c +++ b/glib/gtimer.c @@ -29,10 +29,12 @@ */ #include "config.h" +#include "glibconfig.h" #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ + #ifndef G_OS_WIN32 #include #include diff --git a/glib/gunicollate.c b/glib/gunicollate.c index efea3f7..243b4fb 100644 --- a/glib/gunicollate.c +++ b/glib/gunicollate.c @@ -217,7 +217,7 @@ g_utf8_collate_key (const gchar *str, const gchar *charset; gchar *str_norm; - g_return_val_if_fail (str1 != NULL, NULL); + g_return_val_if_fail (str != NULL, NULL); str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE); -- 2.7.4