# we rewrite this file
rm -f glibconfig-sysdefs.h
-dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
-dnl are available for $ac_help expansion (don't we all *love* autoconf?)
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+GLIB_AC_DIVERT_BEFORE_HELP([
#
-# The following version number definitions apply to GLib, GModule and GThread
-# as a whole, so if changes occoured in any of them, they are all
+# The following version number definitions apply to GLib, GModule, GObject
+# and GThread as a whole, so if changes occoured in any of them, they are all
# treated with the same interface and binary age.
#
# Making releases:
#
GLIB_MAJOR_VERSION=1
GLIB_MINOR_VERSION=3
-GLIB_MICRO_VERSION=1
+GLIB_MICRO_VERSION=2
GLIB_INTERFACE_AGE=0
GLIB_BINARY_AGE=0
GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
-dnl
-AC_DIVERT_POP()dnl
+])dnl
AC_SUBST(GLIB_MAJOR_VERSION)
AC_SUBST(GLIB_MINOR_VERSION)
# Specify a configuration file
AM_CONFIG_HEADER(config.h)
-AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION)
-AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION)
-AC_DEFINE_UNQUOTED(GLIB_MICRO_VERSION, $GLIB_MICRO_VERSION)
-AC_DEFINE_UNQUOTED(GLIB_INTERFACE_AGE, $GLIB_INTERFACE_AGE)
-AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE)
-
-dnl Initialize libtool
-AM_PROG_LIBTOOL
+AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION,
+ [Define to the GLIB major version])
+AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION,
+ [Define to the GLIB minor version])
+AC_DEFINE_UNQUOTED(GLIB_MICRO_VERSION, $GLIB_MICRO_VERSION,
+ [Define to the GLIB micro version])
+AC_DEFINE_UNQUOTED(GLIB_INTERFACE_AGE, $GLIB_INTERFACE_AGE,
+ [Define to the GLIB interface age])
+AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE,
+ [Define to the GLIB binary age])
dnl Initialize maintainer mode
AM_MAINTAINER_MODE
esac
AC_MSG_RESULT([$glib_native_beos])
-dnl figure debugging default, prior to $ac_help setup
dnl
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
-if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
- debug_default=yes
-else
- debug_default=minimum
-fi
-AC_DIVERT_POP()dnl
+
+GLIB_AC_DIVERT_BEFORE_HELP([
+# figure debugging default, prior to $ac_help setup
+case $GLIB_MINOR_VERSION in
+*[[13579]]) debug_default=yes ;;
+*) debug_default=minimum ;;
+esac[]dnl
+])
dnl declare --enable-* args and collect ac_help strings
AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
AC_ARG_ENABLE(msg-prefix, [ --enable-msg-prefix turn on program name and PID prefixing of messages and warnings],,enable_msg_prefix=no)
AC_ARG_ENABLE(mem_check, [ --enable-mem-check turn on malloc/free sanity checking [default=no]],,enable_mem_check=no)
AC_ARG_ENABLE(mem_profile, [ --enable-mem-profile turn on malloc profiling atexit [default=no]],,enable_mem_profile=no)
+AC_ARG_ENABLE(gc_friendly, [ --enable-gc-friendly turn on garbage collector friendliness [default=no]],,enable_gc_friendly=no)
AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],
, enable_ansi=no)
AC_ARG_ENABLE(threads, [ --enable-threads turn on basic thread support [default=yes]
AC_MSG_CHECKING(whether to enable memory checking)
if test "x$enable_mem_check" = "xyes"; then
- AC_DEFINE(ENABLE_MEM_CHECK, 1)
+ AC_DEFINE(ENABLE_MEM_CHECK, 1, [Whether to enable memory checking])
AC_SUBST(ENABLE_MEM_CHECK)
AC_MSG_RESULT(yes)
else
AC_MSG_CHECKING(whether to enable memory profiling)
if test "x$enable_mem_profile" = "xyes"; then
- AC_DEFINE(ENABLE_MEM_PROFILE, 1)
+ AC_DEFINE(ENABLE_MEM_PROFILE, 1, [Whether to enable memory profiling])
AC_SUBST(ENABLE_MEM_PROFILE)
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
+AC_MSG_CHECKING(whether to enable garbage collector friendliness)
+if test "x$enable_gc_friendly" = "xyes"; then
+ AC_DEFINE(ENABLE_GC_FRIENDLY, 1, [Whether to enable GC friendliness])
+ AC_SUBST(ENABLE_GC_FRIENDLY)
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+
if test "x$enable_debug" = "xyes"; then
test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
GLIB_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
fi
fi
-AC_DEFINE_UNQUOTED(G_COMPILED_WITH_DEBUGGING, "${enable_debug}")
+AC_DEFINE_UNQUOTED(G_COMPILED_WITH_DEBUGGING, "${enable_debug}",
+ [Whether glib was compiled with debugging enabled])
if test "x$enable_msg_prefix" = "xyes"; then
- AC_DEFINE_UNQUOTED(G_ENABLE_MSG_PREFIX, 1)
+ AC_DEFINE_UNQUOTED(G_ENABLE_MSG_PREFIX, 1,
+ [Enable prefixing of error messages with program names])
fi
# Checks for programs.
AM_PROG_CC_STDC
AC_PROG_INSTALL
-changequote(,)dnl
+dnl Initialize libtool
+AM_PROG_LIBTOOL
+
if test "x$GCC" = "xyes"; then
case " $CFLAGS " in
- *[\ \ ]-Wall[\ \ ]*) ;;
+ *[[\ \ ]]-Wall[[\ \ ]]*) ;;
*) CFLAGS="$CFLAGS -Wall" ;;
esac
if test "x$enable_ansi" = "xyes"; then
case " $CFLAGS " in
- *[\ \ ]-ansi[\ \ ]*) ;;
+ *[[\ \ ]]-ansi[[\ \ ]]*) ;;
*) CFLAGS="$CFLAGS -ansi" ;;
esac
case " $CFLAGS " in
- *[\ \ ]-pedantic[\ \ ]*) ;;
+ *[[\ \ ]]-pedantic[[\ \ ]]*) ;;
*) CFLAGS="$CFLAGS -pedantic" ;;
esac
fi
fi
-changequote([,])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])
# Checks for library functions.
AC_FUNC_VPRINTF
+AC_FUNC_ALLOCA
+
AC_CHECK_FUNCS(atexit on_exit)
AC_CHECK_SIZEOF(char)
# long long is a 64 bit integer.
AC_MSG_CHECKING(for format to printf and scanf a gint64)
AC_CACHE_VAL(glib_cv_long_long_format,[
- AC_TRY_RUN([#include <stdio.h>
+ for format in ll q; do
+ AC_TRY_RUN([#include <stdio.h>
int main()
{
long long b, a = -0x3AFAFAFAFAFAFAFALL;
char buffer[1000];
- sprintf (buffer, "%llu", a);
- sscanf (buffer, "%llu", &b);
+ sprintf (buffer, "%${format}u", a);
+ sscanf (buffer, "%${format}u", &b);
exit (b!=a);
}
],
- glib_cv_long_long_format=ll,
- glib_cv_long_long_format=q)])
- AC_MSG_RESULT(%${glib_cv_long_long_format}i)
+ glib_cv_long_long_format=${format}
+ break)
+ done])
+ if test -n "$glib_cv_long_long_format"; then
+ AC_MSG_RESULT(%${glib_cv_long_long_format}i)
+ else
+ AC_MSG_RESULT(none)
+ fi
fi
dnl long doubles were not used, and a portability problem
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_MSG_CHECKING(for __inline)
-AC_CACHE_VAL(glib_cv_has__inline,[
+AC_CACHE_CHECK([for __inline],glib_cv_has__inline,[
AC_TRY_RUN([
__inline int foo () { return 0; }
int main () { return foo (); }
glib_cv_has__inline=no
,)
])
-AC_MSG_RESULT($glib_cv_has__inline)
case x$glib_cv_has__inline in
-xyes) AC_DEFINE(G_HAVE___INLINE)
+xyes) AC_DEFINE(G_HAVE___INLINE,1,[Have __inline keyword])
esac
-AC_MSG_CHECKING(for __inline__)
-AC_CACHE_VAL(glib_cv_has__inline__,[
+AC_CACHE_CHECK([for __inline__],glib_cv_has__inline__,[
AC_TRY_RUN([
__inline__ int foo () { return 0; }
int main () { return foo (); }
glib_cv_has__inline__=no
,)
])
-AC_MSG_RESULT($glib_cv_has__inline__)
case x$glib_cv_has__inline__ in
-xyes) AC_DEFINE(G_HAVE___INLINE__)
+xyes) AC_DEFINE(G_HAVE___INLINE__,1,[Have __inline__ keyword])
esac
-AC_MSG_CHECKING(for inline)
-AC_CACHE_VAL(glib_cv_hasinline,[
+AC_CACHE_CHECK([for inline], glib_cv_hasinline,[
AC_TRY_RUN([
inline int foo () { return 0; }
int main () { return foo (); }
glib_cv_hasinline=no
,)
])
-AC_MSG_RESULT($glib_cv_hasinline)
case x$glib_cv_hasinline in
-xyes) AC_DEFINE(G_HAVE_INLINE)
+xyes) AC_DEFINE(G_HAVE_INLINE,1,[Have inline keyword])
esac
# check for bytesex stuff
AC_C_BIGENDIAN
-# xhexk for header files
-AC_CHECK_HEADERS(float.h, AC_DEFINE(HAVE_FLOAT_H))
-AC_CHECK_HEADERS(limits.h, AC_DEFINE(HAVE_LIMITS_H))
-AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H))
-AC_CHECK_HEADERS(sys/param.h, AC_DEFINE(HAVE_SYS_PARAM_H))
-AC_CHECK_HEADERS(sys/poll.h, AC_DEFINE(HAVE_SYS_POLL_H))
-AC_CHECK_HEADERS(sys/select.h, AC_DEFINE(HAVE_SYS_SELECT_H))
-AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
-AC_CHECK_HEADERS(sys/times.h, AC_DEFINE(HAVE_SYS_TIMES_H))
-AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
-AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H))
-AC_CHECK_HEADERS(stdint.h, AC_DEFINE(HAVE_VALUES_H))
+# check for header files
+AC_CHECK_HEADERS([float.h limits.h pwd.h sys/param.h sys/poll.h sys/select.h])
+AC_CHECK_HEADERS([sys/time.h sys/times.h unistd.h values.h stdint.h sched.h])
+
+AC_MSG_CHECKING(whether make is GNU Make)
+STRIP_BEGIN=
+STRIP_END=
+if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
+ STRIP_BEGIN='$(strip $(STRIP_DUMMY)'
+ STRIP_END=')'
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+STRIP_DUMMY=
+AC_SUBST(STRIP_DUMMY)
+AC_SUBST(STRIP_BEGIN)
+AC_SUBST(STRIP_END)
# check additional type sizes
size_includes=["
#include <stdarg.h>
#include <stdio.h>
-#include <stdlib.h>
#include <ctype.h>
#include <string.h>
"]
GLIB_SIZEOF([$size_includes], intmax_t, intmax_t)
# Check for some functions
-AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll)
+AC_CHECK_FUNCS(lstat strerror strsignal memmove mkstemp vsnprintf strcasecmp strncasecmp poll getcwd)
# Check if bcopy can be used for overlapping copies, if memmove isn't found.
# The check is borrowed from the PERL Configure script.
}
return(0);
}],glib_cv_working_bcopy=yes,glib_cv_working_bcopy=no)])
- if test "$glib_cv_working_bcopy" == "yes"; then
- AC_DEFINE(HAVE_WORKING_BCOPY)
+ if test "$glib_cv_working_bcopy" = "yes"; then
+ AC_DEFINE(HAVE_WORKING_BCOPY,1,[Have a working bcopy])
fi
fi
], glib_ok=yes, glib_ok=no)
AC_MSG_RESULT($glib_ok)
if test $glib_ok = no; then
- AC_DEFINE(NO_SYS_ERRLIST)
+ AC_DEFINE(NO_SYS_ERRLIST,1,[global 'sys_errlist' not found])
fi
# Check for sys_siglist
AC_MSG_CHECKING(for sys_siglist)
AC_TRY_LINK(, [
extern char *sys_siglist[];
-strlen (sys_siglist[0]);
+exit (sys_siglist[0]);
], glib_ok=yes, glib_ok=no)
AC_MSG_RESULT($glib_ok)
if test $glib_ok = no; then
- AC_DEFINE(NO_SYS_SIGLIST)
+ AC_DEFINE(NO_SYS_SIGLIST,1,[global 'sys_siglist' not found])
fi
# Check for sys_siglist decl (see Tue Jan 19 00:44:24 1999 in changelog)
], glib_ok=yes, glib_ok=no)
AC_MSG_RESULT($glib_ok)
if test $glib_ok = no; then
- AC_DEFINE(NO_SYS_SIGLIST_DECL)
+ AC_DEFINE(NO_SYS_SIGLIST_DECL,1,[global 'sys_siglist' not declared])
fi
# Check if <sys/select.h> needs to be included for fd_set
if test $gtk_ok = yes; then
AC_MSG_RESULT([yes, found in sys/types.h])
else
- AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes)
+ AC_EGREP_HEADER(fd_set, sys/select.h, gtk_ok=yes)
if test $gtk_ok = yes; then
- AC_DEFINE(HAVE_SYS_SELECT_H)
+ # *** FIXME: give it a different name
+ AC_DEFINE(HAVE_SYS_SELECT_H,1,[found fd_set in sys/select.h])
AC_MSG_RESULT([yes, found in sys/select.h])
else
- AC_DEFINE(NO_FD_SET)
+ AC_DEFINE(NO_FD_SET,1,[didn't find fd_set])
AC_MSG_RESULT(no)
fi
fi
dnl *** check for sane realloc() ***
-AC_MSG_CHECKING(whether realloc (NULL,) will work)
-AC_CACHE_VAL(glib_cv_sane_realloc,[
+AC_CACHE_CHECK([whether realloc (NULL,) will work],glib_cv_sane_realloc,[
AC_TRY_RUN([
#include <stdlib.h>
int main() {
return realloc (0, sizeof (int)) == 0;
}],
- glib_cv_sane_realloc=yes
- AC_DEFINE(REALLOC_0_WORKS)
- ,
- glib_cv_sane_realloc=no
- ,)
+ [glib_cv_sane_realloc=yes],
+ [glib_cv_sane_realloc=no],
+ [])
])
-AC_MSG_RESULT($glib_cv_sane_realloc)
+if test x$glib_cv_sane_realloc = xyes; then
+ AC_DEFINE(REALLOC_0_WORKS,1,[whether realloc (NULL,) works])
+fi
+
+dnl Check for nl_langinfo and CODESET
+
+AC_MSG_CHECKING([for nl_langinfo (CODESET)])
+AC_TRY_COMPILE([#include <langinfo.h>],
+ [char *codeset = nl_langinfo (CODESET);],
+ AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)])
+ have_codeset=yes,
+ have_codeset=no)
+AC_MSG_RESULT($have_codeset)
+
+dnl ****************************************
+dnl *** strlcpy/strlcat ***
+dnl ****************************************
+# Check for strlcpy
+AC_MSG_CHECKING(for strlcpy/strlcat)
+AC_TRY_LINK([#include <stdlib.h>
+#include <string.h>], [
+char *p = malloc(10);
+(void) strlcpy(p, "hi", 10);
+(void) strlcat(p, "bye", 10);
+], glib_ok=yes, glib_ok=no)
+AC_MSG_RESULT($glib_ok)
+if test $glib_ok = yes; then
+ AC_DEFINE(HAVE_STRLCPY,1,[Have functions strlcpy and strlcat])
+fi
+
dnl **********************
dnl *** va_copy checks ***
dnl **********************
dnl we currently check for all three va_copy possibilities, so we get
dnl all results in config.log for bug reports.
-AC_MSG_CHECKING(for an implementation of va_copy())
-AC_CACHE_VAL(glib_cv_va_copy,[
+AC_CACHE_CHECK([for an implementation of va_copy()],glib_cv_va_copy,[
AC_TRY_RUN([
#include <stdarg.h>
void f (int i, ...) {
f (0, 42);
return 0;
}],
- glib_cv_va_copy=yes
- ,
- glib_cv_va_copy=no
- ,)
+ [glib_cv_va_copy=yes],
+ [glib_cv_va_copy=no],
+ [])
])
-AC_MSG_RESULT($glib_cv_va_copy)
-AC_MSG_CHECKING(for an implementation of __va_copy())
-AC_CACHE_VAL(glib_cv___va_copy,[
+AC_CACHE_CHECK([for an implementation of __va_copy()],glib_cv___va_copy,[
AC_TRY_RUN([
#include <stdarg.h>
void f (int i, ...) {
f (0, 42);
return 0;
}],
- glib_cv___va_copy=yes
- ,
- glib_cv___va_copy=no
- ,)
+ [glib_cv___va_copy=yes],
+ [glib_cv___va_copy=no],
+ [])
])
-AC_MSG_RESULT($glib_cv___va_copy)
-AC_MSG_CHECKING(whether va_lists can be copied by value)
-AC_CACHE_VAL(glib_cv_va_val_copy,[
+
+if test "x$glib_cv_va_copy" = "xyes"; then
+ g_va_copy_func=va_copy
+else if test "x$glib_cv___va_copy" = "xyes"; then
+ g_va_copy_func=__va_copy
+fi
+fi
+
+if test -n "$g_va_copy_func"; then
+ AC_DEFINE_UNQUOTED(G_VA_COPY,$g_va_copy_func,[A 'va_copy' style function])
+fi
+
+AC_CACHE_CHECK([whether va_lists can be copied by value],glib_cv_va_val_copy,[
AC_TRY_RUN([
#include <stdarg.h>
void f (int i, ...) {
f (0, 42);
return 0;
}],
- glib_cv_va_val_copy=yes
- ,
- glib_cv_va_val_copy=no
- ,)
+ [glib_cv_va_val_copy=yes],
+ [glib_cv_va_val_copy=no],
+ [])
])
-if test "x$glib_cv_va_copy" = "xyes"; then
- AC_DEFINE(G_VA_COPY, va_copy)
-else if test "x$glib_cv___va_copy" = "xyes"; then
- AC_DEFINE(G_VA_COPY, __va_copy)
-fi
-fi
+
if test "x$glib_cv_va_val_copy" = "xno"; then
- AC_DEFINE(G_VA_COPY_AS_ARRAY)
+ AC_DEFINE(G_VA_COPY_AS_ARRAY,1, ['va_lists' cannot be copies as values])
fi
-AC_MSG_RESULT($glib_cv_va_val_copy)
-
dnl ***********************
dnl *** g_module checks ***
dnl *** dlopen() and dlsym() in system libraries
if test -z "$G_MODULE_IMPL"; then
AC_CHECK_FUNC(dlopen,
- AC_CHECK_FUNC(dlsym,
- G_MODULE_IMPL=G_MODULE_IMPL_DL
- ,)
- ,)
+ [AC_CHECK_FUNC(dlsym,
+ [G_MODULE_IMPL=G_MODULE_IMPL_DL],[])],
+ [])
fi
dnl *** load_image (BeOS)
if test -z "$G_MODULE_IMPL" -a "x$glib_native_beos" = "xyes"; then
AC_CHECK_LIB(root, load_image,
- G_MODULE_LIBS="-lbe -lroot -lglib"
+ [G_MODULE_LIBS="-lbe -lroot -lglib"
G_MODULE_LIBS_EXTRA="-L\$(top_builddir_full)/.libs"
G_MODULE_PLUGIN_LIBS="-L\$(top_builddir_full)/gmodule/.libs -lgmodule"
- G_MODULE_IMPL=G_MODULE_IMPL_BEOS
-,)
+ G_MODULE_IMPL=G_MODULE_IMPL_BEOS],
+ [])
fi
-dnl *** dlopen() and dlsym() in libdl
+# *** dlopen() and dlsym() in libdl
if test -z "$G_MODULE_IMPL"; then
AC_CHECK_LIB(dl, dlopen,
- AC_CHECK_LIB(dl, dlsym,
- G_MODULE_LIBS=-ldl
- G_MODULE_IMPL=G_MODULE_IMPL_DL
- ,)
- ,)
+ [AC_CHECK_LIB(dl, dlsym,
+ [G_MODULE_LIBS=-ldl
+ G_MODULE_IMPL=G_MODULE_IMPL_DL],[])],
+ [])
fi
dnl *** shl_load() in libdld (HP-UX)
if test -z "$G_MODULE_IMPL"; then
[ G_MODULE_LDFLAGS="-Wl,-E" ],[
LDFLAGS="$SAVED_LDFLAGS -bexpall"
AC_TRY_LINK(,[ return 0; ],
- G_MODULE_LDFLAGS="-bexpall",
- G_MODULE_LDFLAGS="none"
- )
+ [G_MODULE_LDFLAGS="-bexpall"],
+ [G_MODULE_LDFLAGS="none"])
])
LDFLAGS=$SAVED_LDFLAGS
AC_MSG_RESULT($G_MODULE_LDFLAGS)
G_MODULE_LDFLAGS=
fi
AC_CHECK_LIB(dld, shl_load,
- G_MODULE_LIBS=-ldld
- G_MODULE_IMPL=G_MODULE_IMPL_DLD
- ,)
+ [G_MODULE_LIBS=-ldld
+ G_MODULE_IMPL=G_MODULE_IMPL_DLD],
+ [])
fi
dnl *** additional checks for G_MODULE_IMPL_DL
if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then
LIBS="$LIBS $G_MODULE_LIBS"
LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
dnl *** check whether we need preceeding underscores
- AC_MSG_CHECKING(for preceeding underscore in symbols)
- AC_CACHE_VAL(glib_cv_uscore,[
+ AC_CACHE_CHECK([for preceeding underscore in symbols],
+ glib_cv_uscore,[
AC_TRY_RUN([
#include <dlfcn.h>
int glib_underscore_test (void) { return 42; }
f2 = dlsym (handle, "_glib_underscore_test");
} return (!f2 || f1);
}],
- glib_cv_uscore=yes,
- glib_cv_uscore=no,
- )
+ [glib_cv_uscore=yes],
+ [glib_cv_uscore=no],
+ [])
rm -f plugin.c plugin.o plugin.lo
])
- AC_MSG_RESULT($glib_cv_uscore)
if test "x$glib_cv_uscore" = "xyes"; then
G_MODULE_NEED_USCORE=1
else
LDFLAGS="$LDFLAGS_orig"
dnl *** check for having dlerror()
AC_CHECK_FUNC(dlerror,
- G_MODULE_HAVE_DLERROR=1,
- G_MODULE_HAVE_DLERROR=0)
+ [G_MODULE_HAVE_DLERROR=1],
+ [G_MODULE_HAVE_DLERROR=0])
LIBS="$LIBS_orig"
fi
dnl *** done, have e got an implementation?
THREAD_NO_IMPLEMENTATION="You do not have any known thread system on your
computer. GLib will not have a default thread implementation."
-FLAG_DOES_NOT_WORK="I can't find the MACRO, that enables thread safety on your
+FLAG_DOES_NOT_WORK="I can't find the MACRO to enable thread safety on your
platform (normaly it's "_REENTRANT"). I'll not use any flag on
compilation now, but then your programs might not work.
Please provide information on how it is done on your system."
FUNC_NO_LOCALTIME_R="the 'g_date_set_time' function will not be MT-safe
because there is no 'localtime_r' on your system."
+POSIX_NO_YIELD="I can not find a yield functions for your platform. A rather
+ crude surrogate will be used. If you happen to know a
+ yield function for your system, please inform the GLib
+ developers."
+
+POSIX_NO_PRIORITIES="I can not find the minimal and maximal priorities for
+ threads on your system. Thus threads can only have the default
+ priority. If you happen to know these main/max
+ priorities, please inform the GLib developers."
+
+
dnl determination of thread implementation
dnl ***************************************
fi
if test "x$want_threads" = xyes || test "x$want_threads" = xposix \
|| test "x$want_threads" = xdce; then
- # -D_POSIX4A_DRAFT10_SOURCE is for DG/UX
- # -U_OSF_SOURCE if for Digital UNIX 4.0d
- GTHREAD_COMPILE_IMPL_DEFINES="-D_POSIX4A_DRAFT10_SOURCE -U_OSF_SOURCE"
+ # -D_POSIX4_DRAFT_SOURCE -D_POSIX4A_DRAFT10_SOURCE is for DG/UX
+ # -U_OSF_SOURCE is for Digital UNIX 4.0d
+ GTHREAD_COMPILE_IMPL_DEFINES="-D_POSIX4_DRAFT_SOURCE -D_POSIX4A_DRAFT10_SOURCE -U_OSF_SOURCE"
glib_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
if test "x$have_threads" = xnone; then
- AC_EGREP_HEADER([[^a-zA-Z_]pthread_attr_init[^a-zA-Z_]],
- pthread.h,
+ AC_TRY_COMPILE([#include <pthread.h>],
+ [pthread_attr_t attr; pthread_attr_init(&attr);],
have_threads=posix)
fi
if test "x$have_threads" = xnone; then
- AC_EGREP_HEADER([[^a-zA-Z_]pthread_attr_create[^a-zA-Z_]],
- pthread.h,
- have_threads=dce)
+ AC_TRY_COMPILE([#include <pthread.h>],
+ [pthread_attr_t attr; pthread_attr_create(&attr);],
+ have_threads=posix)
fi
CPPFLAGS="$glib_save_CPPFLAGS"
fi
fi
-dnl determination of G_THREAD_LIBS
-dnl ******************************
+dnl determination of G_THREAD_CFLAGS
+dnl ********************************
G_THREAD_LIBS=
G_THREAD_LIBS_EXTRA=
G_THREAD_CFLAGS=
+if test x"$have_threads" != xnone; then
+
+ G_THREAD_CFLAGS="-D_REENTRANT" # good default guess
+
+ case $host in
+ *-aix*)
+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
+ if test x"$GCC" = xyes; then
+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
+ fi
+ ;;
+ *-freebsd2.2*)
+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
+
+ # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
+ # -mthreads flag.
+ ;;
+ *-sysv5uw7*) # UnixWare 7
+ if test "$GCC" != "yes"; then
+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -Kthread"
+ else
+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -pthread"
+ fi
+ ;;
+ *-dg-dgux*) # DG/UX
+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_POSIX4A_DRAFT10_SOURCE"
+ esac
+
+ # if we are not finding the ctime_r function, then we probably are
+ # not using the proper multithread flag
+
+ glib_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
+
+ AC_TRY_COMPILE([#include <time.h>],
+ [time_t t; char b[30]; ctime_r (&t, b);], ,
+ [AC_TRY_COMPILE([#include <time.h>],
+ [time_t t; char b[30]; ctime_r (&t, b, 30);], ,
+ AC_MSG_WARN($FLAG_DOES_NOT_WORK))])
+
+ CPPFLAGS="$glib_save_CPPFLAGS"
+
+ AC_MSG_CHECKING(thread related cflags)
+ AC_MSG_RESULT($G_THREAD_CFLAGS)
+ CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
+fi
+
+dnl determination of G_THREAD_LIBS
+dnl ******************************
+
mutex_has_default=no
case $have_threads in
posix|dce)
- G_THREAD_LIBS=error
- glib_save_LIBS="$LIBS"
+ glib_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
+ G_THREAD_LIBS=error
+ glib_save_LIBS="$LIBS"
+ case $host in
+ *-sysv5uw7*) # UnixWare 7
+ if test "$GCC" != "yes"; then
+ G_THREAD_LIBS="-Kthread"
+ else
+ G_THREAD_LIBS="-pthread"
+ fi
+ ;;
+ *)
for thread_lib in "" pthread pthreads c_r thread dce; do
- # This is not AC_CHECK_LIB to also work with function
- # name mangling in header files.
if test x"$thread_lib" = x; then
add_thread_lib=""
IN=""
add_thread_lib="-l$thread_lib"
IN=" in -l$thread_lib"
fi
+ if test x"$have_threads" = xposix; then
+ defattr=0
+ else
+ defattr=pthread_attr_default
+ fi
LIBS="$glib_save_LIBS $add_thread_lib"
- AC_MSG_CHECKING(for pthread_join$IN)
- AC_TRY_LINK([#include <pthread.h>],
- [pthread_join(NULL,NULL)],
+ AC_MSG_CHECKING(for pthread_create/pthread_join$IN)
+ AC_TRY_RUN([#include <pthread.h>
+ int check_me = 0;
+ void* func(void* data) {check_me = 42;}
+ main()
+ { pthread_t t;
+ void *ret;
+ pthread_create (&t, $defattr, func, 0);
+ pthread_join (t, &ret);
+ exit (check_me != 42);
+ }],
[AC_MSG_RESULT(yes)
G_THREAD_LIBS="$add_thread_lib"
break],
[AC_MSG_RESULT(no)])
done
- LIBS="$glib_save_LIBS"
- mutex_has_default=yes
- mutex_default_type='pthread_mutex_t'
- mutex_default_init='PTHREAD_MUTEX_INITIALIZER'
- mutex_header_file='pthread.h'
- if test "x$have_threads" = "xposix"; then
- g_threads_impl="POSIX"
- else
- g_threads_impl="DCE"
- have_threads="posix"
+ if test "x$G_THREAD_LIBS" = xerror; then
+ AC_MSG_ERROR($LIBS_NOT_FOUND_1$have_threads$LIBS_NOT_FOUND_2)
fi
- AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES)
- ;;
+ for thread_lib in "" rt rte; do
+ if test x"$thread_lib" = x; then
+ add_thread_lib=""
+ IN=""
+ else
+ add_thread_lib="-l$thread_lib"
+ IN=" in -l$thread_lib"
+ fi
+ LIBS="$glib_save_LIBS $add_thread_lib"
+
+ AC_MSG_CHECKING(for sched_get_priority_min$IN)
+ AC_TRY_RUN([#include <sched.h>
+ #include <errno.h>
+ int main() {
+ errno = 0;
+ return sched_get_priority_min(SCHED_OTHER)==-1
+ && errno != 0;
+ }],
+ [AC_MSG_RESULT(yes)
+ G_THREAD_LIBS="$G_THREAD_LIBS $add_thread_lib"
+ posix_priority_min="sched_get_priority_min(SCHED_OTHER)"
+ posix_priority_max="sched_get_priority_max(SCHED_OTHER)"
+ break],
+ [AC_MSG_RESULT(no)])
+ done
+ LIBS="$glib_save_LIBS"
+ ;;
+ esac
+ mutex_has_default=yes
+ mutex_default_type='pthread_mutex_t'
+ mutex_default_init='PTHREAD_MUTEX_INITIALIZER'
+ mutex_header_file='pthread.h'
+ if test "x$have_threads" = "xposix"; then
+ g_threads_impl="POSIX"
+ else
+ g_threads_impl="DCE"
+ have_threads="posix"
+ fi
+ AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES)
+ CPPFLAGS="$glib_save_CPPFLAGS"
+ ;;
solaris)
- G_THREAD_LIBS=error
- AC_CHECK_LIB(thread, cond_init, G_THREAD_LIBS="-lthread")
- mutex_has_default=yes
- mutex_default_type='mutex_t'
- mutex_default_init="DEFAULTMUTEX"
- mutex_header_file='thread.h'
- g_threads_impl="SOLARIS"
- ;;
+ G_THREAD_LIBS=error
+ AC_CHECK_LIB(thread, cond_init, G_THREAD_LIBS="-lthread")
+ mutex_has_default=yes
+ mutex_default_type='mutex_t'
+ mutex_default_init="DEFAULTMUTEX"
+ mutex_header_file='thread.h'
+ g_threads_impl="SOLARIS"
+ ;;
none)
- g_threads_impl="NONE"
- ;;
+ g_threads_impl="NONE"
+ ;;
*)
- g_threads_impl="NONE"
- G_THREAD_LIBS=error
- ;;
+ g_threads_impl="NONE"
+ G_THREAD_LIBS=error
+ ;;
esac
if test "x$G_THREAD_LIBS" = xerror; then
;;
esac
-
AC_MSG_CHECKING(thread related libraries)
AC_MSG_RESULT($G_THREAD_LIBS)
-dnl determination of G_THREAD_CFLAGS
-dnl ********************************
-
-if test x"$enable_threads" = xyes; then
-
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT" # good default guess
-
- case $host in
- *-aix*)
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
- if test x"$GCC" = xyes; then
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
- fi
- ;;
- *-freebsd2.2*)
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
-
- # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
- # -mthreads flag.
- ;;
- esac
-
- # if we are not finding the ctime_r function, then we probably are
- # not using the proper multithread flag
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
- # Note: Digital UNIX 4.0d #defines ctime_r to _Pctime_r for gcc.
- AC_EGREP_HEADER([[^a-zA-Z_](_P)?ctime_r[^a-zA-Z_]], time.h, ,
- G_THREAD_CFLAGS=
- AC_MSG_WARN($FLAG_DOES_NOT_WORK))
- CPPFLAGS=$old_CPPFLAGS
-
- AC_MSG_CHECKING(thread related cflags)
-
- AC_MSG_RESULT($G_THREAD_CFLAGS)
-else
- G_THREAD_CFLAGS=
-fi
-
dnl check for mt safe function variants and some posix functions
dnl ************************************************************
-if test x"$enable_threads" = xyes; then
+if test x"$have_threads" != xnone; then
glib_save_LIBS="$LIBS"
- glib_save_CFLAGS="$CFLAGS"
# we are not doing the following for now, as this might require glib
# to always be linked with the thread libs on some platforms.
# LIBS="$LIBS $G_THREAD_LIBS"
- CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
AC_CHECK_FUNCS(localtime_r)
if test "$ac_cv_header_pwd_h" = "yes"; then
- AC_MSG_CHECKING([for getpwuid_r])
- AC_CACHE_VAL(ac_cv_func_getpwuid_r,
+ AC_CACHE_CHECK([for posix getpwuid_r],
+ ac_cv_func_posix_getpwuid_r,
[AC_TRY_RUN([#include <errno.h>
- int main () { char buffer[10000], *pointer;
- char getpwuid_r (long, void*, void*,
- int, void*);
- errno = 0;
- getpwuid_r (0, &buffer, &buffer,
- sizeof (buffer), &pointer);
- return errno == ENOSYS;}],
- [ac_cv_func_getpwuid_r=yes],
- [ac_cv_func_getpwuid_r=no])])
- if test "$ac_cv_func_getpwuid_r" = yes; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_GETPWUID_R)
+ #include <pwd.h>
+ int main () { char buffer[10000];
+ struct passwd pwd, *pwptr = &pwd;
+ int error;
+ errno = 0;
+ error = getpwuid_r (0, &pwd, buffer,
+ sizeof (buffer), &pwptr);
+ return (error < 0 && errno == ENOSYS)
+ || error == ENOSYS; }],
+ [ac_cv_func_posix_getpwuid_r=yes],
+ [ac_cv_func_posix_getpwuid_r=no])])
+ if test "$ac_cv_func_posix_getpwuid_r" = yes; then
+ AC_DEFINE(HAVE_POSIX_GETPWUID_R,1,
+ [Have POSIX function getpwuid_r])
else
- AC_MSG_RESULT(no)
- fi
- if test "$ac_cv_func_getpwuid_r" = "yes"; then
- AC_MSG_CHECKING(whether getpwuid_r is posix like)
- # The signature for the POSIX version is:
- # int getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **)
- AC_TRY_COMPILE([#include <pwd.h>
- #include <sys/types.h>
- #include <stdlib.h>],
- [getpwuid_r((uid_t)0, NULL, NULL, (size_t)0, NULL);],
- [AC_DEFINE(HAVE_GETPWUID_R_POSIX)
- AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)])
+ AC_CACHE_CHECK([for nonposix getpwuid_r],
+ ac_cv_func_nonposix_getpwuid_r,
+ [AC_TRY_COMPILE([#include <pwd.h>],
+ [char buffer[10000];
+ struct passwd pwd;
+ getpwuid_r (0, &pwd, buffer,
+ sizeof (buffer));],
+ [ac_cv_func_nonposix_getpwuid_r=yes],
+ [ac_cv_func_nonposix_getpwuid_r=no])])
+ if test "$ac_cv_func_nonposix_getpwuid_r" = yes; then
+ AC_DEFINE(HAVE_NONPOSIX_GETPWUID_R,1,
+ [Have non-POSIX function getpwuid_r])
+ fi
fi
fi
LIBS="$LIBS $G_THREAD_LIBS"
if test x"$have_threads" = xposix; then
+ glib_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
GLIB_SIZEOF([#include <pthread.h>],
pthread_t,
- pthread_t)
+ system_thread)
# This is not AC_CHECK_FUNC to also work with function
# name mangling in header files.
AC_MSG_CHECKING(for pthread_attr_setstacksize)
AC_TRY_LINK([#include <pthread.h>],
- [pthread_attr_setstacksize(NULL,0)],
+ [pthread_attr_t t; pthread_attr_setstacksize(&t,0)],
[AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE)],
+ AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE,1,
+ [Have function pthread_attr_setstacksize])],
[AC_MSG_RESULT(no)])
- # If sched_get_priority_min(SCHED_OTHER) returns something
- # negative, we ignore it. This happens on Solaris.
AC_MSG_CHECKING(for minimal/maximal thread priority)
- AC_TRY_RUN([#include <pthread.h>
- int main ()
- { return sched_get_priority_min(SCHED_OTHER) < 0;}],
- [posix_priority_min="sched_get_priority_min(SCHED_OTHER)"
- posix_priority_max="sched_get_priority_max(SCHED_OTHER)"],
- [posix_priority_min=none])
if test x"$posix_priority_min" = xnone; then
AC_EGREP_CPP(PX_PRIO_MIN,[#include <pthread.h>
PX_PRIO_MIN],,[
posix_priority_min=PRI_OTHER_MIN
posix_priority_max=PRI_OTHER_MAX])
fi
- if test x"$posix_priority_min" = xnone; then
- case $host in
- *-*-solaris*)
- posix_priority_min=1
- posix_priority_max=127
- ;;
- esac
- fi
- if test x"$posix_priority_min" = xnone; then
+ if test x"$posix_priority_min" = x; then
AC_MSG_RESULT(none found)
AC_MSG_WARN($POSIX_NO_PRIORITIES)
- posix_priority_min=1
- posix_priority_max=1
+ posix_priority_min=-1
+ posix_priority_max=-1
else
AC_MSG_RESULT($posix_priority_min/$posix_priority_max)
+ AC_DEFINE_UNQUOTED(POSIX_MIN_PRIORITY,$posix_priority_min,[Minimum POSIX RT priority])
+ AC_DEFINE_UNQUOTED(POSIX_MAX_PRIORITY,$posix_priority_max,[Maximum POSIX RT priority])
fi
- AC_DEFINE_UNQUOTED(POSIX_MIN_PRIORITY,$posix_priority_min)
- AC_DEFINE_UNQUOTED(POSIX_MAX_PRIORITY,$posix_priority_max)
posix_yield_func=none
AC_MSG_CHECKING(for posix yield function)
- for yield_func in pthread_yield_np pthread_yield sched_yield \
+ for yield_func in sched_yield pthread_yield_np pthread_yield \
thr_yield; do
AC_TRY_LINK([#include <pthread.h>],
[$yield_func()],
if test x"$posix_yield_func" = xnone; then
AC_MSG_RESULT(none found)
AC_MSG_WARN($POSIX_NO_YIELD)
- posix_yield_func="g_thread_sleep(1000)"
+ posix_yield_func="g_usleep(1000)"
else
AC_MSG_RESULT($posix_yield_func)
posix_yield_func="$posix_yield_func()"
fi
- AC_DEFINE_UNQUOTED(POSIX_YIELD_FUNC,$posix_yield_func)
+ AC_DEFINE_UNQUOTED(POSIX_YIELD_FUNC,$posix_yield_func,[The POSIX RT yield function])
+ CPPFLAGS="$glib_save_CPPFLAGS"
+
+ AC_MSG_CHECKING(whether to use the PID niceness surrogate for thread priorities)
+ AC_TRY_RUN([#include <pthread.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ pid_t other_pid = 0;
+
+ void* func(void* data) {other_pid = getpid();}
+ main()
+ { pthread_t t;
+ void *ret;
+ pthread_create (&t, $defattr, func, NULL);
+ pthread_join (t, &ret);
+ exit (getpid()==other_pid ||
+ $posix_priority_min != $posix_priority_max);
+ }],
+ [AC_MSG_RESULT(yes),
+ AC_DEFINE(G_THREAD_USE_PID_SURROGATE, 1,
+ [whether to use the PID niceness surrogate for thread priorities])
+
+ glib_cv_sizeof_system_thread=`expr $glib_cv_sizeof_system_thread + $ac_cv_sizeof_long`],
+ [AC_MSG_RESULT(no)])
+
+ else # solaris threads
+ GLIB_SIZEOF([#include <thread.h>],
+ thread_t,
+ system_thread)
fi
+
LIBS="$glib_save_LIBS"
- CFLAGS="$glib_save_CFLAGS"
# now spit out all the warnings.
- if test "$ac_cv_func_getpwuid_r" != "yes"; then
+ if test "$ac_cv_func_posix_getpwuid_r" != "yes" &&
+ test "$ac_cv_func_nonposix_getpwuid_r" != "yes"; then
AC_MSG_WARN($FUNC_NO_GETPWUID_R)
fi
if test "$ac_cv_func_localtime_r" != "yes"; then
AC_MSG_WARN($FUNC_NO_LOCALTIME_R)
fi
-fi
-
-AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c")
+else
+ # If no thread implementation exists, we will provide enough
+ # space for a pointer
+ GLIB_SIZEOF(, void*, system_thread)
+fi
+
+AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c",
+ [Source file containing theread implementation])
AC_SUBST(G_THREAD_CFLAGS)
AC_SUBST(G_THREAD_LIBS)
AC_SUBST(G_THREAD_LIBS_EXTRA)
-CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
-
dnl **********************************************
dnl *** GDefaultMutex setup and initialization ***
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,
+ 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_cv_sizeof_gmutex,
$mutex_default_init)
- if test x"$have_threads" = xposix; then
- GLIB_BYTE_CONTENTS([#define __USE_GNU
-#include <$mutex_header_file>],
- $mutex_default_type,
- grecmutex,
- $glib_cv_sizeof_gmutex,
- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+ if test x"$glib_cv_byte_contents_gmutex" = xno; then
+ mutex_has_default=no
fi
+ CPPFLAGS="$glib_save_CPPFLAGS"
+ LIBS="$glib_save_LIBS"
,
)
glibconfig-sysdefs.h,
=)
+dnl ***********************
+dnl *** Tests for iconv ***
+dnl ***********************
+
+AC_ARG_WITH(libiconv, [ --with-libiconv Use the libiconv library ],,with_libiconv=maybe)
+
+found_iconv=no
+
+if test "x$with_libiconv" != "xyes" ; then
+ #
+ # Check in the C library
+ #
+ AC_CHECK_FUNC(iconv_open, with_libiconv=no; found_iconv=yes)
+fi
+
+if test "x$with_libiconv" != "xno" ; then
+ #
+ # Check for libiconv
+ #
+ AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=yes; found_iconv=yes)
+fi
+
+if test "x$found_iconv" = "xno" ; then
+ AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
+fi
+
+if test "x$with_libiconv" = "xyes" ; then
+ ICONV_LIBS="-liconv"
+ AC_DEFINE(USE_LIBICONV)
+fi
+AC_SUBST(ICONV_LIBS)
+
+dnl If the system doesn't define EILSEQ, we should define EILSEQ ourselves
+dnl since we need it for g_iconv()
+
+AC_MSG_CHECKING([for EILSEQ])
+AC_TRY_COMPILE([
+#include <errno.h>
+],
+[
+int error = EILSEQ;
+], have_eilseq=yes, have_eilseq=no);
+AC_MSG_RESULT($have_eilseq)
+
+dnl **************************
+dnl *** Checks for gtk-doc ***
+dnl **************************
+
+AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ])
+
+if test "x$with_html_dir" = "x" ; then
+ HTML_DIR='${datadir}/gtk-doc/html'
+else
+ HTML_DIR=$with_html_dir
+fi
+
+AC_SUBST(HTML_DIR)
+
+
+AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
+AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
+AC_SUBST(HAVE_GTK_DOC)
+
+AC_CHECK_PROG(DB2HTML, db2html, true, false)
+AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
+
+dnl Let people disable the gtk-doc stuff.
+AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
+
+if test x$enable_gtk_doc = xauto ; then
+ if test x$GTKDOC = xtrue ; then
+ enable_gtk_doc=yes
+ else
+ enable_gtk_doc=no
+ fi
+fi
+
+dnl NOTE: We need to use a separate automake conditional for this
+dnl to make this work with the tarballs.
+AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
dnl ******************************
dnl *** output the whole stuff ***
cat > $outfile <<\_______EOF
/* glibconfig.h
*
- * This is a generated file. Please modify `configure.in'
+ * This is a generated file. Please modify 'configure.in'
*/
-#ifndef GLIBCONFIG_H
-#define GLIBCONFIG_H
+#ifndef __G_LIBCONFIG_H__
+#define __G_LIBCONFIG_H__
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <gmacros.h>
_______EOF
if test x$glib_values_h = xyes; then
echo '#include <values.h>' >> $outfile
fi
- if test x$g_mutex_header_file != x; then
- echo '#include <'"$g_mutex_header_file"'>' >> $outfile
+ if test "$glib_header_alloca_h" = "yes"; then
+ echo '#define GLIB_HAVE_ALLOCA_H' >> $outfile
fi
if test x$glib_sys_poll_h = xyes; then
echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile
cat >> $outfile <<_______EOF
+G_BEGIN_DECLS
+
#define G_MINFLOAT $glib_mf
#define G_MAXFLOAT $glib_Mf
#define G_MINDOUBLE $glib_md
if test -n "$gint64"; then
cat >>$outfile <<_______EOF
-${glib_warning_guard}#define G_HAVE_GINT64 1
+#define G_HAVE_GINT64 1
${glib_extension}typedef signed $gint64 gint64;
${glib_extension}typedef unsigned $gint64 guint64;
+#define G_GINT64_CONSTANT(val) $gint64_constant
+_______EOF
+ if test -n "$gint64_format"; then
+ cat >>$outfile <<_______EOF
#define G_GINT64_FORMAT $gint64_format
#define G_GUINT64_FORMAT $guint64_format
-#define G_GINT64_CONSTANT(val) $gint64_constant
_______EOF
+ fi
fi
+ case x$glib_size_t in
+ x2) echo "typedef gint16 gssize;" >> $outfile
+ echo "typedef guint16 gsize;" >> $outfile
+ ;;
+ x4) echo "typedef gint32 gssize;" >> $outfile
+ echo "typedef guint32 gsize;" >> $outfile
+ ;;
+ x8) echo "typedef gint64 gssize;" >> $outfile
+ echo "typedef guint64 gsize;" >> $outfile
+ ;;
+ *) echo "#error size of size_t is unknown" >> $outfile
+ ;;
+ esac
if test -z "$glib_unknown_void_p"; then
cat >>$outfile <<_______EOF
_______EOF
echo >>$outfile
+ if test x$g_have_eilseq = xno; then
+ cat >>$outfile <<_______EOF
+#ifndef EILSEQ
+/* On some systems, like SunOS and NetBSD, EILSEQ is not defined.
+ * The correspondence between this and the corresponding definition
+ * in libiconv is essential.
+ */
+# define EILSEQ ENOENT
+#endif
+_______EOF
+
+ fi
+
+ echo >>$outfile
if test x$g_mutex_has_default = xyes; then
cat >>$outfile <<_______EOF
$g_enable_threads_def G_THREADS_ENABLED
struct _GStaticMutex
{
struct _GMutex *runtime_mutex;
- union {
- char pad[$g_mutex_sizeof];
- double dummy_double;
- void *dummy_pointer;
- long dummy_long;
- } aligned_pad_u;
+ struct {
+ union {
+ char pad[$g_mutex_sizeof];
+ double dummy_double;
+ void *dummy_pointer;
+ long dummy_long;
+ } mutex;
+ void *debug_info;
+ } static_mutex;
};
-#define G_STATIC_MUTEX_INIT { NULL, { { $g_mutex_contents} } }
+#define G_STATIC_MUTEX_INIT { NULL, { { { $g_mutex_contents} }, NULL } }
#define g_static_mutex_get_mutex(mutex) \
- (g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \
+ (g_thread_use_default_impl ? ((GMutex*) &((mutex)->static_mutex)) : \
g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex)))
_______EOF
else
#define g_static_mutex_get_mutex(mutex) (g_static_mutex_get_mutex_impl (mutex))
_______EOF
fi
- if test x$g_recmutex_contents != xno -a \
- x$g_recmutex_contents != x; then
- # the definition of GStaticRecMutex is not done via
- # typedef GStaticMutex GStaticRecMutex to avoid silent
- # compilation, when a GStaticRecMutex is used where a
- # GStaticMutex should have been used and vice versa,
- # because that micht fail on other platforms.
- cat >>$outfile <<_______EOF
-typedef struct _GStaticRecMutex GStaticRecMutex;
-struct _GStaticRecMutex
+
+ cat >>$outfile <<_______EOF
+/* This represents a system thread as used by the implementation. An
+ * alien implementaion, as loaded by g_thread_init can only count on
+ * "sizeof (gpointer)" bytes to store their info. We however need more
+ * for some of our native implementations. */
+typedef union _GSystemThread GSystemThread;
+union _GSystemThread
{
- struct _GMutex *runtime_mutex;
- union {
- char pad[$g_mutex_sizeof];
- double dummy_double;
- void *dummy_pointer;
- long dummy_long;
- } aligned_pad_u;
+ char data[$g_system_thread_sizeof];
+ double dummy_double;
+ void *dummy_pointer;
+ long dummy_long;
};
-#define G_STATIC_REC_MUTEX_INIT { NULL, { { $g_recmutex_contents} } }
-#define g_static_rec_mutex_lock(mutex) g_static_mutex_lock (mutex)
-#define g_static_rec_mutex_trylock(mutex) g_static_mutex_trylock (mutex)
-#define g_static_rec_mutex_unlock(mutex) g_static_mutex_unlock (mutex)
-#define g_static_rec_mutex_get_mutex(mutex) (mutex)
_______EOF
- fi
echo >>$outfile
g_bit_sizes="16 32"
cat >>$outfile <<_______EOF
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* GLIBCONFIG_H */
_______EOF
# on variable expansion in case labels. Look at the generated config.status
# for a hint.
+glib_header_alloca_h="$ac_cv_header_alloca_h"
+
case xyes in
x$ac_cv_header_float_h)
glib_float_h=yes
gint64_format='"i"'
guint64_format='"u"'
glib_extension=
- glib_warning_guard=
gint64_constant='(val)'
;;
$ac_cv_sizeof_long)
gint64_format='"li"'
guint64_format='"lu"'
glib_extension=
- glib_warning_guard=
gint64_constant='(val##L)'
;;
$ac_cv_sizeof_long_long)
gint64='long long'
- gint64_format='"'$glib_cv_long_long_format'i"'
- guint64_format='"'$glib_cv_long_long_format'u"'
+ if test -n "$glib_cv_long_long_format"; then
+ gint64_format='"'$glib_cv_long_long_format'i"'
+ guint64_format='"'$glib_cv_long_long_format'u"'
+ fi
glib_extension='G_GNUC_EXTENSION '
- glib_warning_guard="
-#if defined (__GNUC__) && __GNUC__ >= 2 && __GNUC_MINOR__ >= 8
-# define G_GNUC_EXTENSION __extension__
-#else
-# define G_GNUC_EXTENSION
-#endif
-
-"
gint64_constant='(G_GNUC_EXTENSION (val##LL))'
;;
esac
+glib_size_t=$glib_cv_sizeof_size_t
gintbits=`expr $ac_cv_sizeof_int \* 8`
glongbits=`expr $ac_cv_sizeof_long \* 8`
;;
esac
-case x$enable_threads in
-xyes) g_enable_threads_def="#define";;
-*) g_enable_threads_def="#undef ";;
+g_have_eilseq=$have_eilseq
+
+case x$have_threads in
+xnone) g_enable_threads_def="#undef";;
+*) g_enable_threads_def="#define";;
esac
g_threads_impl_def=$g_threads_impl
g_mutex_has_default="$mutex_has_default"
g_mutex_sizeof="$glib_cv_sizeof_gmutex"
+g_system_thread_sizeof="$glib_cv_sizeof_system_thread"
g_mutex_contents="$glib_cv_byte_contents_gmutex"
-g_recmutex_contents="$glib_cv_byte_contents_grecmutex"
case $host in
*-*-beos*)
*-*-cygwin*)
glib_os="#define G_OS_UNIX
#define G_WITH_CYGWIN"
- ;;
+v ;;
*)
glib_os="#define G_OS_UNIX"
;;
])
AC_OUTPUT([
+glib-2.0.pc
+gmodule-2.0.pc
+gthread-2.0.pc
+gobject-2.0.pc
glib.spec
Makefile
-glib-config
+glib-config-2.0
+build/Makefile
+build/win32/Makefile
gmodule/gmoduleconf.h
gmodule/Makefile
+gobject/Makefile
gthread/Makefile
docs/Makefile
docs/glib-config.1
+docs/reference/Makefile
+docs/reference/glib/Makefile
+docs/reference/gobject/Makefile
tests/Makefile
],[case "$CONFIG_FILES" in
-*glib-config*)chmod +x glib-config;;
+*glib-config-2.0*)chmod +x glib-config-2.0;;
esac
echo ""
echo " *** IMPORTANT *** "
echo " * You should not base stable software on this version of GLib."
echo " * GNOME developers should use a stable version of GLib."
echo ""
-echo "Distributions should *NOT* ship a development package of this GLib."
-echo "Do not ship the headers and do not ship the glib-config script. These"
-echo "things will conflict with the stable 1.2 series. Package only enough"
-echo "to satisfy the requirements of some other package. Package only the"
-echo "library itself. Doing otherwise will do no favors to the community."
-echo ""
echo "If you install this version of GLib, we strongly recommend that you"
echo "install it in a different prefix than GLib 1.2. Use --prefix as an"
echo "argument to configure to do this. Otherwise, you will not be able to"
echo ""
echo " *** You should be using GLib 1.2 instead. ***"
])
-
projects / platform / upstream / glib.git / blobdiff