luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-23 15:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

gmodule: New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST).

Browse Source 
gmodule:
* Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).

gobject:
* Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
(*): Remove traces of @STRIP_{BEGIN,END}@.

gthread:
* Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).

docs/reference:
'make distcheck' fixes.
* glib/Makefile.am (EXTRA_DIST): Add $(DOC_MODULE)-decl.txt.
(html): Run 'gtkdoc-fixxref' in $(srcdir).
(dist-check-gtkdoc): Add missing quote.
(dist-hook): Copy in dependency order, so that none of the
makerules are fired in a tarball build.

* gobject/Makefile.am: Likewise.

toplevel:
Remove need for acconfig.h, and misc. cleanups.
* acglib.m4 (GLIB_SIZEOF): Add 'autoheader' comment to
AC_DEFINE_UNQUOTED.
(GLIB_BYTE_CONTENTS): Likewise.

* configure.in: Add 'autoheader' comments to all AC_DEFINE(...)
and AC_DEFINE_UNQUOTED(...) lines.
Replace AC_MSG_CHECKING/AC_CACHE_VAL with AC_CACHE_CHECK.
(AM_PROG_LIBTOOL): Move after AC_PROG_CC.

* acconfig.h: Empty out.

* Makefile.am (BUILT_EXTRA_DIST): New variable.  List 'dist'able
files that are created in the builddir.
(dist-hook): Handle those files.
(libglib_1_3_la_SOURCES): Remove @ALLOCA@.  @ALLOCA@ should only
be used in an _LDADD or _LIBADD, since it expands (if necessary)
to 'alloca.o'.

* tests/Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
This commit is contained in:
Raja R Harinath 2000-10-16 01:02:19 +00:00
parent eb27cad0f0
commit a626a650e5
23 changed files with 1484 additions and 1297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ChangeLog
View File

@ -1,3 +1,27 @@
2000-10-15 Raja R Harinath <harinath@cs.umn.edu>
Remove need for acconfig.h, and misc. cleanups.
* acglib.m4 (GLIB_SIZEOF): Add 'autoheader' comment to
AC_DEFINE_UNQUOTED.
(GLIB_BYTE_CONTENTS): Likewise.
* configure.in: Add 'autoheader' comments to all AC_DEFINE(...)
and AC_DEFINE_UNQUOTED(...) lines.
Replace AC_MSG_CHECKING/AC_CACHE_VAL with AC_CACHE_CHECK.
(AM_PROG_LIBTOOL): Move after AC_PROG_CC.
* acconfig.h: Empty out.
* Makefile.am (BUILT_EXTRA_DIST): New variable. List 'dist'able
files that are created in the builddir.
(dist-hook): Handle those files.
(libglib_1_3_la_SOURCES): Remove @ALLOCA@. @ALLOCA@ should only
be used in an _LDADD or _LIBADD, since it expands (if necessary)
to 'alloca.o'.
* tests/Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* grand.c: Added inline documentation. * grand.c: Added inline documentation.

24
ChangeLog.pre-2-0
View File

@ -1,3 +1,27 @@
2000-10-15 Raja R Harinath <harinath@cs.umn.edu>
Remove need for acconfig.h, and misc. cleanups.
* acglib.m4 (GLIB_SIZEOF): Add 'autoheader' comment to
AC_DEFINE_UNQUOTED.
(GLIB_BYTE_CONTENTS): Likewise.
* configure.in: Add 'autoheader' comments to all AC_DEFINE(...)
and AC_DEFINE_UNQUOTED(...) lines.
Replace AC_MSG_CHECKING/AC_CACHE_VAL with AC_CACHE_CHECK.
(AM_PROG_LIBTOOL): Move after AC_PROG_CC.
* acconfig.h: Empty out.
* Makefile.am (BUILT_EXTRA_DIST): New variable. List 'dist'able
files that are created in the builddir.
(dist-hook): Handle those files.
(libglib_1_3_la_SOURCES): Remove @ALLOCA@. @ALLOCA@ should only
be used in an _LDADD or _LIBADD, since it expands (if necessary)
to 'alloca.o'.
* tests/Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* grand.c: Added inline documentation. * grand.c: Added inline documentation.

24
ChangeLog.pre-2-10
View File

@ -1,3 +1,27 @@
2000-10-15 Raja R Harinath <harinath@cs.umn.edu>
Remove need for acconfig.h, and misc. cleanups.
* acglib.m4 (GLIB_SIZEOF): Add 'autoheader' comment to
AC_DEFINE_UNQUOTED.
(GLIB_BYTE_CONTENTS): Likewise.
* configure.in: Add 'autoheader' comments to all AC_DEFINE(...)
and AC_DEFINE_UNQUOTED(...) lines.
Replace AC_MSG_CHECKING/AC_CACHE_VAL with AC_CACHE_CHECK.
(AM_PROG_LIBTOOL): Move after AC_PROG_CC.
* acconfig.h: Empty out.
* Makefile.am (BUILT_EXTRA_DIST): New variable. List 'dist'able
files that are created in the builddir.
(dist-hook): Handle those files.
(libglib_1_3_la_SOURCES): Remove @ALLOCA@. @ALLOCA@ should only
be used in an _LDADD or _LIBADD, since it expands (if necessary)
to 'alloca.o'.
* tests/Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* grand.c: Added inline documentation. * grand.c: Added inline documentation.

24
ChangeLog.pre-2-12
View File

@ -1,3 +1,27 @@
2000-10-15 Raja R Harinath <harinath@cs.umn.edu>
Remove need for acconfig.h, and misc. cleanups.
* acglib.m4 (GLIB_SIZEOF): Add 'autoheader' comment to
AC_DEFINE_UNQUOTED.
(GLIB_BYTE_CONTENTS): Likewise.
* configure.in: Add 'autoheader' comments to all AC_DEFINE(...)
and AC_DEFINE_UNQUOTED(...) lines.
Replace AC_MSG_CHECKING/AC_CACHE_VAL with AC_CACHE_CHECK.
(AM_PROG_LIBTOOL): Move after AC_PROG_CC.
* acconfig.h: Empty out.
* Makefile.am (BUILT_EXTRA_DIST): New variable. List 'dist'able
files that are created in the builddir.
(dist-hook): Handle those files.
(libglib_1_3_la_SOURCES): Remove @ALLOCA@. @ALLOCA@ should only
be used in an _LDADD or _LIBADD, since it expands (if necessary)
to 'alloca.o'.
* tests/Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* grand.c: Added inline documentation. * grand.c: Added inline documentation.

24
ChangeLog.pre-2-2
View File

@ -1,3 +1,27 @@
2000-10-15 Raja R Harinath <harinath@cs.umn.edu>
Remove need for acconfig.h, and misc. cleanups.
* acglib.m4 (GLIB_SIZEOF): Add 'autoheader' comment to
AC_DEFINE_UNQUOTED.
(GLIB_BYTE_CONTENTS): Likewise.
* configure.in: Add 'autoheader' comments to all AC_DEFINE(...)
and AC_DEFINE_UNQUOTED(...) lines.
Replace AC_MSG_CHECKING/AC_CACHE_VAL with AC_CACHE_CHECK.
(AM_PROG_LIBTOOL): Move after AC_PROG_CC.
* acconfig.h: Empty out.
* Makefile.am (BUILT_EXTRA_DIST): New variable. List 'dist'able
files that are created in the builddir.
(dist-hook): Handle those files.
(libglib_1_3_la_SOURCES): Remove @ALLOCA@. @ALLOCA@ should only
be used in an _LDADD or _LIBADD, since it expands (if necessary)
to 'alloca.o'.
* tests/Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* grand.c: Added inline documentation. * grand.c: Added inline documentation.

24
ChangeLog.pre-2-4
View File

@ -1,3 +1,27 @@
2000-10-15 Raja R Harinath <harinath@cs.umn.edu>
Remove need for acconfig.h, and misc. cleanups.
* acglib.m4 (GLIB_SIZEOF): Add 'autoheader' comment to
AC_DEFINE_UNQUOTED.
(GLIB_BYTE_CONTENTS): Likewise.
* configure.in: Add 'autoheader' comments to all AC_DEFINE(...)
and AC_DEFINE_UNQUOTED(...) lines.
Replace AC_MSG_CHECKING/AC_CACHE_VAL with AC_CACHE_CHECK.
(AM_PROG_LIBTOOL): Move after AC_PROG_CC.
* acconfig.h: Empty out.
* Makefile.am (BUILT_EXTRA_DIST): New variable. List 'dist'able
files that are created in the builddir.
(dist-hook): Handle those files.
(libglib_1_3_la_SOURCES): Remove @ALLOCA@. @ALLOCA@ should only
be used in an _LDADD or _LIBADD, since it expands (if necessary)
to 'alloca.o'.
* tests/Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* grand.c: Added inline documentation. * grand.c: Added inline documentation.

24
ChangeLog.pre-2-6
View File

@ -1,3 +1,27 @@
2000-10-15 Raja R Harinath <harinath@cs.umn.edu>
Remove need for acconfig.h, and misc. cleanups.
* acglib.m4 (GLIB_SIZEOF): Add 'autoheader' comment to
AC_DEFINE_UNQUOTED.
(GLIB_BYTE_CONTENTS): Likewise.
* configure.in: Add 'autoheader' comments to all AC_DEFINE(...)
and AC_DEFINE_UNQUOTED(...) lines.
Replace AC_MSG_CHECKING/AC_CACHE_VAL with AC_CACHE_CHECK.
(AM_PROG_LIBTOOL): Move after AC_PROG_CC.
* acconfig.h: Empty out.
* Makefile.am (BUILT_EXTRA_DIST): New variable. List 'dist'able
files that are created in the builddir.
(dist-hook): Handle those files.
(libglib_1_3_la_SOURCES): Remove @ALLOCA@. @ALLOCA@ should only
be used in an _LDADD or _LIBADD, since it expands (if necessary)
to 'alloca.o'.
* tests/Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* grand.c: Added inline documentation. * grand.c: Added inline documentation.

24
ChangeLog.pre-2-8
View File

@ -1,3 +1,27 @@
2000-10-15 Raja R Harinath <harinath@cs.umn.edu>
Remove need for acconfig.h, and misc. cleanups.
* acglib.m4 (GLIB_SIZEOF): Add 'autoheader' comment to
AC_DEFINE_UNQUOTED.
(GLIB_BYTE_CONTENTS): Likewise.
* configure.in: Add 'autoheader' comments to all AC_DEFINE(...)
and AC_DEFINE_UNQUOTED(...) lines.
Replace AC_MSG_CHECKING/AC_CACHE_VAL with AC_CACHE_CHECK.
(AM_PROG_LIBTOOL): Move after AC_PROG_CC.
* acconfig.h: Empty out.
* Makefile.am (BUILT_EXTRA_DIST): New variable. List 'dist'able
files that are created in the builddir.
(dist-hook): Handle those files.
(libglib_1_3_la_SOURCES): Remove @ALLOCA@. @ALLOCA@ should only
be used in an _LDADD or _LIBADD, since it expands (if necessary)
to 'alloca.o'.
* tests/Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* grand.c: Added inline documentation. * grand.c: Added inline documentation.

27
Makefile.am
View File

@ -19,24 +19,28 @@ EXTRA_DIST = \
README.win32 \ README.win32 \
TODO.xml \ TODO.xml \
glib.def \ glib.def \
makefile.msc \
makefile.msc.in \ makefile.msc.in \
makefile.mingw \
makefile.mingw.in \ makefile.mingw.in \
giowin32.c \ giowin32.c \
glibconfig.h.win32 \
glibconfig.h.win32.in \ glibconfig.h.win32.in \
gwin32.c \ gwin32.c \
config.h.win32 \
config.h.win32.in \ config.h.win32.in \
build-dll \ build-dll \
glib.rc \
glib.rc.in \ glib.rc.in \
glib-2.0.pc.in \ glib-2.0.pc.in \
gobject-2.0.pc.in \ gobject-2.0.pc.in \
gmodule-2.0.pc.in \ gmodule-2.0.pc.in \
gthread-2.0.pc.in gthread-2.0.pc.in
# These may be in the builddir too
BUILT_EXTRA_DIST = \
makefile.msc \
makefile.mingw \
glibconfig.h.win32 \
config.h.win32 \
glib.rc \
glib.spec
lib_LTLIBRARIES = libglib-1.3.la lib_LTLIBRARIES = libglib-1.3.la
libglib_1_3_la_SOURCES = \ libglib_1_3_la_SOURCES = \
@ -78,8 +82,10 @@ libglib_1_3_la_SOURCES = \
gunichartables.h \ gunichartables.h \
gunidecomp.h \ gunidecomp.h \
gunidecomp.c \ gunidecomp.c \
gutils.c \ gutils.c
@ALLOCA@
## If we decide to link in 'alloca.c', this is how to do it
#libglib_1_3_la_LIBADD = @ALLOCA@
glibincludedir=$(includedir)/glib-2.0 glibincludedir=$(includedir)/glib-2.0
glibinclude_HEADERS = \ glibinclude_HEADERS = \
@ -194,5 +200,8 @@ snapshot:
snapcheck: snapcheck:
$(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"` $(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
dist-hook: dist-hook: $(BUILT_EXTRA_DIST)
cp glib.spec $(distdir) files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done

76
acconfig.h
View File

@ -34,85 +34,9 @@
/* Other stuff */ /* Other stuff */
#undef ENABLE_MEM_CHECK
#undef ENABLE_MEM_PROFILE
#undef ENABLE_GC_FRIENDLY
#undef REALLOC_0_WORKS
#undef G_COMPILED_WITH_DEBUGGING
#undef G_ENABLE_MSG_PREFIX
#undef G_THREADS_ENABLED
#undef GLIB_SIZEOF_GMUTEX
#undef GLIB_SIZEOF_INTMAX_T
#undef GLIB_SIZEOF_PTRDIFF_T
#undef GLIB_SIZEOF_SIZE_T
#undef GLIB_SIZEOF_SYSTEM_THREAD
#undef GLIB_BYTE_CONTENTS_GMUTEX
#undef GLIB_BYTE_CONTENTS_GRECMUTEX
#undef HAVE_BROKEN_WCTYPE
#undef HAVE_CODESET
#undef HAVE_DOPRNT
#undef HAVE_FLOAT_H
#undef HAVE_GETCWD
#undef HAVE_GETPWUID_R
#undef HAVE_GETPWUID_R_POSIX
#undef HAVE_LIMITS_H
#undef HAVE_LONG_DOUBLE
#undef HAVE_POLL
#undef HAVE_PTHREAD_ATTR_SETSTACKSIZE
#undef HAVE_PWD_H
#undef HAVE_PW_GECOS
#undef HAVE_STRLCPY
#undef HAVE_SYS_PARAM_H
#undef HAVE_SYS_POLL_H
#undef HAVE_SYS_SELECT_H
#undef HAVE_SYS_TIME_H
#undef HAVE_SYS_TIMES_H
#undef HAVE_STRERROR
#undef HAVE_STRSIGNAL
#undef HAVE_UNISTD_H
#undef HAVE_VALUES_H
#undef HAVE_WCHAR_H
#undef HAVE_WCTYPE_H
#undef HAVE_WORKING_BCOPY
#undef NO_FD_SET
#undef NO_SYS_ERRLIST
#undef NO_SYS_SIGLIST
#undef NO_SYS_SIGLIST_DECL
#undef SIZEOF_CHAR
#undef SIZEOF_SHORT
#undef SIZEOF_LONG
#undef SIZEOF_INT
#undef SIZEOF_VOID_P
#undef G_VA_COPY
#undef G_VA_COPY_AS_ARRAY
#undef G_HAVE___INLINE
#undef G_HAVE___INLINE__
#undef G_HAVE_INLINE
#undef GLIB_MAJOR_VERSION
#undef GLIB_MINOR_VERSION
#undef GLIB_MICRO_VERSION
#undef GLIB_INTERFACE_AGE
#undef GLIB_BINARY_AGE
#undef G_THREAD_SOURCE
#undef POSIX_MIN_PRIORITY
#undef POSIX_MAX_PRIORITY
#undef POSIX_YIELD_FUNC
/* #undef PACKAGE */ /* #undef PACKAGE */
/* #undef VERSION */ /* #undef VERSION */
/* Leave that blank line there!! Autoheader needs it. /* Leave that blank line there!! Autoheader needs it.
If you're adding to this file, keep in mind: If you're adding to this file, keep in mind:

5
acglib.m4
View File

@ -70,7 +70,7 @@ main()
], ],
[glib_Sizeof=0], [glib_Sizeof=0],
ifelse([$4], [], [], [glib_Sizeof=$4]))]) ifelse([$4], [], [], [glib_Sizeof=$4]))])
AC_DEFINE_UNQUOTED(GLIB_TR_CPP(glib_sizeof_$3), [$[]glib_Sizeof]) AC_DEFINE_UNQUOTED(GLIB_TR_CPP(glib_sizeof_$3), [$[]glib_Sizeof], [Size of $3])
popdef([glib_Sizeof])dnl popdef([glib_Sizeof])dnl
]) ])
@ -96,7 +96,8 @@ main()
], ],
[glib_ByteContents=no], [glib_ByteContents=no],
[glib_ByteContents=no])]) [glib_ByteContents=no])])
AC_DEFINE_UNQUOTED(GLIB_TR_CPP(glib_byte_contents_$3), [$[]glib_ByteContents]) AC_DEFINE_UNQUOTED(GLIB_TR_CPP(glib_byte_contents_$3), [$[]glib_ByteContents],
[Byte contents of $3])
popdef([glib_ByteContents])dnl popdef([glib_ByteContents])dnl
]) ])

202
configure.in
View File

@ -62,14 +62,16 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
# Specify a configuration file # Specify a configuration file
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION) AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION,
AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION) [Define to the GLIB major version])
AC_DEFINE_UNQUOTED(GLIB_MICRO_VERSION, $GLIB_MICRO_VERSION) AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION,
AC_DEFINE_UNQUOTED(GLIB_INTERFACE_AGE, $GLIB_INTERFACE_AGE) [Define to the GLIB minor version])
AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE) AC_DEFINE_UNQUOTED(GLIB_MICRO_VERSION, $GLIB_MICRO_VERSION,
[Define to the GLIB micro version])
dnl Initialize libtool AC_DEFINE_UNQUOTED(GLIB_INTERFACE_AGE, $GLIB_INTERFACE_AGE,
AM_PROG_LIBTOOL [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 dnl Initialize maintainer mode
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
@ -115,7 +117,7 @@ fi
AC_MSG_CHECKING(whether to enable memory checking) AC_MSG_CHECKING(whether to enable memory checking)
if test "x$enable_mem_check" = "xyes"; then 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_SUBST(ENABLE_MEM_CHECK)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
@ -124,7 +126,7 @@ fi
AC_MSG_CHECKING(whether to enable memory profiling) AC_MSG_CHECKING(whether to enable memory profiling)
if test "x$enable_mem_profile" = "xyes"; then 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_SUBST(ENABLE_MEM_PROFILE)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
@ -133,7 +135,7 @@ fi
AC_MSG_CHECKING(whether to enable garbage collector friendliness) AC_MSG_CHECKING(whether to enable garbage collector friendliness)
if test "x$enable_gc_friendly" = "xyes"; then if test "x$enable_gc_friendly" = "xyes"; then
AC_DEFINE(ENABLE_GC_FRIENDLY, 1) AC_DEFINE(ENABLE_GC_FRIENDLY, 1, [Whether to enable GC friendliness])
AC_SUBST(ENABLE_GC_FRIENDLY) AC_SUBST(ENABLE_GC_FRIENDLY)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
@ -149,10 +151,12 @@ else
fi fi
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 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 fi
# Checks for programs. # Checks for programs.
@ -160,26 +164,27 @@ AC_PROG_CC
AM_PROG_CC_STDC AM_PROG_CC_STDC
AC_PROG_INSTALL AC_PROG_INSTALL
changequote(,)dnl dnl Initialize libtool
AM_PROG_LIBTOOL
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
case " $CFLAGS " in case " $CFLAGS " in
*[\ \ ]-Wall[\ \ ]*) ;; *[[\ \ ]]-Wall[[\ \ ]]*) ;;
*) CFLAGS="$CFLAGS -Wall" ;; *) CFLAGS="$CFLAGS -Wall" ;;
esac esac
if test "x$enable_ansi" = "xyes"; then if test "x$enable_ansi" = "xyes"; then
case " $CFLAGS " in case " $CFLAGS " in
*[\ \ ]-ansi[\ \ ]*) ;; *[[\ \ ]]-ansi[[\ \ ]]*) ;;
*) CFLAGS="$CFLAGS -ansi" ;; *) CFLAGS="$CFLAGS -ansi" ;;
esac esac
case " $CFLAGS " in case " $CFLAGS " in
*[\ \ ]-pedantic[\ \ ]*) ;; *[[\ \ ]]-pedantic[[\ \ ]]*) ;;
*) CFLAGS="$CFLAGS -pedantic" ;; *) CFLAGS="$CFLAGS -pedantic" ;;
esac esac
fi fi
fi fi
changequote([,])dnl
dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R) 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]) AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
@ -262,8 +267,7 @@ AC_C_CONST
dnl AC_C_INLINE is useless to us since it bails out too early, we need to 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 truely know which ones of `inline', `__inline' and `__inline__' are
dnl actually supported. dnl actually supported.
AC_MSG_CHECKING(for __inline) AC_CACHE_CHECK([for __inline],glib_cv_has__inline,[
AC_CACHE_VAL(glib_cv_has__inline,[
AC_TRY_RUN([ AC_TRY_RUN([
__inline int foo () { return 0; } __inline int foo () { return 0; }
int main () { return foo (); } int main () { return foo (); }
@ -273,12 +277,10 @@ AC_CACHE_VAL(glib_cv_has__inline,[
glib_cv_has__inline=no glib_cv_has__inline=no
,) ,)
]) ])
AC_MSG_RESULT($glib_cv_has__inline)
case x$glib_cv_has__inline in case x$glib_cv_has__inline in
xyes) AC_DEFINE(G_HAVE___INLINE) xyes) AC_DEFINE(G_HAVE___INLINE,1,[Have __inline keyword])
esac esac
AC_MSG_CHECKING(for __inline__) AC_CACHE_CHECK([for __inline__],glib_cv_has__inline__,[
AC_CACHE_VAL(glib_cv_has__inline__,[
AC_TRY_RUN([ AC_TRY_RUN([
__inline__ int foo () { return 0; } __inline__ int foo () { return 0; }
int main () { return foo (); } int main () { return foo (); }
@ -288,12 +290,10 @@ AC_CACHE_VAL(glib_cv_has__inline__,[
glib_cv_has__inline__=no glib_cv_has__inline__=no
,) ,)
]) ])
AC_MSG_RESULT($glib_cv_has__inline__)
case x$glib_cv_has__inline__ in case x$glib_cv_has__inline__ in
xyes) AC_DEFINE(G_HAVE___INLINE__) xyes) AC_DEFINE(G_HAVE___INLINE__,1,[Have __inline__ keyword])
esac esac
AC_MSG_CHECKING(for inline) AC_CACHE_CHECK([for inline], glib_cv_hasinline,[
AC_CACHE_VAL(glib_cv_hasinline,[
AC_TRY_RUN([ AC_TRY_RUN([
inline int foo () { return 0; } inline int foo () { return 0; }
int main () { return foo (); } int main () { return foo (); }
@ -303,9 +303,8 @@ AC_CACHE_VAL(glib_cv_hasinline,[
glib_cv_hasinline=no glib_cv_hasinline=no
,) ,)
]) ])
AC_MSG_RESULT($glib_cv_hasinline)
case x$glib_cv_hasinline in case x$glib_cv_hasinline in
xyes) AC_DEFINE(G_HAVE_INLINE) xyes) AC_DEFINE(G_HAVE_INLINE,1,[Have inline keyword])
esac esac
# check for bytesex stuff # check for bytesex stuff
@ -375,7 +374,7 @@ if test "$ac_cv_func_memmove" != "yes"; then
return(0); return(0);
}],glib_cv_working_bcopy=yes,glib_cv_working_bcopy=no)]) }],glib_cv_working_bcopy=yes,glib_cv_working_bcopy=no)])
if test "$glib_cv_working_bcopy" == "yes"; then if test "$glib_cv_working_bcopy" == "yes"; then
AC_DEFINE(HAVE_WORKING_BCOPY) AC_DEFINE(HAVE_WORKING_BCOPY,1,[Have a working bcopy])
fi fi
fi fi
@ -388,7 +387,7 @@ sys_errlist[sys_nerr-1][0] = 0;
], glib_ok=yes, glib_ok=no) ], glib_ok=yes, glib_ok=no)
AC_MSG_RESULT($glib_ok) AC_MSG_RESULT($glib_ok)
if test $glib_ok = no; then if test $glib_ok = no; then
AC_DEFINE(NO_SYS_ERRLIST) AC_DEFINE(NO_SYS_ERRLIST,1,[global 'sys_errlist' not found])
fi fi
# Check for sys_siglist # Check for sys_siglist
@ -399,7 +398,7 @@ exit (sys_siglist[0]);
], glib_ok=yes, glib_ok=no) ], glib_ok=yes, glib_ok=no)
AC_MSG_RESULT($glib_ok) AC_MSG_RESULT($glib_ok)
if test $glib_ok = no; then if test $glib_ok = no; then
AC_DEFINE(NO_SYS_SIGLIST) AC_DEFINE(NO_SYS_SIGLIST,1,[global 'sys_siglist' not found])
fi fi
# Check for sys_siglist decl (see Tue Jan 19 00:44:24 1999 in changelog) # Check for sys_siglist decl (see Tue Jan 19 00:44:24 1999 in changelog)
@ -409,7 +408,7 @@ strlen (sys_siglist[0]);
], glib_ok=yes, glib_ok=no) ], glib_ok=yes, glib_ok=no)
AC_MSG_RESULT($glib_ok) AC_MSG_RESULT($glib_ok)
if test $glib_ok = no; then 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 fi
# Check if <sys/select.h> needs to be included for fd_set # Check if <sys/select.h> needs to be included for fd_set
@ -421,38 +420,36 @@ if test $gtk_ok = yes; then
else else
AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes) AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes)
if test $gtk_ok = yes; then 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]) AC_MSG_RESULT([yes, found in sys/select.h])
else else
AC_DEFINE(NO_FD_SET) AC_DEFINE(NO_FD_SET,1,[didn't find fd_set])
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
fi fi
dnl *** check for sane realloc() *** dnl *** check for sane realloc() ***
AC_MSG_CHECKING(whether realloc (NULL,) will work) AC_CACHE_CHECK([whether realloc (NULL,) will work],glib_cv_sane_realloc,[
AC_CACHE_VAL(glib_cv_sane_realloc,[
AC_TRY_RUN([ AC_TRY_RUN([
#include <stdlib.h> #include <stdlib.h>
int main() { int main() {
return realloc (0, sizeof (int)) == 0; return realloc (0, sizeof (int)) == 0;
}], }],
glib_cv_sane_realloc=yes [glib_cv_sane_realloc=yes],
, [glib_cv_sane_realloc=no],
glib_cv_sane_realloc=no [])
,)
]) ])
if test x$glib_cv_sane_realloc = xyes; then if test x$glib_cv_sane_realloc = xyes; then
AC_DEFINE(REALLOC_0_WORKS) AC_DEFINE(REALLOC_0_WORKS,1,[whether realloc (NULL,) works])
fi fi
AC_MSG_RESULT($glib_cv_sane_realloc)
dnl Check for nl_langinfo and CODESET dnl Check for nl_langinfo and CODESET
AC_MSG_CHECKING([for nl_langinfo (CODESET)]) AC_MSG_CHECKING([for nl_langinfo (CODESET)])
AC_TRY_COMPILE([#include <langinfo.h>], AC_TRY_COMPILE([#include <langinfo.h>],
[char *codeset = nl_langinfo (CODESET);], [char *codeset = nl_langinfo (CODESET);],
AC_DEFINE(HAVE_CODESET) AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)])
have_codeset=yes, have_codeset=yes,
have_codeset=no) have_codeset=no)
AC_MSG_RESULT($have_codeset) AC_MSG_RESULT($have_codeset)
@ -471,7 +468,7 @@ char *p = malloc(10);
], glib_ok=yes, glib_ok=no) ], glib_ok=yes, glib_ok=no)
AC_MSG_RESULT($glib_ok) AC_MSG_RESULT($glib_ok)
if test $glib_ok = yes; then if test $glib_ok = yes; then
AC_DEFINE(HAVE_STRLCPY) AC_DEFINE(HAVE_STRLCPY,1,[Have functions strlcpy and strlcat])
fi fi
@ -480,8 +477,7 @@ dnl *** va_copy checks ***
dnl ********************** dnl **********************
dnl we currently check for all three va_copy possibilities, so we get dnl we currently check for all three va_copy possibilities, so we get
dnl all results in config.log for bug reports. dnl all results in config.log for bug reports.
AC_MSG_CHECKING(for an implementation of va_copy()) AC_CACHE_CHECK([for an implementation of va_copy()],glib_cv_va_copy,[
AC_CACHE_VAL(glib_cv_va_copy,[
AC_TRY_RUN([ AC_TRY_RUN([
#include <stdarg.h> #include <stdarg.h>
void f (int i, ...) { void f (int i, ...) {
@ -496,14 +492,11 @@ AC_CACHE_VAL(glib_cv_va_copy,[
f (0, 42); f (0, 42);
return 0; return 0;
}], }],
glib_cv_va_copy=yes [glib_cv_va_copy=yes],
, [glib_cv_va_copy=no],
glib_cv_va_copy=no [])
,)
]) ])
AC_MSG_RESULT($glib_cv_va_copy) AC_CACHE_CHECK([for an implementation of __va_copy()],glib_cv___va_copy,[
AC_MSG_CHECKING(for an implementation of __va_copy())
AC_CACHE_VAL(glib_cv___va_copy,[
AC_TRY_RUN([ AC_TRY_RUN([
#include <stdarg.h> #include <stdarg.h>
void f (int i, ...) { void f (int i, ...) {
@ -518,14 +511,23 @@ AC_CACHE_VAL(glib_cv___va_copy,[
f (0, 42); f (0, 42);
return 0; return 0;
}], }],
glib_cv___va_copy=yes [glib_cv___va_copy=yes],
, [glib_cv___va_copy=no],
glib_cv___va_copy=no [])
,)
]) ])
AC_MSG_RESULT($glib_cv___va_copy)
AC_MSG_CHECKING(whether va_lists can be copied by value) if test "x$glib_cv_va_copy" = "xyes"; then
AC_CACHE_VAL(glib_cv_va_val_copy,[ 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([ AC_TRY_RUN([
#include <stdarg.h> #include <stdarg.h>
void f (int i, ...) { void f (int i, ...) {
@ -540,22 +542,14 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[
f (0, 42); f (0, 42);
return 0; return 0;
}], }],
glib_cv_va_val_copy=yes [glib_cv_va_val_copy=yes],
, [glib_cv_va_val_copy=no],
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)
if test "x$glib_cv_va_val_copy" = "xno"; then
AC_DEFINE(G_VA_COPY_AS_ARRAY,1, ['va_lists' cannot be copies as values])
fi
dnl *********************** dnl ***********************
dnl *** g_module checks *** dnl *** g_module checks ***
@ -577,11 +571,11 @@ fi
dnl *** load_image (BeOS) dnl *** load_image (BeOS)
if test -z "$G_MODULE_IMPL" -a "x$glib_native_beos" = "xyes"; then if test -z "$G_MODULE_IMPL" -a "x$glib_native_beos" = "xyes"; then
AC_CHECK_LIB(root, load_image, 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_LIBS_EXTRA="-L\$(top_builddir_full)/.libs"
G_MODULE_PLUGIN_LIBS="-L\$(top_builddir_full)/gmodule/.libs -lgmodule" 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 fi
# *** dlopen() and dlsym() in libdl # *** dlopen() and dlsym() in libdl
if test -z "$G_MODULE_IMPL"; then if test -z "$G_MODULE_IMPL"; then
@ -600,9 +594,8 @@ if test -z "$G_MODULE_IMPL"; then
[ G_MODULE_LDFLAGS="-Wl,-E" ],[ [ G_MODULE_LDFLAGS="-Wl,-E" ],[
LDFLAGS="$SAVED_LDFLAGS -bexpall" LDFLAGS="$SAVED_LDFLAGS -bexpall"
AC_TRY_LINK(,[ return 0; ], AC_TRY_LINK(,[ return 0; ],
G_MODULE_LDFLAGS="-bexpall", [G_MODULE_LDFLAGS="-bexpall"],
G_MODULE_LDFLAGS="none" [G_MODULE_LDFLAGS="none"])
)
]) ])
LDFLAGS=$SAVED_LDFLAGS LDFLAGS=$SAVED_LDFLAGS
AC_MSG_RESULT($G_MODULE_LDFLAGS) AC_MSG_RESULT($G_MODULE_LDFLAGS)
@ -610,9 +603,9 @@ if test -z "$G_MODULE_IMPL"; then
G_MODULE_LDFLAGS= G_MODULE_LDFLAGS=
fi fi
AC_CHECK_LIB(dld, shl_load, AC_CHECK_LIB(dld, shl_load,
G_MODULE_LIBS=-ldld [G_MODULE_LIBS=-ldld
G_MODULE_IMPL=G_MODULE_IMPL_DLD G_MODULE_IMPL=G_MODULE_IMPL_DLD],
,) [])
fi fi
dnl *** additional checks for G_MODULE_IMPL_DL dnl *** additional checks for G_MODULE_IMPL_DL
if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then
@ -626,8 +619,8 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then
LIBS="$LIBS $G_MODULE_LIBS" LIBS="$LIBS $G_MODULE_LIBS"
LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
dnl *** check whether we need preceeding underscores dnl *** check whether we need preceeding underscores
AC_MSG_CHECKING(for preceeding underscore in symbols) AC_CACHE_CHECK([for preceeding underscore in symbols],
AC_CACHE_VAL(glib_cv_uscore,[ glib_cv_uscore,[
AC_TRY_RUN([ AC_TRY_RUN([
#include <dlfcn.h> #include <dlfcn.h>
int glib_underscore_test (void) { return 42; } int glib_underscore_test (void) { return 42; }
@ -639,12 +632,11 @@ dnl *** check whether we need preceeding underscores
f2 = dlsym (handle, "_glib_underscore_test"); f2 = dlsym (handle, "_glib_underscore_test");
} return (!f2 || f1); } return (!f2 || f1);
}], }],
glib_cv_uscore=yes, [glib_cv_uscore=yes],
glib_cv_uscore=no, [glib_cv_uscore=no],
) [])
rm -f plugin.c plugin.o plugin.lo rm -f plugin.c plugin.o plugin.lo
]) ])
AC_MSG_RESULT($glib_cv_uscore)
if test "x$glib_cv_uscore" = "xyes"; then if test "x$glib_cv_uscore" = "xyes"; then
G_MODULE_NEED_USCORE=1 G_MODULE_NEED_USCORE=1
else else
@ -654,8 +646,8 @@ dnl *** check whether we need preceeding underscores
LDFLAGS="$LDFLAGS_orig" LDFLAGS="$LDFLAGS_orig"
dnl *** check for having dlerror() dnl *** check for having dlerror()
AC_CHECK_FUNC(dlerror, AC_CHECK_FUNC(dlerror,
G_MODULE_HAVE_DLERROR=1, [G_MODULE_HAVE_DLERROR=1],
G_MODULE_HAVE_DLERROR=0) [G_MODULE_HAVE_DLERROR=0])
LIBS="$LIBS_orig" LIBS="$LIBS_orig"
fi fi
dnl *** done, have e got an implementation? dnl *** done, have e got an implementation?
@ -954,8 +946,7 @@ if test x"$have_threads" != xnone; then
# LIBS="$LIBS $G_THREAD_LIBS" # LIBS="$LIBS $G_THREAD_LIBS"
AC_CHECK_FUNCS(localtime_r) AC_CHECK_FUNCS(localtime_r)
if test "$ac_cv_header_pwd_h" = "yes"; then if test "$ac_cv_header_pwd_h" = "yes"; then
AC_MSG_CHECKING([for getpwuid_r]) AC_CACHE_CHECK([for getpwuid_r],ac_cv_func_getpwuid_r,
AC_CACHE_VAL(ac_cv_func_getpwuid_r,
[AC_TRY_RUN([#include <errno.h> [AC_TRY_RUN([#include <errno.h>
int main () { char buffer[10000], *pointer; int main () { char buffer[10000], *pointer;
char getpwuid_r (long, void*, void*, char getpwuid_r (long, void*, void*,
@ -968,10 +959,7 @@ if test x"$have_threads" != xnone; then
[ac_cv_func_getpwuid_r=yes], [ac_cv_func_getpwuid_r=yes],
[ac_cv_func_getpwuid_r=no])]) [ac_cv_func_getpwuid_r=no])])
if test "$ac_cv_func_getpwuid_r" = yes; then if test "$ac_cv_func_getpwuid_r" = yes; then
AC_MSG_RESULT(yes) AC_DEFINE(HAVE_GETPWUID_R,1,[Have function getpwuid_r])
AC_DEFINE(HAVE_GETPWUID_R)
else
AC_MSG_RESULT(no)
fi fi
if test "$ac_cv_func_getpwuid_r" = "yes"; then if test "$ac_cv_func_getpwuid_r" = "yes"; then
AC_MSG_CHECKING(whether getpwuid_r is posix like) AC_MSG_CHECKING(whether getpwuid_r is posix like)
@ -981,7 +969,8 @@ if test x"$have_threads" != xnone; then
#include <sys/types.h> #include <sys/types.h>
#include <stdlib.h>], #include <stdlib.h>],
[getpwuid_r((uid_t)0, NULL, NULL, (size_t)0, NULL);], [getpwuid_r((uid_t)0, NULL, NULL, (size_t)0, NULL);],
[AC_DEFINE(HAVE_GETPWUID_R_POSIX) [AC_DEFINE(HAVE_GETPWUID_R_POSIX,1,
[Function getpwuid_r has the POSIX signature])
AC_MSG_RESULT(yes)], AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]) [AC_MSG_RESULT(no)])
fi fi
@ -999,7 +988,8 @@ if test x"$have_threads" != xnone; then
AC_TRY_LINK([#include <pthread.h>], AC_TRY_LINK([#include <pthread.h>],
[pthread_attr_t t; pthread_attr_setstacksize(&t,0)], [pthread_attr_t t; pthread_attr_setstacksize(&t,0)],
[AC_MSG_RESULT(yes) [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)]) [AC_MSG_RESULT(no)])
AC_MSG_CHECKING(for minimal/maximal thread priority) AC_MSG_CHECKING(for minimal/maximal thread priority)
if test x"$posix_priority_min" = xnone; then if test x"$posix_priority_min" = xnone; then
@ -1021,8 +1011,8 @@ if test x"$have_threads" != xnone; then
posix_priority_max=-1 posix_priority_max=-1
else else
AC_MSG_RESULT($posix_priority_min/$posix_priority_max) AC_MSG_RESULT($posix_priority_min/$posix_priority_max)
AC_DEFINE_UNQUOTED(POSIX_MIN_PRIORITY,$posix_priority_min) AC_DEFINE_UNQUOTED(POSIX_MIN_PRIORITY,$posix_priority_min,[Minimum POSIX RT priority])
AC_DEFINE_UNQUOTED(POSIX_MAX_PRIORITY,$posix_priority_max) AC_DEFINE_UNQUOTED(POSIX_MAX_PRIORITY,$posix_priority_max,[Maximum POSIX RT priority])
fi fi
posix_yield_func=none posix_yield_func=none
AC_MSG_CHECKING(for posix yield function) AC_MSG_CHECKING(for posix yield function)
@ -1041,7 +1031,7 @@ if test x"$have_threads" != xnone; then
AC_MSG_RESULT($posix_yield_func) AC_MSG_RESULT($posix_yield_func)
posix_yield_func="$posix_yield_func()" posix_yield_func="$posix_yield_func()"
fi 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" CPPFLAGS="$glib_save_CPPFLAGS"
else # solaris threads else # solaris threads
GLIB_SIZEOF([#include <thread.h>], GLIB_SIZEOF([#include <thread.h>],
@ -1064,7 +1054,8 @@ else
GLIB_SIZEOF(, void*, system_thread) GLIB_SIZEOF(, void*, system_thread)
fi fi
AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c") AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c",
[Source file containing theread implementation])
AC_SUBST(G_THREAD_CFLAGS) AC_SUBST(G_THREAD_CFLAGS)
AC_SUBST(G_THREAD_LIBS) AC_SUBST(G_THREAD_LIBS)
AC_SUBST(G_THREAD_LIBS_EXTRA) AC_SUBST(G_THREAD_LIBS_EXTRA)
@ -1651,4 +1642,3 @@ echo "do development with GLib 1.2 any longer."
echo "" echo ""
echo " *** You should be using GLib 1.2 instead. ***" echo " *** You should be using GLib 1.2 instead. ***"
]) ])

11
docs/reference/ChangeLog
View File

@ -1,3 +1,14 @@
2000-10-15 Raja R Harinath <harinath@cs.umn.edu>
'make distcheck' fixes.
* glib/Makefile.am (EXTRA_DIST): Add $(DOC_MODULE)-decl.txt.
(html): Run 'gtkdoc-fixxref' in $(srcdir).
(dist-check-gtkdoc): Add missing quote.
(dist-hook): Copy in dependency order, so that none of the
makerules are fired in a tarball build.
* gobject/Makefile.am: Likewise.
2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/glib-sections.txt: Added misc items. * glib/glib-sections.txt: Added misc items.

12
docs/reference/glib/Makefile.am
View File

@ -79,6 +79,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
EXTRA_DIST = \ EXTRA_DIST = \
$(DOC_MAIN_SGML_FILE) \ $(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE)-decl.txt \
$(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt $(DOC_MODULE)-overrides.txt
@ -113,7 +114,7 @@ html:
test -d $(srcdir)/html || mkdir $(srcdir)/html test -d $(srcdir)/html || mkdir $(srcdir)/html
-cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@echo '-- Fixing Crossreferences' @echo '-- Fixing Crossreferences'
gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIOJNS) cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
clean-local: clean-local:
rm -f *~ *.bak *.signals *-unused.txt rm -f *~ *.bak *.signals *-unused.txt
@ -142,17 +143,18 @@ if ENABLE_GTK_DOC
dist-check-gtkdoc: dist-check-gtkdoc:
else else
dist-check-gtkdoc: dist-check-gtkdoc:
@echo "*** gtk-doc must be installed and enabled in order to make dist @echo "*** gtk-doc must be installed and enabled in order to make dist"
@false @false
endif endif
dist-hook: dist-check-gtkdoc dist-hook: dist-check-gtkdoc
mkdir $(distdir)/html
mkdir $(distdir)/sgml
mkdir $(distdir)/tmpl mkdir $(distdir)/tmpl
-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html mkdir $(distdir)/sgml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml -cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-cp $(srcdir)/html/index.sgml $(distdir)/html
-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
.PHONY : html sgml templates scan .PHONY : html sgml templates scan

10
docs/reference/gobject/Makefile.am
View File

@ -34,6 +34,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
EXTRA_DIST = \ EXTRA_DIST = \
$(DOC_MAIN_SGML_FILE) \ $(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE)-decl.txt \
$(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt $(DOC_MODULE)-overrides.txt
@ -97,17 +98,18 @@ if ENABLE_GTK_DOC
dist-check-gtkdoc: dist-check-gtkdoc:
else else
dist-check-gtkdoc: dist-check-gtkdoc:
@echo "*** gtk-doc must be installed and enabled in order to make dist @echo "*** gtk-doc must be installed and enabled in order to make dist"
@false @false
endif endif
dist-hook: dist-check-gtkdoc dist-hook: dist-check-gtkdoc
mkdir $(distdir)/html
mkdir $(distdir)/sgml
mkdir $(distdir)/tmpl mkdir $(distdir)/tmpl
-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html mkdir $(distdir)/sgml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml -cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-cp $(srcdir)/html/index.sgml $(distdir)/html
-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
.PHONY : html sgml templates scan .PHONY : html sgml templates scan

27
glib/Makefile.am
View File

@ -19,24 +19,28 @@ EXTRA_DIST = \
README.win32 \ README.win32 \
TODO.xml \ TODO.xml \
glib.def \ glib.def \
makefile.msc \
makefile.msc.in \ makefile.msc.in \
makefile.mingw \
makefile.mingw.in \ makefile.mingw.in \
giowin32.c \ giowin32.c \
glibconfig.h.win32 \
glibconfig.h.win32.in \ glibconfig.h.win32.in \
gwin32.c \ gwin32.c \
config.h.win32 \
config.h.win32.in \ config.h.win32.in \
build-dll \ build-dll \
glib.rc \
glib.rc.in \ glib.rc.in \
glib-2.0.pc.in \ glib-2.0.pc.in \
gobject-2.0.pc.in \ gobject-2.0.pc.in \
gmodule-2.0.pc.in \ gmodule-2.0.pc.in \
gthread-2.0.pc.in gthread-2.0.pc.in
# These may be in the builddir too
BUILT_EXTRA_DIST = \
makefile.msc \
makefile.mingw \
glibconfig.h.win32 \
config.h.win32 \
glib.rc \
glib.spec
lib_LTLIBRARIES = libglib-1.3.la lib_LTLIBRARIES = libglib-1.3.la
libglib_1_3_la_SOURCES = \ libglib_1_3_la_SOURCES = \
@ -78,8 +82,10 @@ libglib_1_3_la_SOURCES = \
gunichartables.h \ gunichartables.h \
gunidecomp.h \ gunidecomp.h \
gunidecomp.c \ gunidecomp.c \
gutils.c \ gutils.c
@ALLOCA@
## If we decide to link in 'alloca.c', this is how to do it
#libglib_1_3_la_LIBADD = @ALLOCA@
glibincludedir=$(includedir)/glib-2.0 glibincludedir=$(includedir)/glib-2.0
glibinclude_HEADERS = \ glibinclude_HEADERS = \
@ -194,5 +200,8 @@ snapshot:
snapcheck: snapcheck:
$(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"` $(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
dist-hook: dist-hook: $(BUILT_EXTRA_DIST)
cp glib.spec $(distdir) files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done

6
gmodule/ChangeLog
View File

@ -1,3 +1,8 @@
2000-10-15 Raja R Harinath <harinath@cs.umn.edu>
* Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gmodule.h: Moved declaration of g_log_domain_gmodule up before * gmodule.h: Moved declaration of g_log_domain_gmodule up before
@ -310,7 +315,6 @@ Sun Aug 9 15:57:38 1998 Tim Janik <timj@gtk.org>
* gmodule.c: GModule library implementation, which is basically * gmodule.c: GModule library implementation, which is basically
a wrapper about system specifc dynamic loading facilities. a wrapper about system specifc dynamic loading facilities.
Sun Aug 9 10:31:05 1998 Tim Janik <timj@gtk.org> Sun Aug 9 10:31:05 1998 Tim Janik <timj@gtk.org>
* ChangeLog start for gmodule. * ChangeLog start for gmodule.

15
gmodule/Makefile.am
View File

@ -4,9 +4,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule \
-DG_LOG_DOMAIN=g_log_domain_gmodule @GLIB_DEBUG_FLAGS@ -DG_LOG_DOMAIN=g_log_domain_gmodule @GLIB_DEBUG_FLAGS@
EXTRA_DIST = \ EXTRA_DIST = \
makefile.mingw \
makefile.mingw.in \ makefile.mingw.in \
makefile.msc \
makefile.msc.in \ makefile.msc.in \
gmoduleconf.h.in \ gmoduleconf.h.in \
gmodule.def \ gmodule.def \
@ -16,9 +14,13 @@ EXTRA_DIST = \
gmodule-win32.c \ gmodule-win32.c \
gmodule-beos.c \ gmodule-beos.c \
gmoduleconf.h.win32 \ gmoduleconf.h.win32 \
gmodule.rc \
gmodule.rc.in gmodule.rc.in
BUILT_EXTRA_DIST = \
makefile.mingw \
makefile.msc \
gmodule.rc
BUILT_SOURCES = gmoduleconf.h BUILT_SOURCES = gmoduleconf.h
gmoduleconf.h: gmoduleconf.h.in gmoduleconf.h: gmoduleconf.h.in
@ -82,3 +84,10 @@ install-libLTLIBRARIES: libgmodule-1.3.la
release: release:
$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"` $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
dist-hook: $(BUILT_EXTRA_DIST)
@files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done

9
gobject/ChangeLog
View File

@ -1,9 +1,16 @@
2000-10-15 Raja R Harinath <harinath@cs.umn.edu>
* Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
(*): Remove traces of @STRIP_{BEGIN,END}@.
2000-09-29 Martin Baulig <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
Several minor ANSI C fixes. Several minor ANSI C fixes.
Added missing casts: Added missing casts:
* gtype.c (type_class_init): `(gpointer) bnode->data->class.class_init_base' * gtype.c (type_class_init):
`(gpointer) bnode->data->class.class_init_base'
in call to g_slist_prepend() and in call to g_slist_prepend() and
'GBaseInitFunc class_init_base = (GBaseInitFunc) slist->data'. 'GBaseInitFunc class_init_base = (GBaseInitFunc) slist->data'.

39
gobject/Makefile.am
View File

@ -9,21 +9,20 @@ INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I. @GLIB_DEBUG_FLAGS@
lib_LTLIBRARIES = libgobject-1.3.la lib_LTLIBRARIES = libgobject-1.3.la
# provide g_logv() domain # provide g_logv() domain
DEFS += -DG_LOG_DOMAIN=g_log_domain_gobject AM_CFLAGS = -DG_LOG_DOMAIN=g_log_domain_gobject
# libtool stuff: set version and export symbols for resolving # libtool stuff: set version and export symbols for resolving
libgobjectincludedir = $(includedir)/glib-2.0/gobject libgobjectincludedir = $(includedir)/glib-2.0/gobject
libgobject_1_3_la_LDFLAGS = @STRIP_BEGIN@ \ libgobject_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic \ -export-dynamic
@STRIP_END@
libgobject_1_3_la_LIBADD = # $(libglib) libgobject_1_3_la_LIBADD = # $(libglib)
# #
# setup source file variables # setup source file variables
# #
# GObject header files for public installation (non-generated) # GObject header files for public installation (non-generated)
gobject_public_h_sources = @STRIP_BEGIN@ \ gobject_public_h_sources = \
gvalue.h \ gvalue.h \
gvaluetypes.h \ gvaluetypes.h \
gparam.h \ gparam.h \
@ -31,28 +30,25 @@ gobject_public_h_sources = @STRIP_BEGIN@ \
genums.h \ genums.h \
gobject.h \ gobject.h \
gtype.h \ gtype.h \
gvaluecollector.h \ gvaluecollector.h
@STRIP_END@
# private GObject header files # private GObject header files
gobject_private_h_sources = @STRIP_BEGIN@ \ gobject_private_h_sources =
@STRIP_END@
# GObject C sources to build the library from # GObject C sources to build the library from
gobject_c_sources = @STRIP_BEGIN@ \ gobject_c_sources = \
gvalue.c \ gvalue.c \
gvaluetypes.c \ gvaluetypes.c \
gparam.c \ gparam.c \
gparamspecs.c \ gparamspecs.c \
genums.c \ genums.c \
gobject.c \ gobject.c \
gtype.c \ gtype.c
@STRIP_END@
# non-header sources (headers should be specified in the above variables) # non-header sources (headers should be specified in the above variables)
# that don't serve as direct make target sources, i.e. they don't have # that don't serve as direct make target sources, i.e. they don't have
# their own .lo rules and don't get publically installed # their own .lo rules and don't get publically installed
gobject_extra_sources = @STRIP_BEGIN@ \ gobject_extra_sources =
@STRIP_END@
# #
# setup GObject sources and their dependancies # setup GObject sources and their dependancies
@ -81,14 +77,16 @@ gobject_query_LDADD = $(progs_LDADD)
# auxillary files # auxillary files
# #
EXTRA_DIST += \ EXTRA_DIST += \
makefile.mingw \
makefile.mingw.in \ makefile.mingw.in \
makefile.msc \
makefile.msc.in \ makefile.msc.in \
gobject.def \ gobject.def \
gobject.rc \
gobject.rc.in gobject.rc.in
BUILT_EXTRA_DIST = \
makefile.mingw \
makefile.msc \
gobject.rc
gobject.rc: $(top_builddir)/config.status $(top_srcdir)/gobject/gobject.rc.in gobject.rc: $(top_builddir)/config.status $(top_srcdir)/gobject/gobject.rc.in
cd $(top_builddir) && CONFIG_FILES=gobject/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=gobject/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@ -97,3 +95,10 @@ makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gobject/makefile.min
makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gobject/makefile.msc.in makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gobject/makefile.msc.in
cd $(top_builddir) && CONFIG_FILES=gobject/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=gobject/$@ CONFIG_HEADERS= $(SHELL) ./config.status
dist-hook: $(BUILT_EXTRA_DIST)
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done

5
gthread/ChangeLog
View File

@ -1,3 +1,8 @@
2000-10-15 Raja R Harinath <harinath@cs.umn.edu>
* Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
2000-09-29 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-29 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread-impl.c: Added errorcheck mutexes. New exported function * gthread-impl.c: Added errorcheck mutexes. New exported function

15
gthread/Makefile.am
View File

@ -4,17 +4,19 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gthread \
-DG_LOG_DOMAIN=\"GThread\" @GTHREAD_COMPILE_IMPL_DEFINES@ -DG_LOG_DOMAIN=\"GThread\" @GTHREAD_COMPILE_IMPL_DEFINES@
EXTRA_DIST = \ EXTRA_DIST = \
makefile.mingw \
makefile.mingw.in \ makefile.mingw.in \
makefile.msc \
makefile.msc.in \ makefile.msc.in \
gthread-posix.c \ gthread-posix.c \
gthread-solaris.c \ gthread-solaris.c \
gthread-none.c \ gthread-none.c \
gthread.def \ gthread.def \
gthread.rc \
gthread.rc.in gthread.rc.in
BUILT_EXTRA_DIST = \
makefile.mingw \
makefile.msc \
gthread.rc
libglib = $(top_builddir)/libglib.la # -lglib libglib = $(top_builddir)/libglib.la # -lglib
top_builddir_full=`cd \$(top_builddir); pwd` top_builddir_full=`cd \$(top_builddir); pwd`
@ -36,3 +38,10 @@ makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gthread/makefile.min
makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gthread/makefile.msc.in makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gthread/makefile.msc.in
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status
dist-hook: $(BUILT_EXTRA_DIST)
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done

12
tests/Makefile.am
View File

@ -4,11 +4,13 @@ INCLUDES = -I$(top_srcdir) @GLIB_DEBUG_FLAGS@
EFENCE= EFENCE=
EXTRA_DIST = \ EXTRA_DIST = \
makefile.msc \
makefile.msc.in \ makefile.msc.in \
makefile.mingw \
makefile.mingw.in makefile.mingw.in
BUILT_EXTRA_DIST = \
makefile.msc \
makefile.mingw
TESTS = \ TESTS = \
array-test \ array-test \
date-test \ date-test \
@ -61,3 +63,9 @@ makefile.msc: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.msc.in
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.mingw.in makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status
dist-hook: $(BUILT_EXTRA_DIST)
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done