From 3e956742324ba6bef056524fa93362f85c932cdd Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Thu, 18 Mar 1999 14:41:38 +0000 Subject: [PATCH] added new AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES) to hold various defines 1999-03-18 Sebastian Wilhelmi * configure.in: added new AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES) to hold various defines to get the right thread implementation on different platforms. Also look in -ldce for pthread_create. Should make it work on HP-UX 10.x. * gthread/Makefile.am (INCLUDES): Added @GTHREAD_COMPILE_IMPL_DEFINES@. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-12 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ configure.in | 12 ++++++++---- gthread/ChangeLog | 4 ++++ gthread/Makefile.am | 3 ++- 11 files changed, 70 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 212817848..10d8a6d62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +1999-03-18 Sebastian Wilhelmi + + * configure.in: added new AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES) + to hold various defines to get the right thread implementation on + different platforms. Also look in -ldce for pthread_create. Should + make it work on HP-UX 10.x. + 1999-03-17 Jeff Garzik * gstack.c, gqueue.c: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 212817848..10d8a6d62 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +1999-03-18 Sebastian Wilhelmi + + * configure.in: added new AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES) + to hold various defines to get the right thread implementation on + different platforms. Also look in -ldce for pthread_create. Should + make it work on HP-UX 10.x. + 1999-03-17 Jeff Garzik * gstack.c, gqueue.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 212817848..10d8a6d62 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +1999-03-18 Sebastian Wilhelmi + + * configure.in: added new AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES) + to hold various defines to get the right thread implementation on + different platforms. Also look in -ldce for pthread_create. Should + make it work on HP-UX 10.x. + 1999-03-17 Jeff Garzik * gstack.c, gqueue.c: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 212817848..10d8a6d62 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +1999-03-18 Sebastian Wilhelmi + + * configure.in: added new AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES) + to hold various defines to get the right thread implementation on + different platforms. Also look in -ldce for pthread_create. Should + make it work on HP-UX 10.x. + 1999-03-17 Jeff Garzik * gstack.c, gqueue.c: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 212817848..10d8a6d62 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +1999-03-18 Sebastian Wilhelmi + + * configure.in: added new AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES) + to hold various defines to get the right thread implementation on + different platforms. Also look in -ldce for pthread_create. Should + make it work on HP-UX 10.x. + 1999-03-17 Jeff Garzik * gstack.c, gqueue.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 212817848..10d8a6d62 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +1999-03-18 Sebastian Wilhelmi + + * configure.in: added new AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES) + to hold various defines to get the right thread implementation on + different platforms. Also look in -ldce for pthread_create. Should + make it work on HP-UX 10.x. + 1999-03-17 Jeff Garzik * gstack.c, gqueue.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 212817848..10d8a6d62 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +1999-03-18 Sebastian Wilhelmi + + * configure.in: added new AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES) + to hold various defines to get the right thread implementation on + different platforms. Also look in -ldce for pthread_create. Should + make it work on HP-UX 10.x. + 1999-03-17 Jeff Garzik * gstack.c, gqueue.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 212817848..10d8a6d62 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +1999-03-18 Sebastian Wilhelmi + + * configure.in: added new AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES) + to hold various defines to get the right thread implementation on + different platforms. Also look in -ldce for pthread_create. Should + make it work on HP-UX 10.x. + 1999-03-17 Jeff Garzik * gstack.c, gqueue.c: diff --git a/configure.in b/configure.in index f2c941b5e..12c2ea156 100644 --- a/configure.in +++ b/configure.in @@ -580,6 +580,11 @@ if test "x$want_threads" = xyes || test "x$want_threads" = xsolaris; then fi if test "x$want_threads" = xyes || test "x$want_threads" = xposix \ || test "x$want_threads" = xdce; then + # -D_POSIX4A_DRAFT10_SOURCE is for DG/UX + # -U_OSF_SOURCE if for Digital UNIX 4.0d + GTHREAD_COMPILE_IMPL_DEFINES="-D_POSIX4A_DRAFT10_SOURCE -U_OSF_SOURCE" + glib_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES" if test "x$have_threads" = xnone; then AC_EGREP_HEADER([[^a-zA-Z_]pthread_attr_init[^a-zA-Z_]], pthread.h, @@ -590,6 +595,7 @@ if test "x$want_threads" = xyes || test "x$want_threads" = xposix \ pthread.h, have_threads=dce) fi + CPPFLAGS="$glib_save_CPPFLAGS" fi if test "x$want_threads" = xyes || test "x$want_threads" = xnspr; then if test "x$have_threads" = xnone; then @@ -618,7 +624,7 @@ case $have_threads in posix|dce) G_THREAD_LIBS=error glib_save_LIBS="$LIBS" - for thread_lib in "" pthread pthreads c_r thread; do + for thread_lib in "" pthread pthreads c_r thread dce; do # This is not AC_CHECK_LIB to also work with function # name mangling in header files. if test x"$thread_lib" = x; then @@ -640,9 +646,6 @@ case $have_threads in [AC_MSG_RESULT(no)]) done LIBS="$glib_save_LIBS" - dnl ********** DG/UX ************ - AC_CHECK_LIB(thread, __d10_pthread_create, - G_THREAD_CFLAGS="-D_POSIX4A_DRAFT10_SOURCE") mutex_has_default=yes mutex_default_type='pthread_mutex_t' mutex_default_init='PTHREAD_MUTEX_INITIALIZER' @@ -653,6 +656,7 @@ case $have_threads in g_threads_impl="DCE" have_threads="posix" fi + AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES) ;; solaris) G_THREAD_LIBS=error diff --git a/gthread/ChangeLog b/gthread/ChangeLog index 3e7c2e614..712398966 100644 --- a/gthread/ChangeLog +++ b/gthread/ChangeLog @@ -1,3 +1,7 @@ +1999-03-18 Sebastian Wilhelmi + + * Makefile.am (INCLUDES): Added @GTHREAD_COMPILE_IMPL_DEFINES@. + 1999-03-12 Sebastian Wilhelmi * gthread-posix.c (g_private_get_posix_impl): Fixed typo for DCE diff --git a/gthread/Makefile.am b/gthread/Makefile.am index 21b860773..275245536 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gthread -DG_LOG_DOMAIN=\"GThread\" +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gthread \ + -DG_LOG_DOMAIN=\"GThread\" @GTHREAD_COMPILE_IMPL_DEFINES@ EXTRA_DIST = \ gthread-posix.c \