1998-12-19 03:13:34 +01:00
|
|
|
dnl ***********************************
|
|
|
|
dnl *** include special GLib macros ***
|
|
|
|
dnl ***********************************
|
|
|
|
builtin(include, acglib.m4)dnl
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
# Process this file with autoconf to produce a configure script.
|
|
|
|
AC_INIT(glist.c)
|
|
|
|
|
|
|
|
# Save this value here, since automake will set cflags later
|
|
|
|
cflags_set=${CFLAGS+set}
|
|
|
|
|
1998-12-19 04:44:30 +01:00
|
|
|
# we rewrite this file
|
|
|
|
rm -f glibconfig-sysdefs.h
|
|
|
|
|
1998-09-21 04:32:30 +02:00
|
|
|
# The following version number definitions apply to GLib and GModule
|
|
|
|
# as a whole, so if changes occoured in either of them, they are both
|
|
|
|
# treated with the same interface and binary age.
|
|
|
|
#
|
1998-06-11 01:21:14 +02:00
|
|
|
# Making releases:
|
|
|
|
# GLIB_MICRO_VERSION += 1;
|
|
|
|
# GLIB_INTERFACE_AGE += 1;
|
|
|
|
# GLIB_BINARY_AGE += 1;
|
|
|
|
# if any functions have been added, set GLIB_INTERFACE_AGE to 0.
|
|
|
|
# if backwards compatibility has been broken,
|
|
|
|
# set GLIB_BINARY_AGE and GLIB_INTERFACE_AGE to 0.
|
|
|
|
#
|
|
|
|
GLIB_MAJOR_VERSION=1
|
|
|
|
GLIB_MINOR_VERSION=1
|
1999-01-17 05:49:43 +01:00
|
|
|
GLIB_MICRO_VERSION=13
|
1998-12-16 06:18:43 +01:00
|
|
|
GLIB_INTERFACE_AGE=0
|
|
|
|
GLIB_BINARY_AGE=0
|
1998-06-11 01:21:14 +02:00
|
|
|
GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
|
|
|
|
AC_SUBST(GLIB_VERSION)
|
|
|
|
|
|
|
|
# libtool versioning
|
|
|
|
LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION
|
|
|
|
LT_CURRENT=`expr $GLIB_MICRO_VERSION - $GLIB_INTERFACE_AGE`
|
|
|
|
LT_REVISION=$GLIB_INTERFACE_AGE
|
|
|
|
LT_AGE=`expr $GLIB_BINARY_AGE - $GLIB_INTERFACE_AGE`
|
|
|
|
AC_SUBST(LT_RELEASE)
|
|
|
|
AC_SUBST(LT_CURRENT)
|
|
|
|
AC_SUBST(LT_REVISION)
|
|
|
|
AC_SUBST(LT_AGE)
|
|
|
|
|
|
|
|
VERSION=$GLIB_VERSION
|
|
|
|
PACKAGE=glib
|
|
|
|
|
|
|
|
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
|
|
|
|
|
|
|
|
# Specify a configuration file
|
1998-11-01 02:32:59 +01:00
|
|
|
AM_CONFIG_HEADER(config.h)
|
1998-06-11 01:21:14 +02:00
|
|
|
|
|
|
|
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)
|
version bump to 1.1.1, binary age 1, interface age 0. updates. updates.
Tue Aug 4 15:17:54 1998 Tim Janik <timj@gtk.org>
* configure.in: version bump to 1.1.1, binary age 1, interface age 0.
* NEWS: updates.
* README: updates.
* INSTALL: updates and fixes.
* COPYING: include the GNU LGPL, rather than shipping an empty file.
* AUTHORS: listed original authors here, and added people who made
significant improvements to glib.
* glib.h:
* gutils.c: implement g_get_current_dir() which returns a newly
allocated string, instead of a g_getcwd() variant that operates
on a static buffer.
export glib_interface_age and glib_binary_age.
as a convenience, macro definitions have been added for
g_node_insert_data, g_node_insert_data_before, g_node_append_data and
g_node_prepend_data.
* testglib.c: minor cleanups, print current dir.
1998-08-04 16:26:27 +02:00
|
|
|
AC_DEFINE_UNQUOTED(GLIB_INTERFACE_AGE, $GLIB_INTERFACE_AGE)
|
|
|
|
AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE)
|
1998-06-11 01:21:14 +02:00
|
|
|
|
|
|
|
dnl Initialize libtool
|
|
|
|
AM_PROG_LIBTOOL
|
|
|
|
|
|
|
|
dnl Initialize maintainer mode
|
|
|
|
AM_MAINTAINER_MODE
|
|
|
|
|
|
|
|
AC_CANONICAL_HOST
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=minimum]],,enable_debug=minimum)
|
1998-12-16 06:38:35 +01:00
|
|
|
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)
|
1998-06-11 01:21:14 +02:00
|
|
|
AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],
|
|
|
|
, enable_ansi=no)
|
1998-12-16 06:38:35 +01:00
|
|
|
AC_ARG_ENABLE(threads, [ --enable-threads turn on basic thread support [default=yes]
|
|
|
|
([=no] will override --with-threads)],,enable_threads=yes)
|
|
|
|
|
|
|
|
if test "x$enable_threads" != "xyes"; then
|
|
|
|
enable_threads=no
|
|
|
|
fi
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-06-11 02:10:13 +02:00
|
|
|
AC_MSG_CHECKING(whether to enable memory checking)
|
1998-06-11 01:21:14 +02:00
|
|
|
if test "x$enable_mem_check" = "xyes"; then
|
|
|
|
AC_DEFINE(ENABLE_MEM_CHECK, 1)
|
|
|
|
AC_SUBST(ENABLE_MEM_CHECK)
|
1998-06-11 02:10:13 +02:00
|
|
|
AC_MSG_RESULT(yes)
|
1998-06-11 01:21:14 +02:00
|
|
|
else
|
1998-06-11 02:10:13 +02:00
|
|
|
AC_MSG_RESULT(no)
|
1998-06-11 01:21:14 +02:00
|
|
|
fi
|
|
|
|
|
1998-06-11 02:10:13 +02:00
|
|
|
AC_MSG_CHECKING(whether to enable memory profiling)
|
1998-06-11 01:21:14 +02:00
|
|
|
if test "x$enable_mem_profile" = "xyes"; then
|
|
|
|
AC_DEFINE(ENABLE_MEM_PROFILE, 1)
|
|
|
|
AC_SUBST(ENABLE_MEM_PROFILE)
|
1998-06-11 02:10:13 +02:00
|
|
|
AC_MSG_RESULT(yes)
|
1998-06-11 01:21:14 +02:00
|
|
|
else
|
1998-06-11 02:10:13 +02:00
|
|
|
AC_MSG_RESULT(no)
|
1998-06-11 01:21:14 +02:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test "x$enable_debug" = "xyes"; then
|
|
|
|
test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
|
1998-11-29 23:47:07 +01:00
|
|
|
GLIB_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
|
1998-06-11 01:21:14 +02:00
|
|
|
else
|
|
|
|
if test "x$enable_debug" = "xno"; then
|
1998-11-29 23:47:07 +01:00
|
|
|
GLIB_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
|
1998-06-11 01:21:14 +02:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_DEFINE_UNQUOTED(G_COMPILED_WITH_DEBUGGING, "${enable_debug}")
|
|
|
|
|
|
|
|
# Checks for programs.
|
|
|
|
AC_PROG_CC
|
|
|
|
AM_PROG_CC_STDC
|
|
|
|
AC_PROG_INSTALL
|
|
|
|
|
1998-11-01 02:32:59 +01:00
|
|
|
changequote(,)dnl
|
|
|
|
if test "x$GCC" = "xyes"; then
|
|
|
|
case " $CFLAGS " in
|
|
|
|
*[\ \ ]-Wall[\ \ ]*) ;;
|
|
|
|
*) CFLAGS="$CFLAGS -Wall" ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
if test "x$enable_ansi" = "xyes"; then
|
|
|
|
case " $CFLAGS " in
|
|
|
|
*[\ \ ]-ansi[\ \ ]*) ;;
|
|
|
|
*) CFLAGS="$CFLAGS -ansi" ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
case " $CFLAGS " in
|
|
|
|
*[\ \ ]-pedantic[\ \ ]*) ;;
|
|
|
|
*) CFLAGS="$CFLAGS -pedantic" ;;
|
|
|
|
esac
|
1998-06-11 01:21:14 +02:00
|
|
|
fi
|
|
|
|
fi
|
1998-11-01 02:32:59 +01:00
|
|
|
changequote([,])dnl
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-09-08 05:08:22 +02:00
|
|
|
dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
|
1998-09-07 04:13:51 +02:00
|
|
|
AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
|
1998-09-08 05:08:22 +02:00
|
|
|
glib_save_LIBS=$LIBS
|
1998-09-07 04:13:51 +02:00
|
|
|
LIBS="$LIBS -lm"
|
|
|
|
AC_TRY_RUN([#include <math.h>
|
|
|
|
int main (void) { return (log(1) != log(1.)); }],
|
|
|
|
AC_MSG_RESULT(none needed),
|
|
|
|
glib_save_CFLAGS=$CFLAGS
|
|
|
|
CFLAGS="$CFLAGS -std1"
|
|
|
|
AC_TRY_RUN([#include <math.h>
|
|
|
|
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
|
|
|
|
|
1998-09-09 11:52:31 +02:00
|
|
|
dnl NeXTStep cc seems to need this
|
|
|
|
AC_MSG_CHECKING([for extra flags for POSIX compliance])
|
|
|
|
AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
|
|
|
|
AC_MSG_RESULT(none needed),
|
|
|
|
glib_save_CFLAGS=$CFLAGS
|
|
|
|
CFLAGS="$CFLAGS -posix"
|
|
|
|
AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
|
|
|
|
AC_MSG_RESULT(-posix),
|
|
|
|
AC_MSG_RESULT()
|
|
|
|
CFLAGS=$glib_save_CFLAGS
|
|
|
|
AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
# Checks for header files.
|
|
|
|
AC_HEADER_STDC
|
|
|
|
|
|
|
|
# Checks for library functions.
|
|
|
|
AC_FUNC_VPRINTF
|
|
|
|
|
|
|
|
AC_CHECK_FUNCS(atexit on_exit)
|
|
|
|
|
|
|
|
AC_CHECK_SIZEOF(char)
|
|
|
|
AC_CHECK_SIZEOF(short)
|
|
|
|
AC_CHECK_SIZEOF(long)
|
|
|
|
AC_CHECK_SIZEOF(int)
|
|
|
|
AC_CHECK_SIZEOF(void *)
|
1998-07-20 17:53:36 +02:00
|
|
|
AC_CHECK_SIZEOF(long long)
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1999-01-19 10:07:28 +01:00
|
|
|
dnl long doubles were not used, and a portability problem
|
1998-09-07 11:43:54 +02:00
|
|
|
dnl AC_C_LONG_DOUBLE
|
1998-06-11 01:21:14 +02:00
|
|
|
AC_C_CONST
|
|
|
|
|
1998-09-07 11:43:54 +02:00
|
|
|
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_TRY_RUN([
|
|
|
|
__inline int foo () { return 0; }
|
|
|
|
int main () { return foo (); }
|
|
|
|
],
|
|
|
|
glib_cv_has__inline=yes
|
|
|
|
,
|
|
|
|
glib_cv_has__inline=no
|
|
|
|
,)
|
|
|
|
])
|
|
|
|
AC_MSG_RESULT($glib_cv_has__inline)
|
|
|
|
case x$glib_cv_has__inline in
|
1998-09-08 16:27:30 +02:00
|
|
|
xyes) AC_DEFINE(G_HAVE___INLINE)
|
1998-09-07 11:43:54 +02:00
|
|
|
esac
|
|
|
|
AC_MSG_CHECKING(for __inline__)
|
|
|
|
AC_CACHE_VAL(glib_cv_has__inline__,[
|
|
|
|
AC_TRY_RUN([
|
|
|
|
__inline__ int foo () { return 0; }
|
|
|
|
int main () { return foo (); }
|
|
|
|
],
|
|
|
|
glib_cv_has__inline__=yes
|
|
|
|
,
|
|
|
|
glib_cv_has__inline__=no
|
|
|
|
,)
|
|
|
|
])
|
|
|
|
AC_MSG_RESULT($glib_cv_has__inline__)
|
|
|
|
case x$glib_cv_has__inline__ in
|
1998-09-08 16:27:30 +02:00
|
|
|
xyes) AC_DEFINE(G_HAVE___INLINE__)
|
1998-09-07 11:43:54 +02:00
|
|
|
esac
|
|
|
|
AC_MSG_CHECKING(for inline)
|
|
|
|
AC_CACHE_VAL(glib_cv_hasinline,[
|
|
|
|
AC_TRY_RUN([
|
|
|
|
inline int foo () { return 0; }
|
|
|
|
int main () { return foo (); }
|
|
|
|
],
|
|
|
|
glib_cv_hasinline=yes
|
|
|
|
,
|
|
|
|
glib_cv_hasinline=no
|
|
|
|
,)
|
|
|
|
])
|
|
|
|
AC_MSG_RESULT($glib_cv_hasinline)
|
|
|
|
case x$glib_cv_hasinline in
|
1998-09-08 16:27:30 +02:00
|
|
|
xyes) AC_DEFINE(G_HAVE_INLINE)
|
1998-09-07 11:43:54 +02:00
|
|
|
esac
|
|
|
|
|
1998-10-20 12:43:39 +02:00
|
|
|
dnl for bytesex stuff
|
|
|
|
AC_C_BIGENDIAN
|
1998-09-07 11:43:54 +02:00
|
|
|
|
|
|
|
dnl header file checks
|
1998-06-11 01:21:14 +02:00
|
|
|
AC_CHECK_HEADERS(float.h, AC_DEFINE(HAVE_FLOAT_H))
|
|
|
|
AC_CHECK_HEADERS(limits.h, AC_DEFINE(HAVE_LIMITS_H))
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H))
|
|
|
|
AC_CHECK_HEADERS(sys/param.h, AC_DEFINE(HAVE_SYS_PARAM_H))
|
1998-12-02 15:55:27 +01:00
|
|
|
AC_CHECK_HEADERS(sys/poll.h, AC_DEFINE(HAVE_SYS_POLL_H))
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
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))
|
1998-06-11 01:21:14 +02:00
|
|
|
AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H))
|
|
|
|
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
# Check for some functions
|
1999-01-12 10:32:31 +01:00
|
|
|
AC_CHECK_FUNCS(localtime_r rand_r lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll)
|
1998-06-11 01:21:14 +02:00
|
|
|
|
|
|
|
# Check for sys_errlist
|
1998-06-11 02:10:13 +02:00
|
|
|
AC_MSG_CHECKING(for sys_errlist)
|
1998-06-11 01:21:14 +02:00
|
|
|
AC_TRY_LINK(, [
|
|
|
|
extern char *sys_errlist[];
|
|
|
|
extern int sys_nerr;
|
|
|
|
sys_errlist[sys_nerr-1][0] = 0;
|
|
|
|
], glib_ok=yes, glib_ok=no)
|
|
|
|
AC_MSG_RESULT($glib_ok)
|
|
|
|
if test $glib_ok = no; then
|
|
|
|
AC_DEFINE(NO_SYS_ERRLIST)
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Check for sys_siglist
|
1998-06-11 02:10:13 +02:00
|
|
|
AC_MSG_CHECKING(for sys_siglist)
|
1998-06-11 01:21:14 +02:00
|
|
|
AC_TRY_LINK(, [
|
|
|
|
extern char *sys_siglist[];
|
1999-01-19 10:07:28 +01:00
|
|
|
strlen (sys_siglist[0]);
|
1998-06-11 01:21:14 +02:00
|
|
|
], glib_ok=yes, glib_ok=no)
|
|
|
|
AC_MSG_RESULT($glib_ok)
|
|
|
|
if test $glib_ok = no; then
|
|
|
|
AC_DEFINE(NO_SYS_SIGLIST)
|
|
|
|
fi
|
|
|
|
|
1999-01-19 10:07:28 +01:00
|
|
|
# Check for sys_siglist decl (see Tue Jan 19 00:44:24 1999 in changelog)
|
|
|
|
AC_MSG_CHECKING(for sys_siglist declaration)
|
|
|
|
AC_TRY_COMPILE([#include <signal.h>], [
|
|
|
|
strlen (sys_siglist[0]);
|
|
|
|
], glib_ok=yes, glib_ok=no)
|
|
|
|
AC_MSG_RESULT($glib_ok)
|
|
|
|
if test $glib_ok = yes; then
|
|
|
|
AC_DEFINE(NO_SYS_SIGLIST_DECL)
|
|
|
|
fi
|
|
|
|
|
1998-06-11 02:10:13 +02:00
|
|
|
# Check if <sys/select.h> needs to be included for fd_set
|
|
|
|
AC_MSG_CHECKING([for fd_set])
|
1998-06-11 01:21:14 +02:00
|
|
|
AC_TRY_COMPILE([#include <sys/types.h>],
|
|
|
|
[fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no)
|
1998-06-11 02:10:13 +02:00
|
|
|
if test $gtk_ok = yes; then
|
|
|
|
AC_MSG_RESULT([yes, found in sys/types.h])
|
|
|
|
else
|
1998-06-11 01:21:14 +02:00
|
|
|
AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
|
|
|
|
if test $gtk_ok = yes; then
|
|
|
|
AC_DEFINE(HAVE_SYS_SELECT_H)
|
1998-06-11 02:10:13 +02:00
|
|
|
AC_MSG_RESULT([yes, found in sys/select.h])
|
|
|
|
else
|
|
|
|
AC_DEFINE(NO_FD_SET)
|
|
|
|
AC_MSG_RESULT(no)
|
1998-06-11 01:21:14 +02:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
1998-11-01 02:32:59 +01:00
|
|
|
# These are used only in GDK (gdki18n.h)
|
|
|
|
# This stuff is here only so that we can define these
|
|
|
|
# things in glibconfig.h. If gtk+ started using an installed
|
1999-01-19 10:07:28 +01:00
|
|
|
# gdkconfig.h file, then the definitions would belong there.
|
1998-06-11 01:21:14 +02:00
|
|
|
|
|
|
|
# Check for wchar.h
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(for wchar.h)
|
1998-11-01 02:32:59 +01:00
|
|
|
AC_TRY_CPP([#include <wchar.h>], glib_wchar_h=yes, glib_wchar_h=no)
|
|
|
|
if test $glib_wchar_h = yes; then
|
1998-06-11 01:21:14 +02:00
|
|
|
AC_DEFINE(HAVE_WCHAR_H)
|
|
|
|
fi
|
1998-11-01 02:32:59 +01:00
|
|
|
AC_MSG_RESULT($glib_wchar_h)
|
1998-06-11 01:21:14 +02:00
|
|
|
|
|
|
|
# Check for wctype.h (for iswalnum)
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(for wctype.h)
|
1998-11-01 02:32:59 +01:00
|
|
|
AC_TRY_CPP([#include <wctype.h>], glib_wctype_h=yes, glib_wctype_h=no)
|
|
|
|
if test $glib_wctype_h = yes; then
|
1998-06-11 01:21:14 +02:00
|
|
|
AC_DEFINE(HAVE_WCTYPE_H)
|
|
|
|
fi
|
1998-11-01 02:32:59 +01:00
|
|
|
AC_MSG_RESULT($glib_wctype_h)
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-11-01 02:32:59 +01:00
|
|
|
oLIBS="$LIBS"
|
|
|
|
# in Solaris 2.5, `iswalnum' is in -lw
|
|
|
|
AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum)])
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-11-01 02:32:59 +01:00
|
|
|
# The following is necessary for Linux libc-5.4.38
|
1998-06-11 01:21:14 +02:00
|
|
|
AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
|
|
|
|
AC_TRY_LINK([#include <stdlib.h>],[
|
|
|
|
#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
|
|
|
|
# ifdef HAVE_WCTYPE_H
|
|
|
|
# include <wctype.h>
|
|
|
|
# else
|
|
|
|
# ifdef HAVE_WCHAR_H
|
|
|
|
# include <wchar.h>
|
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
#else
|
|
|
|
# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
|
|
|
|
#endif
|
|
|
|
iswalnum((wchar_t) 0);
|
1998-11-01 02:32:59 +01:00
|
|
|
], glib_working_wctype=yes, glib_working_wctype=no)
|
|
|
|
LIBS="$oLIBS"
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-11-01 02:32:59 +01:00
|
|
|
if test $glib_working_wctype = no; then
|
1998-06-11 01:21:14 +02:00
|
|
|
AC_DEFINE(HAVE_BROKEN_WCTYPE)
|
|
|
|
fi
|
1998-11-01 02:32:59 +01:00
|
|
|
AC_MSG_RESULT($glib_working_wctype)
|
|
|
|
|
removed this function which was not publically exported in glib.h. to
Mon Aug 24 02:08:56 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gstring.c:
* gstrfuncs.c:
(g_vsprintf): removed this function which was not publically
exported in glib.h. to export it, it should have been named
differently in the first place, since its semantics differ from
vsprintf(). apart from that, it was a possible cause for
problems since it worked on a previously allocated memory area and
was used in a lot places of glib. exporting it would have been a
guararant for problems with threaded programs.
(g_printf_string_upper_bound): exported this function to return
a string size, guarranteed to be big enough to hold the fully
expanded format+args string. added 'q', 'L' and 'll' flag handling.
in fact, the newly allocated area is in most cases much bigger than
required.
(g_strdup_vprintf()): new function returning a newly allocated string
containing the contents of *format and associated args (size is
calculated with g_printf_string_upper_bound()).
(g_strdup_printf): new function which wraps g_strdup_vprintf().
* configure.in: check for va_copy() or __va_copy() alternatively.
check whether va_lists can be copyied by value.
* glib.h: provide a definition for G_VA_COPY.
* glib.h:
* gmessages.c:
(g_logv):
(g_vsnprintf):
pass va_lists by value, not by reference, since this causes problems
on platforms that implement va_list as as arrays. internaly, use
G_VA_COPY (new_arg, org_arg); va_end (new_arg); to produce a second
va_list variable, if multiple passes are required. changed all
callers.
* glib.h:
* gerror.h:
renamed g_debug() to g_on_error_query(), cleaned up a bit.
renamed g_stack_trace() to g_on_error_stack_trace() since both
functions cluttered different namespaces.
there is an appropriate comment in glib.h now that explains the
unix and gdb specific dependencies of both functions.
removed g_attach_process().
g_on_error_stack_trace() should probably be handled with caution,
i've seem several different linux versions (2.0.x) become unstable
after invokation of this function.
1998-08-24 07:26:53 +02:00
|
|
|
|
|
|
|
dnl **********************
|
|
|
|
dnl *** va_copy checks ***
|
|
|
|
dnl **********************
|
1998-09-07 11:43:54 +02:00
|
|
|
dnl we currently check for all three va_copy possibilities, so we get
|
|
|
|
dnl all results in config.log for bug reports.
|
removed this function which was not publically exported in glib.h. to
Mon Aug 24 02:08:56 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gstring.c:
* gstrfuncs.c:
(g_vsprintf): removed this function which was not publically
exported in glib.h. to export it, it should have been named
differently in the first place, since its semantics differ from
vsprintf(). apart from that, it was a possible cause for
problems since it worked on a previously allocated memory area and
was used in a lot places of glib. exporting it would have been a
guararant for problems with threaded programs.
(g_printf_string_upper_bound): exported this function to return
a string size, guarranteed to be big enough to hold the fully
expanded format+args string. added 'q', 'L' and 'll' flag handling.
in fact, the newly allocated area is in most cases much bigger than
required.
(g_strdup_vprintf()): new function returning a newly allocated string
containing the contents of *format and associated args (size is
calculated with g_printf_string_upper_bound()).
(g_strdup_printf): new function which wraps g_strdup_vprintf().
* configure.in: check for va_copy() or __va_copy() alternatively.
check whether va_lists can be copyied by value.
* glib.h: provide a definition for G_VA_COPY.
* glib.h:
* gmessages.c:
(g_logv):
(g_vsnprintf):
pass va_lists by value, not by reference, since this causes problems
on platforms that implement va_list as as arrays. internaly, use
G_VA_COPY (new_arg, org_arg); va_end (new_arg); to produce a second
va_list variable, if multiple passes are required. changed all
callers.
* glib.h:
* gerror.h:
renamed g_debug() to g_on_error_query(), cleaned up a bit.
renamed g_stack_trace() to g_on_error_stack_trace() since both
functions cluttered different namespaces.
there is an appropriate comment in glib.h now that explains the
unix and gdb specific dependencies of both functions.
removed g_attach_process().
g_on_error_stack_trace() should probably be handled with caution,
i've seem several different linux versions (2.0.x) become unstable
after invokation of this function.
1998-08-24 07:26:53 +02:00
|
|
|
AC_MSG_CHECKING(for an implementation of va_copy())
|
|
|
|
AC_CACHE_VAL(glib_cv_va_copy,[
|
|
|
|
AC_TRY_RUN([
|
|
|
|
#include <stdarg.h>
|
|
|
|
void f (int i, ...) {
|
|
|
|
va_list args1, args2;
|
|
|
|
va_start (args1, i);
|
|
|
|
va_copy (args2, args1);
|
|
|
|
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
|
|
|
|
exit (1);
|
|
|
|
va_end (args1); va_end (args2);
|
|
|
|
}
|
|
|
|
int main() {
|
|
|
|
f (0, 42);
|
|
|
|
return 0;
|
|
|
|
}],
|
|
|
|
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_TRY_RUN([
|
|
|
|
#include <stdarg.h>
|
|
|
|
void f (int i, ...) {
|
|
|
|
va_list args1, args2;
|
|
|
|
va_start (args1, i);
|
|
|
|
__va_copy (args2, args1);
|
|
|
|
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
|
|
|
|
exit (1);
|
|
|
|
va_end (args1); va_end (args2);
|
|
|
|
}
|
|
|
|
int main() {
|
|
|
|
f (0, 42);
|
|
|
|
return 0;
|
|
|
|
}],
|
|
|
|
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,[
|
|
|
|
AC_TRY_RUN([
|
|
|
|
#include <stdarg.h>
|
|
|
|
void f (int i, ...) {
|
|
|
|
va_list args1, args2;
|
|
|
|
va_start (args1, i);
|
|
|
|
args2 = args1;
|
|
|
|
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
|
|
|
|
exit (1);
|
|
|
|
va_end (args1); va_end (args2);
|
|
|
|
}
|
|
|
|
int main() {
|
|
|
|
f (0, 42);
|
|
|
|
return 0;
|
|
|
|
}],
|
|
|
|
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)
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glib_cv_va_val_copy)
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
dnl ***********************
|
|
|
|
dnl *** g_module checks ***
|
|
|
|
dnl ***********************
|
|
|
|
G_MODULE_LIBS=
|
|
|
|
G_MODULE_LDFLAGS=
|
|
|
|
G_MODULE_IMPL=
|
|
|
|
G_MODULE_NEED_USCORE=0
|
|
|
|
G_MODULE_HAVE_DLERROR=0
|
|
|
|
dnl *** dlopen() in system libraries
|
|
|
|
if test -z "$G_MODULE_IMPL"; then
|
|
|
|
AC_CHECK_FUNC(dlopen,
|
|
|
|
G_MODULE_IMPL=G_MODULE_IMPL_DL
|
|
|
|
,)
|
|
|
|
fi
|
|
|
|
dnl *** dlopen() in libdl
|
|
|
|
if test -z "$G_MODULE_IMPL"; then
|
|
|
|
AC_CHECK_LIB(dl, dlopen,
|
|
|
|
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
|
1998-10-27 07:19:42 +01:00
|
|
|
AC_MSG_CHECKING(how to export all symbols)
|
|
|
|
SAVED_LDFLAGS=$LDFLAGS
|
|
|
|
LDFLAGS="$LDFLAGS -Wl,-E"
|
|
|
|
AC_TRY_LINK(,[ return 0; ],
|
|
|
|
[ G_MODULE_LDFLAGS="-Wl,-E" ],[
|
|
|
|
LDFLAGS="$SAVED_LDFLAGS -bexpall"
|
|
|
|
AC_TRY_LINK(,[ return 0; ],
|
|
|
|
G_MODULE_LDFLAGS="-bexpall",
|
|
|
|
G_MODULE_LDFLAGS="none"
|
|
|
|
)
|
|
|
|
])
|
|
|
|
LDFLAGS=$SAVED_LDFLAGS
|
|
|
|
AC_MSG_RESULT($G_MODULE_LDFLAGS)
|
|
|
|
if test "x$G_MODULE_LDFLAGS" = "xnone"; then
|
|
|
|
G_MODULE_LDFLAGS=
|
|
|
|
fi
|
1998-08-09 10:32:18 +02:00
|
|
|
AC_CHECK_LIB(dld, shl_load,
|
|
|
|
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
|
1998-10-27 07:19:42 +01:00
|
|
|
case "$host_os" in
|
|
|
|
linux*)
|
|
|
|
G_MODULE_LDFLAGS='-rdynamic'
|
|
|
|
;;
|
|
|
|
esac
|
1998-08-09 10:32:18 +02:00
|
|
|
LIBS_orig="$LIBS"
|
|
|
|
LDFLAGS_orig="$LDFLAGS"
|
|
|
|
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_TRY_RUN([
|
|
|
|
#include <dlfcn.h>
|
1998-10-21 20:04:47 +02:00
|
|
|
int glib_underscore_test (void) { return 42; }
|
1998-08-09 10:32:18 +02:00
|
|
|
int main() {
|
|
|
|
void *f1 = (void*)0, *f2 = (void*)0, *handle;
|
1998-10-21 20:04:47 +02:00
|
|
|
handle = dlopen ((void*)0, 0);
|
1998-08-09 10:32:18 +02:00
|
|
|
if (handle) {
|
|
|
|
f1 = dlsym (handle, "glib_underscore_test");
|
|
|
|
f2 = dlsym (handle, "_glib_underscore_test");
|
1998-10-21 20:04:47 +02:00
|
|
|
} return (!f2 || f1);
|
1999-01-19 10:07:28 +01:00
|
|
|
}],
|
|
|
|
glib_cv_uscore=yes,
|
1998-10-20 16:39:55 +02:00
|
|
|
glib_cv_uscore=no,
|
|
|
|
)
|
|
|
|
rm -f plugin.c plugin.o plugin.lo
|
1998-08-09 10:32:18 +02:00
|
|
|
])
|
1999-01-19 10:07:28 +01:00
|
|
|
AC_MSG_RESULT($glib_cv_uscore)
|
1998-10-20 16:39:55 +02:00
|
|
|
if test "x$glib_cv_uscore" = "xyes"; then
|
|
|
|
G_MODULE_NEED_USCORE=1
|
|
|
|
else
|
|
|
|
G_MODULE_NEED_USCORE=0
|
1999-01-19 10:07:28 +01:00
|
|
|
fi
|
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
LDFLAGS="$LDFLAGS_orig"
|
|
|
|
dnl *** check for having dlerror()
|
|
|
|
AC_CHECK_FUNC(dlerror,
|
|
|
|
G_MODULE_HAVE_DLERROR=1,
|
|
|
|
G_MODULE_HAVE_DLERROR=0)
|
|
|
|
LIBS="$LIBS_orig"
|
|
|
|
fi
|
|
|
|
dnl *** done, have e got an implementation?
|
|
|
|
if test -z "$G_MODULE_IMPL"; then
|
|
|
|
G_MODULE_IMPL=0
|
|
|
|
fi
|
|
|
|
AC_SUBST(G_MODULE_IMPL)
|
|
|
|
AC_SUBST(G_MODULE_LIBS)
|
|
|
|
AC_SUBST(G_MODULE_LDFLAGS)
|
|
|
|
AC_SUBST(G_MODULE_HAVE_DLERROR)
|
|
|
|
AC_SUBST(G_MODULE_NEED_USCORE)
|
1998-11-29 23:47:07 +01:00
|
|
|
AC_SUBST(GLIB_DEBUG_FLAGS)
|
1998-08-09 10:32:18 +02:00
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
|
|
|
|
dnl ***********************
|
|
|
|
dnl *** g_thread checks ***
|
|
|
|
dnl ***********************
|
|
|
|
|
1998-12-16 06:38:35 +01:00
|
|
|
AC_ARG_WITH(threads, [ --with-threads=[none/posix/solaris/nspr] specify a thread implementation to use],
|
1998-12-15 18:18:39 +01:00
|
|
|
if test "x$with_threads" = x; then
|
|
|
|
want_threads=yes
|
|
|
|
else
|
|
|
|
want_threads=$with_threads
|
|
|
|
fi,
|
|
|
|
want_threads=yes)
|
1998-12-16 06:38:35 +01:00
|
|
|
if test "x$enable_threads" = "xno"; then
|
|
|
|
want_threads=no
|
|
|
|
fi
|
1998-12-15 18:18:39 +01:00
|
|
|
if test "x$want_threads" = "xnone"; then
|
|
|
|
want_threads=no
|
|
|
|
fi
|
1998-12-15 06:28:02 +01:00
|
|
|
|
|
|
|
dnl error and warning message
|
|
|
|
dnl *************************
|
|
|
|
|
|
|
|
THREAD_NO_IMPLEMENTATION="You do not have any known thread system on your
|
|
|
|
computer. glib will not be thread safe on your computer."
|
|
|
|
|
|
|
|
FLAG_DOES_NOT_WORK="I can't find the MACRO, that enables thread safety on your
|
|
|
|
platform (normaly it's "_REENTRANT"). I'll not use any flag on
|
1999-01-19 10:07:28 +01:00
|
|
|
compilation now, but then your programs might not work.
|
1998-12-15 06:28:02 +01:00
|
|
|
Please provide information on how it is done on your system."
|
|
|
|
|
|
|
|
LIBS_NOT_FOUND_1="I can't find the libraries for the thread implementation
|
|
|
|
"
|
|
|
|
|
1999-01-19 10:07:28 +01:00
|
|
|
LIBS_NOT_FOUND_2=". Please choose another thread implementation or
|
1998-12-15 06:28:02 +01:00
|
|
|
provide informationon your thread implementation."
|
|
|
|
|
|
|
|
dnl determination of thread implementation
|
|
|
|
dnl ***************************************
|
|
|
|
|
1998-12-15 18:18:39 +01:00
|
|
|
have_threads=none
|
|
|
|
if test "x$want_threads" = xyes || test "x$want_threads" = xsolaris; then
|
|
|
|
case $host in
|
|
|
|
*-*-solaris*)
|
|
|
|
AC_CHECK_LIB(thread, cond_init, have_threads=solaris)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
if test "x$want_threads" = xyes || test "x$want_threads" = xposix; then
|
|
|
|
if test "x$have_threads" = xnone; then
|
1998-12-17 05:08:33 +01:00
|
|
|
AC_CHECK_LIB(pthread, pthread_attr_init, have_threads=posix)
|
1998-12-15 18:18:39 +01:00
|
|
|
fi
|
|
|
|
if test "x$have_threads" = xnone; then
|
1998-12-17 05:08:33 +01:00
|
|
|
AC_CHECK_LIB(pthreads, pthread_attr_init, have_threads=posix)
|
1998-12-15 18:18:39 +01:00
|
|
|
fi
|
1999-01-11 11:05:33 +01:00
|
|
|
if test "x$have_threads" = xnone; then
|
|
|
|
AC_CHECK_LIB(c_r, pthread_attr_init, have_threads=posix)
|
|
|
|
fi
|
1998-12-15 18:18:39 +01:00
|
|
|
if test "x$have_threads" = xnone; then
|
1998-12-15 18:50:47 +01:00
|
|
|
AC_CHECK_FUNC(pthread_attr_init, have_threads=posix)
|
1998-12-15 18:18:39 +01:00
|
|
|
fi
|
1999-01-11 18:12:18 +01:00
|
|
|
dnl ********** DG/UX ************
|
|
|
|
if test "x$have_threads" = xnone; then
|
1999-01-19 10:07:28 +01:00
|
|
|
AC_CHECK_LIB(thread, __d10_pthread_attr_init,
|
1999-01-11 18:12:18 +01:00
|
|
|
have_threads=posix)
|
|
|
|
fi
|
1998-12-15 18:18:39 +01:00
|
|
|
fi
|
|
|
|
if test "x$want_threads" = xyes || test "x$want_threads" = xnspr; then
|
|
|
|
if test "x$have_threads" = xnone; then
|
|
|
|
AC_CHECK_LIB(nspr21, PRP_NewNakedCondVar, have_threads=nspr)
|
1998-12-15 06:28:02 +01:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(for thread implementation)
|
|
|
|
|
1998-12-15 18:50:47 +01:00
|
|
|
if test "x$have_threads" = xnone && test "x$want_threads" != xno; then
|
1998-12-15 16:47:13 +01:00
|
|
|
AC_MSG_RESULT(none available)
|
1998-12-15 06:28:02 +01:00
|
|
|
AC_MSG_WARN($THREAD_NO_IMPLEMENTATION)
|
1998-12-15 16:47:13 +01:00
|
|
|
else
|
1998-12-15 18:18:39 +01:00
|
|
|
AC_MSG_RESULT($have_threads)
|
1998-12-15 06:28:02 +01:00
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
dnl determination of G_THREAD_LIBS
|
|
|
|
dnl ******************************
|
|
|
|
|
|
|
|
G_THREAD_LIBS=
|
1999-01-11 18:12:18 +01:00
|
|
|
G_THREAD_CFLAGS=
|
1998-12-15 06:28:02 +01:00
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
mutex_has_default=no
|
1998-12-15 18:18:39 +01:00
|
|
|
case $have_threads in
|
1998-12-15 06:28:02 +01:00
|
|
|
posix)
|
|
|
|
G_THREAD_LIBS=error
|
1998-12-17 05:08:33 +01:00
|
|
|
AC_CHECK_LIB(pthread, pthread_attr_init,
|
1999-01-19 10:07:28 +01:00
|
|
|
G_THREAD_LIBS="-lpthread")
|
1998-12-15 18:18:39 +01:00
|
|
|
if test "x$G_THREAD_LIBS" = xerror; then
|
1998-12-17 05:08:33 +01:00
|
|
|
AC_CHECK_LIB(pthreads, pthread_attr_init,
|
1998-12-15 18:18:39 +01:00
|
|
|
G_THREAD_LIBS="-lpthreads")
|
|
|
|
fi
|
1999-01-11 11:05:33 +01:00
|
|
|
if test "x$G_THREAD_LIBS" = xerror; then
|
|
|
|
AC_CHECK_LIB(c_r, pthread_attr_init,
|
|
|
|
G_THREAD_LIBS="-lc_r")
|
|
|
|
fi
|
1998-12-15 18:18:39 +01:00
|
|
|
if test "x$G_THREAD_LIBS" = xerror; then
|
1998-12-18 10:20:52 +01:00
|
|
|
AC_CHECK_FUNC(pthread_attr_init, G_THREAD_LIBS="")
|
1998-12-15 18:18:39 +01:00
|
|
|
fi
|
1999-01-11 18:12:18 +01:00
|
|
|
dnl ********** DG/UX ************
|
|
|
|
if test "x$G_THREAD_LIBS" = xerror; then
|
1999-01-19 10:07:28 +01:00
|
|
|
AC_CHECK_LIB(thread, __d10_pthread_attr_init,
|
1999-01-11 18:12:18 +01:00
|
|
|
G_THREAD_LIBS="-lthread"
|
|
|
|
G_THREAD_CFLAGS="-D_POSIX4A_DRAFT10_SOURCE")
|
|
|
|
fi
|
1998-12-19 03:13:34 +01:00
|
|
|
mutex_has_default=yes
|
|
|
|
mutex_default_type='pthread_mutex_t'
|
|
|
|
mutex_default_init='PTHREAD_MUTEX_INITIALIZER'
|
|
|
|
mutex_header_file='pthread.h'
|
1999-01-07 17:17:42 +01:00
|
|
|
g_threads_impl="POSIX"
|
1998-12-15 06:28:02 +01:00
|
|
|
;;
|
|
|
|
solaris)
|
|
|
|
G_THREAD_LIBS=error
|
1998-12-15 18:18:39 +01:00
|
|
|
AC_CHECK_LIB(thread, cond_init, G_THREAD_LIBS="-lthread")
|
1998-12-19 03:13:34 +01:00
|
|
|
mutex_has_default=yes
|
|
|
|
mutex_default_type='mutex_t'
|
1999-01-07 17:17:42 +01:00
|
|
|
mutex_default_init="DEFAULTMUTEX"
|
1998-12-19 03:13:34 +01:00
|
|
|
mutex_header_file='thread.h'
|
1999-01-07 17:17:42 +01:00
|
|
|
g_threads_impl="SOLARIS"
|
1998-12-15 06:28:02 +01:00
|
|
|
;;
|
|
|
|
nspr)
|
1998-12-15 18:18:39 +01:00
|
|
|
AC_CHECK_LIB(nspr21, PRP_NewNakedCondVar,
|
1998-12-15 06:28:02 +01:00
|
|
|
G_THREAD_LIBS="-lnspr21")
|
1999-01-07 17:17:42 +01:00
|
|
|
g_threads_impl="NSPR"
|
1998-12-15 06:28:02 +01:00
|
|
|
;;
|
|
|
|
none)
|
1999-01-07 17:17:42 +01:00
|
|
|
g_threads_impl="NONE"
|
1998-12-15 06:28:02 +01:00
|
|
|
;;
|
|
|
|
*)
|
1999-01-07 17:17:42 +01:00
|
|
|
g_threads_impl="NONE"
|
1998-12-15 06:28:02 +01:00
|
|
|
G_THREAD_LIBS=error
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
if test "x$G_THREAD_LIBS" = xerror; then
|
1998-12-15 18:18:39 +01:00
|
|
|
AC_MSG_ERROR($LIBS_NOT_FOUND_1$have_threads$LIBS_NOT_FOUND_2)
|
1998-12-15 06:28:02 +01:00
|
|
|
fi
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(necessary linker options)
|
|
|
|
AC_MSG_RESULT($G_THREAD_LIBS)
|
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
dnl determination of G_THREAD_CFLAGS
|
|
|
|
dnl ********************************
|
|
|
|
|
1998-12-15 18:18:39 +01:00
|
|
|
if test x"$have_threads" != xnone; then
|
1999-01-16 23:45:18 +01:00
|
|
|
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT" # good default guess
|
|
|
|
|
|
|
|
case $host in
|
|
|
|
*-aix*)
|
|
|
|
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
|
1999-01-19 10:07:28 +01:00
|
|
|
if test x"$GCC" = xyes; then
|
1999-01-16 23:45:18 +01:00
|
|
|
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
|
1998-12-15 06:28:02 +01:00
|
|
|
|
1999-01-19 10:07:28 +01:00
|
|
|
# if we are not finding the ctime_r function, then we probably are
|
1999-01-16 23:45:18 +01:00
|
|
|
# not using the proper multithread flag
|
|
|
|
old_CPPFLAGS=$CPPFLAGS
|
|
|
|
CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
|
1999-01-19 10:07:28 +01:00
|
|
|
AC_EGREP_HEADER([[^a-zA-Z_]ctime_r[^a-zA-Z_]], time.h, ,
|
1999-01-16 23:45:18 +01:00
|
|
|
G_THREAD_CFLAGS=
|
|
|
|
AC_MSG_WARN($FLAG_DOES_NOT_WORK))
|
|
|
|
CPPFLAGS=$old_CPPFLAGS
|
1998-12-15 06:28:02 +01:00
|
|
|
|
1999-01-16 23:45:18 +01:00
|
|
|
AC_MSG_CHECKING(necessary compiler options)
|
1998-12-15 06:28:02 +01:00
|
|
|
|
1999-01-16 23:45:18 +01:00
|
|
|
AC_MSG_RESULT($G_THREAD_CFLAGS)
|
1998-12-15 06:28:02 +01:00
|
|
|
else
|
1999-01-16 23:45:18 +01:00
|
|
|
G_THREAD_CFLAGS=
|
1998-12-15 06:28:02 +01:00
|
|
|
fi
|
|
|
|
|
1998-12-15 18:18:39 +01:00
|
|
|
AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c")
|
1998-12-15 06:28:02 +01:00
|
|
|
AC_SUBST(G_THREAD_CFLAGS)
|
|
|
|
AC_SUBST(G_THREAD_LIBS)
|
|
|
|
|
1998-12-15 18:50:47 +01:00
|
|
|
CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
|
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
dnl **********************************************
|
|
|
|
dnl *** GDefaultMutex setup and initialization ***
|
|
|
|
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,
|
|
|
|
GLIB_SIZEOF([#include <$mutex_header_file>],
|
|
|
|
$mutex_default_type,
|
|
|
|
gmutex,
|
|
|
|
)
|
|
|
|
GLIB_BYTE_CONTENTS([#include <$mutex_header_file>],
|
|
|
|
$mutex_default_type,
|
|
|
|
gmutex,
|
|
|
|
$glib_cv_sizeof_gmutex,
|
|
|
|
$mutex_default_init)
|
|
|
|
,
|
|
|
|
)
|
|
|
|
|
|
|
|
|
1998-12-19 04:44:30 +01:00
|
|
|
dnl ****************************************
|
|
|
|
dnl *** GLib POLL* compatibility defines ***
|
|
|
|
dnl ****************************************
|
1999-01-05 21:29:49 +01:00
|
|
|
GLIB_SYSDEFS(
|
|
|
|
[#include <sys/types.h>
|
|
|
|
#include <sys/poll.h>],
|
1998-12-26 04:58:06 +01:00
|
|
|
POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32,
|
1998-12-19 04:44:30 +01:00
|
|
|
glibconfig-sysdefs.h,
|
|
|
|
=)
|
|
|
|
|
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
dnl ******************************
|
|
|
|
dnl *** output the whole stuff ***
|
|
|
|
dnl ******************************
|
|
|
|
|
1998-11-01 02:32:59 +01:00
|
|
|
AC_OUTPUT_COMMANDS([
|
|
|
|
|
|
|
|
## Generate `glibconfig.h' in two cases
|
|
|
|
## 1. `config.status' is run either explicitly, or via configure.
|
|
|
|
## Esp. not when it is run in `Makefile' to generate makefiles and
|
|
|
|
## config.h
|
|
|
|
## 2. CONFIG_OTHER is set explicitly
|
|
|
|
##
|
|
|
|
## Case 1 is difficult. We know that `automake' sets one of
|
|
|
|
## CONFIG_FILES or CONFIG_HEADERS to empty. This heuristic works
|
1999-01-19 10:07:28 +01:00
|
|
|
## only when AM_CONFIG_HEADER is set, however.
|
1998-11-01 02:32:59 +01:00
|
|
|
|
|
|
|
if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
|
|
|
|
# Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
|
|
|
|
CONFIG_OTHER=${CONFIG_OTHER:-glibconfig.h}
|
|
|
|
fi
|
|
|
|
case "$CONFIG_OTHER" in
|
|
|
|
*glibconfig.h*)
|
1998-12-19 03:13:34 +01:00
|
|
|
echo creating glibconfig.h
|
|
|
|
outfile=glibconfig.h-tmp
|
|
|
|
cat > $outfile <<\_______EOF
|
|
|
|
/* glibconfig.h
|
|
|
|
*
|
|
|
|
* This is a generated file. Please modify `configure.in'
|
|
|
|
*/
|
1998-11-01 02:32:59 +01:00
|
|
|
|
|
|
|
#ifndef GLIBCONFIG_H
|
|
|
|
#define GLIBCONFIG_H
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" {
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
_______EOF
|
1998-11-01 02:32:59 +01:00
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
if test x$glib_limits_h = xyes; then
|
|
|
|
echo '#include <limits.h>' >> $outfile
|
1999-01-19 10:07:28 +01:00
|
|
|
fi
|
1998-12-19 03:13:34 +01:00
|
|
|
if test x$glib_float_h = xyes; then
|
|
|
|
echo '#include <float.h>' >> $outfile
|
1999-01-19 10:07:28 +01:00
|
|
|
fi
|
1998-12-19 03:13:34 +01:00
|
|
|
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
|
|
|
|
fi
|
|
|
|
if test x$glib_sys_poll_h = xyes; then
|
1998-12-19 04:44:30 +01:00
|
|
|
echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile
|
1998-12-19 03:13:34 +01:00
|
|
|
fi
|
|
|
|
|
|
|
|
cat >> $outfile <<_______EOF
|
1998-11-01 02:32:59 +01:00
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
#define G_MINFLOAT $glib_mf
|
|
|
|
#define G_MAXFLOAT $glib_Mf
|
|
|
|
#define G_MINDOUBLE $glib_md
|
|
|
|
#define G_MAXDOUBLE $glib_Md
|
|
|
|
#define G_MINSHORT $glib_ms
|
|
|
|
#define G_MAXSHORT $glib_Ms
|
|
|
|
#define G_MININT $glib_mi
|
|
|
|
#define G_MAXINT $glib_Mi
|
|
|
|
#define G_MINLONG $glib_ml
|
|
|
|
#define G_MAXLONG $glib_Ml
|
1998-11-01 02:32:59 +01:00
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
_______EOF
|
1998-11-01 02:32:59 +01:00
|
|
|
|
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
### this should always be true in a modern C/C++ compiler
|
|
|
|
cat >>$outfile <<_______EOF
|
1998-11-01 02:32:59 +01:00
|
|
|
typedef signed char gint8;
|
|
|
|
typedef unsigned char guint8;
|
1998-12-19 03:13:34 +01:00
|
|
|
_______EOF
|
1998-11-01 02:32:59 +01:00
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
|
|
|
|
if test -n "$gint16"; then
|
|
|
|
cat >>$outfile <<_______EOF
|
1998-11-01 02:32:59 +01:00
|
|
|
typedef signed $gint16 gint16;
|
|
|
|
typedef unsigned $gint16 guint16;
|
1998-12-19 03:13:34 +01:00
|
|
|
_______EOF
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if test -n "$gint32"; then
|
|
|
|
cat >>$outfile <<_______EOF
|
1998-11-01 02:32:59 +01:00
|
|
|
typedef signed $gint32 gint32;
|
|
|
|
typedef unsigned $gint32 guint32;
|
1998-12-19 03:13:34 +01:00
|
|
|
_______EOF
|
1999-01-19 10:07:28 +01:00
|
|
|
fi
|
1998-12-19 03:13:34 +01:00
|
|
|
|
|
|
|
|
|
|
|
if test -n "$gint64"; then
|
|
|
|
cat >>$outfile <<_______EOF
|
1998-11-11 02:26:10 +01:00
|
|
|
${glib_warning_guard}#define G_HAVE_GINT64 1
|
|
|
|
|
|
|
|
${glib_extension}typedef signed $gint64 gint64;
|
|
|
|
${glib_extension}typedef unsigned $gint64 guint64;
|
|
|
|
|
|
|
|
#define G_GINT64_CONSTANT(val) $gint64_constant
|
1998-12-19 03:13:34 +01:00
|
|
|
_______EOF
|
1999-01-19 10:07:28 +01:00
|
|
|
fi
|
|
|
|
|
1998-11-01 02:32:59 +01:00
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
if test -z "$glib_unknown_void_p"; then
|
|
|
|
cat >>$outfile <<_______EOF
|
|
|
|
|
|
|
|
#define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p))
|
|
|
|
#define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p))
|
|
|
|
|
|
|
|
#define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i))
|
|
|
|
#define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u))
|
|
|
|
_______EOF
|
|
|
|
else
|
|
|
|
echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
|
|
|
|
fi
|
1998-11-01 02:32:59 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
cat >>$outfile <<_______EOF
|
1998-11-01 02:32:59 +01:00
|
|
|
$glib_atexit
|
|
|
|
$glib_memmove
|
|
|
|
$glib_defines
|
|
|
|
|
|
|
|
$glib_vacopy
|
|
|
|
|
1998-12-13 01:09:27 +01:00
|
|
|
#ifdef __cplusplus
|
|
|
|
#define G_HAVE_INLINE 1
|
|
|
|
#else /* !__cplusplus */
|
1998-11-01 02:32:59 +01:00
|
|
|
$glib_inline
|
1998-12-13 01:09:27 +01:00
|
|
|
#endif /* !__cplusplus */
|
1998-12-19 03:13:34 +01:00
|
|
|
_______EOF
|
1998-11-01 02:32:59 +01:00
|
|
|
|
1998-12-19 04:44:30 +01:00
|
|
|
echo >>$outfile
|
1998-12-19 03:13:34 +01:00
|
|
|
if test x$g_mutex_has_default = xyes; then
|
|
|
|
cat >>$outfile <<_______EOF
|
1998-12-16 06:38:35 +01:00
|
|
|
$g_enable_threads_def G_THREADS_ENABLED
|
1999-01-07 17:17:42 +01:00
|
|
|
#define G_THREADS_IMPL_$g_threads_impl_def
|
1998-12-15 06:28:02 +01:00
|
|
|
typedef struct _GStaticMutex GStaticMutex;
|
1998-12-19 03:13:34 +01:00
|
|
|
struct _GStaticMutex
|
1998-12-15 06:28:02 +01:00
|
|
|
{
|
1998-12-19 03:13:34 +01:00
|
|
|
struct _GMutex *runtime_mutex;
|
|
|
|
union {
|
|
|
|
char pad[$g_mutex_sizeof];
|
|
|
|
double dummy_double;
|
|
|
|
void *dummy_pointer;
|
|
|
|
long dummy_long;
|
|
|
|
} aligned_pad_u;
|
1998-12-15 06:28:02 +01:00
|
|
|
};
|
1998-12-19 03:13:34 +01:00
|
|
|
#define G_STATIC_MUTEX_INIT { NULL, { { $g_mutex_contents} } }
|
|
|
|
#define g_static_mutex_get_mutex(mutex) \
|
|
|
|
(g_thread_use_default_impl ? ((GMutex*) &(mutex).aligned_pad_u) : \
|
|
|
|
g_static_mutex_get_mutex_impl (&(mutex).runtime_mutex))
|
|
|
|
_______EOF
|
|
|
|
else
|
|
|
|
cat >>$outfile <<_______EOF
|
|
|
|
$g_enable_threads_def G_THREADS_ENABLED
|
1999-01-07 17:17:42 +01:00
|
|
|
#define $g_threads_impl_def
|
1998-12-15 06:28:02 +01:00
|
|
|
typedef struct _GMutex* GStaticMutex;
|
|
|
|
#define G_STATIC_MUTEX_INIT NULL
|
1998-12-19 03:13:34 +01:00
|
|
|
#define g_static_mutex_get_mutex(mutex) (g_static_mutex_get_mutex_impl (&(mutex)))
|
|
|
|
_______EOF
|
|
|
|
fi
|
1999-01-19 10:07:28 +01:00
|
|
|
|
1998-12-19 04:44:30 +01:00
|
|
|
echo >>$outfile
|
1998-12-19 03:13:34 +01:00
|
|
|
g_bit_sizes="16 32"
|
|
|
|
if test -n "$gint64"; then
|
|
|
|
g_bit_sizes="$g_bit_sizes 64"
|
|
|
|
fi
|
|
|
|
for bits in $g_bit_sizes; do
|
|
|
|
cat >>$outfile <<_______EOF
|
1998-11-02 08:04:38 +01:00
|
|
|
#define GINT${bits}_TO_${g_bs_native}(val) ((gint${bits}) (val))
|
|
|
|
#define GUINT${bits}_TO_${g_bs_native}(val) ((guint${bits}) (val))
|
|
|
|
#define GINT${bits}_TO_${g_bs_alien}(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
|
|
|
|
#define GUINT${bits}_TO_${g_bs_alien}(val) (GUINT${bits}_SWAP_LE_BE (val))
|
1998-12-19 03:13:34 +01:00
|
|
|
_______EOF
|
|
|
|
done
|
1998-11-02 08:04:38 +01:00
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
cat >>$outfile <<_______EOF
|
1998-11-02 08:04:38 +01:00
|
|
|
#define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val))
|
|
|
|
#define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val))
|
|
|
|
#define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val))
|
|
|
|
#define GULONG_TO_BE(val) ((gulong) GUINT${glongbits}_TO_BE (val))
|
|
|
|
#define GINT_TO_LE(val) ((gint) GINT${gintbits}_TO_LE (val))
|
|
|
|
#define GUINT_TO_LE(val) ((guint) GUINT${gintbits}_TO_LE (val))
|
|
|
|
#define GINT_TO_BE(val) ((gint) GINT${gintbits}_TO_BE (val))
|
|
|
|
#define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val))
|
1998-12-19 03:13:34 +01:00
|
|
|
#define G_BYTE_ORDER $g_byte_order
|
|
|
|
|
1998-12-19 04:44:30 +01:00
|
|
|
_______EOF
|
|
|
|
|
|
|
|
if test -r glibconfig-sysdefs.h; then
|
|
|
|
cat glibconfig-sysdefs.h >>$outfile
|
|
|
|
fi
|
1999-01-19 10:07:28 +01:00
|
|
|
|
|
|
|
|
1998-12-19 04:44:30 +01:00
|
|
|
cat >>$outfile <<_______EOF
|
|
|
|
|
1998-11-01 02:32:59 +01:00
|
|
|
$glib_wc
|
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
|
1998-11-01 02:32:59 +01:00
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
|
|
#endif /* GLIBCONFIG_H */
|
1998-12-19 03:13:34 +01:00
|
|
|
_______EOF
|
1998-11-01 02:32:59 +01:00
|
|
|
|
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
if cmp -s $outfile glibconfig.h; then
|
|
|
|
echo glibconfig.h is unchanged
|
|
|
|
rm -f $outfile
|
|
|
|
else
|
|
|
|
mv $outfile glibconfig.h
|
|
|
|
fi ;;
|
1998-11-01 02:32:59 +01:00
|
|
|
esac
|
|
|
|
],[
|
|
|
|
|
|
|
|
# Note that if two cases are the same, case goes with the first one.
|
|
|
|
# Note also that this is inside an AC_OUTPUT_COMMAND. We do not depend
|
|
|
|
# on variable expansion in case labels. Look at the generated config.status
|
|
|
|
# for a hint.
|
|
|
|
|
|
|
|
case xyes in
|
|
|
|
x$ac_cv_header_float_h)
|
|
|
|
glib_float_h=yes
|
|
|
|
glib_mf=FLT_MIN glib_Mf=FLT_MAX
|
|
|
|
glib_md=DBL_MIN glib_Md=DBL_MAX
|
|
|
|
;;
|
|
|
|
x$ac_cv_header_values_h)
|
|
|
|
glib_values_h=yes
|
|
|
|
glib_mf=MINFLOAT glib_Mf=MAXFLOAT
|
|
|
|
glib_md=MINDOUBLE glib_Md=MAXDOUBLE
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
case xyes in
|
|
|
|
x$ac_cv_header_limits_h)
|
|
|
|
glib_limits_h=yes
|
|
|
|
glib_ms=SHRT_MIN glib_Ms=SHRT_MAX
|
|
|
|
glib_mi=INT_MIN glib_Mi=INT_MAX
|
|
|
|
glib_ml=LONG_MIN glib_Ml=LONG_MAX
|
|
|
|
;;
|
|
|
|
x$ac_cv_header_values_h)
|
|
|
|
glib_values_h=yes
|
|
|
|
glib_ms=MINSHORT glib_Ms=MAXSHORT
|
|
|
|
glib_mi=MININT glib_Mi=MAXINT
|
|
|
|
glib_ml=MINLONG glib_Ml=MAXLONG
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
1998-12-02 15:55:27 +01:00
|
|
|
if test x$ac_cv_header_sys_poll_h = xyes ; then
|
|
|
|
glib_sys_poll_h=yes
|
|
|
|
fi
|
|
|
|
|
1998-11-01 02:32:59 +01:00
|
|
|
case 2 in
|
1998-11-02 08:04:38 +01:00
|
|
|
$ac_cv_sizeof_short) gint16=short;;
|
|
|
|
$ac_cv_sizeof_int) gint16=int;;
|
1998-11-01 02:32:59 +01:00
|
|
|
esac
|
|
|
|
case 4 in
|
1998-11-02 08:04:38 +01:00
|
|
|
$ac_cv_sizeof_short) gint32=short;;
|
|
|
|
$ac_cv_sizeof_int) gint32=int;;
|
|
|
|
$ac_cv_sizeof_long) gint32=long;;
|
1998-11-01 02:32:59 +01:00
|
|
|
esac
|
|
|
|
case 8 in
|
1998-11-11 02:26:10 +01:00
|
|
|
$ac_cv_sizeof_int)
|
|
|
|
gint64=int
|
|
|
|
glib_extension=
|
|
|
|
glib_warning_guard=
|
|
|
|
gint64_constant='(val)'
|
|
|
|
;;
|
|
|
|
$ac_cv_sizeof_long)
|
|
|
|
gint64=long
|
|
|
|
glib_extension=
|
|
|
|
glib_warning_guard=
|
|
|
|
gint64_constant='(val##L)'
|
|
|
|
;;
|
|
|
|
$ac_cv_sizeof_long_long)
|
|
|
|
gint64='long long'
|
1998-12-19 03:13:34 +01:00
|
|
|
glib_extension='G_GNUC_EXTENSION '
|
1998-11-11 02:26:10 +01:00
|
|
|
glib_warning_guard="
|
|
|
|
#if defined (__GNUC__) && __GNUC__ >= 2 && __GNUC_MINOR__ >= 8
|
1998-12-19 03:13:34 +01:00
|
|
|
# define G_GNUC_EXTENSION __extension__
|
1998-11-11 02:26:10 +01:00
|
|
|
#else
|
1998-12-19 03:13:34 +01:00
|
|
|
# define G_GNUC_EXTENSION
|
1998-11-11 02:26:10 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
"
|
1998-12-19 03:13:34 +01:00
|
|
|
gint64_constant='(G_GNUC_EXTENSION (val##LL))'
|
1998-11-11 02:26:10 +01:00
|
|
|
;;
|
1998-11-01 02:32:59 +01:00
|
|
|
esac
|
|
|
|
|
1998-11-02 08:04:38 +01:00
|
|
|
gintbits=`expr $ac_cv_sizeof_int \* 8`
|
|
|
|
glongbits=`expr $ac_cv_sizeof_long \* 8`
|
|
|
|
|
|
|
|
|
1998-11-01 02:32:59 +01:00
|
|
|
case $ac_cv_sizeof_void_p in
|
|
|
|
$ac_cv_sizeof_int) glib_gpi_cast='' glib_gpui_cast='' ;;
|
|
|
|
$ac_cv_sizeof_long) glib_gpi_cast='(glong)' glib_gpui_cast='(gulong)' ;;
|
|
|
|
*) glib_unknown_void_p=yes ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
case xyes in
|
|
|
|
x$ac_cv_func_atexit)
|
|
|
|
glib_atexit="
|
|
|
|
#ifdef NeXT /* @#%@! NeXTStep */
|
|
|
|
# define g_ATEXIT(proc) (!atexit (proc))
|
|
|
|
#else
|
|
|
|
# define g_ATEXIT(proc) (atexit (proc))
|
|
|
|
#endif"
|
|
|
|
;;
|
|
|
|
x$ac_cv_func_on_exit)
|
|
|
|
glib_atexit="
|
|
|
|
#define g_ATEXIT(proc) (on_exit ((void (*)(int, void*))(proc), NULL))"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
case xyes in
|
|
|
|
x$ac_cv_func_memmove)
|
|
|
|
glib_memmove='
|
|
|
|
#define g_memmove(d,s,n) G_STMT_START { memmove ((d), (s), (n)); } G_STMT_END'
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
glib_memmove="
|
|
|
|
/* We make the assumption that if memmove isn't available, then
|
|
|
|
* bcopy will do the job. This isn't safe everywhere. (bcopy can't
|
|
|
|
* necessarily handle overlapping copies) */
|
|
|
|
#define g_memmove(d,s,n) G_STMT_START { bcopy ((s), (d), (n)); } G_STMT_END"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
glib_defines="
|
|
|
|
#define GLIB_MAJOR_VERSION $GLIB_MAJOR_VERSION
|
|
|
|
#define GLIB_MINOR_VERSION $GLIB_MINOR_VERSION
|
|
|
|
#define GLIB_MICRO_VERSION $GLIB_MICRO_VERSION
|
1998-12-10 04:54:27 +01:00
|
|
|
"
|
1998-11-01 02:32:59 +01:00
|
|
|
|
|
|
|
case xyes in
|
|
|
|
x$glib_cv_va_copy) glib_vacopy='#define G_VA_COPY va_copy' ;;
|
|
|
|
x$glib_cv___va_copy) glib_vacopy='#define G_VA_COPY __va_copy' ;;
|
|
|
|
*) glib_vacopy=''
|
|
|
|
esac
|
|
|
|
|
|
|
|
if test x$glib_cv_va_val_copy = xno; then
|
|
|
|
glib_vacopy="\$glib_vacopy
|
|
|
|
#define G_VA_COPY_AS_ARRAY 1"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test x$glib_cv_hasinline = xyes; then
|
|
|
|
glib_inline='#define G_HAVE_INLINE 1'
|
|
|
|
fi
|
|
|
|
if test x$glib_cv_has__inline = xyes; then
|
|
|
|
glib_inline="\$glib_inline
|
|
|
|
#define G_HAVE___INLINE 1"
|
|
|
|
fi
|
|
|
|
if test x$glib_cv_has__inline__ = xyes; then
|
|
|
|
glib_inline="\$glib_inline
|
|
|
|
#define G_HAVE___INLINE__ 1"
|
|
|
|
fi
|
|
|
|
|
|
|
|
case xyes in
|
1998-11-02 08:04:38 +01:00
|
|
|
x$ac_cv_c_bigendian)
|
|
|
|
g_byte_order=G_BIG_ENDIAN
|
|
|
|
g_bs_native=BE
|
|
|
|
g_bs_alien=LE
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
g_byte_order=G_LITTLE_ENDIAN
|
|
|
|
g_bs_native=LE
|
|
|
|
g_bs_alien=BE
|
|
|
|
;;
|
1998-11-01 02:32:59 +01:00
|
|
|
esac
|
|
|
|
|
|
|
|
if test x$glib_wchar_h = xyes; then
|
|
|
|
glib_wc='
|
|
|
|
#define G_HAVE_WCHAR_H 1'
|
|
|
|
fi
|
|
|
|
if test x$glib_wctype_h = xyes; then
|
|
|
|
glib_wc="\$glib_wc
|
|
|
|
#define G_HAVE_WCTYPE_H 1"
|
|
|
|
fi
|
|
|
|
if test x$glib_working_wctype = xno; then
|
|
|
|
glib_wc="\$glib_wc
|
|
|
|
#define G_HAVE_BROKEN_WCTYPE 1"
|
|
|
|
fi
|
1998-12-15 06:28:02 +01:00
|
|
|
|
1998-12-16 06:38:35 +01:00
|
|
|
case x$enable_threads in
|
|
|
|
xyes) g_enable_threads_def="#define";;
|
|
|
|
*) g_enable_threads_def="#undef ";;
|
|
|
|
esac
|
|
|
|
|
1999-01-07 17:17:42 +01:00
|
|
|
g_threads_impl_def=$g_threads_impl
|
|
|
|
|
1998-12-19 03:13:34 +01:00
|
|
|
g_mutex_has_default="$mutex_has_default"
|
|
|
|
g_mutex_sizeof="$glib_cv_sizeof_gmutex"
|
|
|
|
g_mutex_contents="$glib_cv_byte_contents_gmutex"
|
1998-11-01 02:32:59 +01:00
|
|
|
])
|
1998-08-09 10:32:18 +02:00
|
|
|
|
|
|
|
AC_OUTPUT([
|
|
|
|
Makefile
|
|
|
|
glib-config
|
|
|
|
gmodule/gmoduleconf.h
|
|
|
|
gmodule/Makefile
|
1998-12-15 06:28:02 +01:00
|
|
|
gthread/Makefile
|
1998-10-25 09:20:31 +01:00
|
|
|
docs/Makefile
|
1999-01-03 04:42:59 +01:00
|
|
|
tests/Makefile
|
1998-11-01 02:32:59 +01:00
|
|
|
],[case "$CONFIG_FILES" in
|
|
|
|
*glib-config*)chmod +x glib-config;;
|
|
|
|
esac])
|