updated.
[platform/upstream/glib.git] / configure.in
index 5eac82a..b1a074a 100644 (file)
@@ -292,10 +292,10 @@ case x$glib_cv_hasinline in
 xyes) AC_DEFINE(G_HAVE_INLINE)
 esac
 
-dnl for bytesex stuff
+# check for bytesex stuff
 AC_C_BIGENDIAN
 
-dnl header file checks
+# xhexk for header files
 AC_CHECK_HEADERS(float.h, AC_DEFINE(HAVE_FLOAT_H))
 AC_CHECK_HEADERS(limits.h, AC_DEFINE(HAVE_LIMITS_H))
 AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H))
@@ -306,6 +306,29 @@ AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
 AC_CHECK_HEADERS(sys/times.h, AC_DEFINE(HAVE_SYS_TIMES_H))
 AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
 AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H))
+AC_CHECK_HEADERS(stdint.h, AC_DEFINE(HAVE_VALUES_H))
+
+# check additional type sizes
+size_includes=["
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+"]
+if test "x$ac_cv_header_stdint_h" = "xyes"; then
+  size_includes=["$size_includes
+#include <stdint.h>
+"]
+fi
+if test "x$ac_cv_header_unistd_h" = "xyes"; then
+  size_includes=["$size_includes
+#include <unistd.h>
+"]
+fi
+GLIB_SIZEOF([$size_includes], size_t, size_t)
+GLIB_SIZEOF([$size_includes], ptrdiff_t, ptrdiff_t)
+GLIB_SIZEOF([$size_includes], intmax_t, intmax_t)
 
 # Check for some functions
 AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll)
@@ -625,7 +648,7 @@ dnl *************************
 THREAD_NO_IMPLEMENTATION="You do not have any known thread system on your
                 computer. GLib will not have a default thread implementation."
 
-FLAG_DOES_NOT_WORK="I can't find the MACRO, that enables thread safety on your
+FLAG_DOES_NOT_WORK="I can't find the MACRO to enable thread safety on your
                 platform (normaly it's "_REENTRANT"). I'll not use any flag on
                 compilation now, but then your programs might not work.
                 Please provide information on how it is done on your system."
@@ -645,6 +668,17 @@ FUNC_NO_GETPWUID_R="the 'g_get_(user_name|real_name|home_dir|tmp_dir)'
 FUNC_NO_LOCALTIME_R="the 'g_date_set_time' function will not be MT-safe
                because there is no 'localtime_r' on your system."
 
+POSIX_NO_YIELD="I can not find a yield functions for your platform. A rather
+               crude surrogate will be used. If you happen to know a 
+               yield function for your system, please inform the GLib 
+               developers."
+
+POSIX_NO_PRIORITIES="I can not find the minimal and maximal priorities for 
+               threads on your system. Thus threads can only have the default 
+               priority. If you happen to know these main/max
+               priorities, please inform the GLib developers."
+
+
 dnl determination of thread implementation
 dnl ***************************************
 
@@ -659,17 +693,17 @@ 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
+       # -U_OSF_SOURCE is 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_]],
+                AC_EGREP_HEADER([(^|[^a-zA-Z_])pthread_attr_init[^a-zA-Z_]],
                        pthread.h,
                        have_threads=posix)
         fi
         if test "x$have_threads" = xnone; then
-                AC_EGREP_HEADER([[^a-zA-Z_]pthread_attr_create[^a-zA-Z_]],
+                AC_EGREP_HEADER([(^|[^a-zA-Z_])pthread_attr_create[^a-zA-Z_]],
                        pthread.h,
                        have_threads=dce)
         fi
@@ -699,8 +733,6 @@ case $have_threads in
                G_THREAD_LIBS=error
                glib_save_LIBS="$LIBS"
                for thread_lib in "" pthread pthreads c_r thread dce; do
-                       # This is not AC_CHECK_LIB to also work with function
-                       # name mangling in header files.
                        if test x"$thread_lib" = x; then
                                add_thread_lib=""
                                IN=""
@@ -708,17 +740,52 @@ case $have_threads in
                                add_thread_lib="-l$thread_lib"
                                IN=" in -l$thread_lib"
                        fi
+                       if test x"$have_threads" = xposix; then
+                               defattr=NULL
+                       else
+                               defattr=pthread_attr_default
+                       fi
                        
                        LIBS="$glib_save_LIBS $add_thread_lib"
                        
-                       AC_MSG_CHECKING(for pthread_join$IN)
-                       AC_TRY_LINK([#include <pthread.h>],
-                               [pthread_join(NULL,NULL)],
+                       AC_MSG_CHECKING(for pthread_create$IN)
+                       AC_TRY_RUN([#include <pthread.h> 
+                               void* func(void* data) {}
+                                main()
+                               { pthread_t t; 
+                                 exit(pthread_create (&t, $defattr, func, 
+                                               NULL));
+                               }],
                                [AC_MSG_RESULT(yes)
                                G_THREAD_LIBS="$add_thread_lib"
                                break],
                                [AC_MSG_RESULT(no)])
                done
+               for thread_lib in "" rt; do
+                       if test x"$thread_lib" = x; then
+                               add_thread_lib=""
+                               IN=""
+                       else
+                               add_thread_lib="-l$thread_lib"
+                               IN=" in -l$thread_lib"
+                       fi
+                       LIBS="$glib_save_LIBS $add_thread_lib"
+                       
+                       AC_MSG_CHECKING(for sched_get_priority_min$IN)
+                       AC_TRY_RUN([#include <sched.h>
+                               #include <errno.h>
+                               int main() {
+                               errno = 0;
+                                return sched_get_priority_min(SCHED_OTHER)==-1
+                                       && errno != 0;
+                               }],
+                               [AC_MSG_RESULT(yes)
+                               G_THREAD_LIBS="$G_THREAD_LIBS $add_thread_lib"
+                               posix_priority_min="sched_get_priority_min(SCHED_OTHER)"
+                               posix_priority_max="sched_get_priority_max(SCHED_OTHER)"
+                               break],
+                               [AC_MSG_RESULT(no)])
+               done
                LIBS="$glib_save_LIBS"
                 mutex_has_default=yes
                 mutex_default_type='pthread_mutex_t'
@@ -763,7 +830,6 @@ case $host in
     ;;
 esac
 
-
 AC_MSG_CHECKING(thread related libraries)
 AC_MSG_RESULT($G_THREAD_LIBS)
 
@@ -838,39 +904,33 @@ if test x"$enable_threads" = xyes; then
                fi
                if test "$ac_cv_func_getpwuid_r" = "yes"; then
                        AC_MSG_CHECKING(whether getpwuid_r is posix like)
-                       # getpwuid_r(0, NULL, NULL, 0) is the signature on
-                       # solaris, if that is not found, the prog below won't 
-                       # compile, then the posix signature is assumed as 
-                       # the default.
-                       AC_TRY_COMPILE([#include <pwd.h>],
-                               [getpwuid_r(0, NULL, NULL, 0);],
-                               [AC_MSG_RESULT(no)],
-                               [AC_MSG_RESULT(yes)
-                               AC_DEFINE(HAVE_GETPWUID_R_POSIX)])
+                       # The signature for the POSIX version is:
+                       # int getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **)
+                       AC_TRY_COMPILE([#include <pwd.h>
+                               #include <sys/types.h>
+                               #include <stdlib.h>],
+                               [getpwuid_r((uid_t)0, NULL, NULL, (size_t)0, NULL);],
+                               [AC_DEFINE(HAVE_GETPWUID_R_POSIX)
+                               AC_MSG_RESULT(yes)],
+                               [AC_MSG_RESULT(no)])
                fi
        fi
        LIBS="$LIBS $G_THREAD_LIBS"
        if test x"$have_threads" = xposix; then
+               glib_save_CPPFLAGS="$CPPFLAGS"
+               CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
                GLIB_SIZEOF([#include <pthread.h>],
                        pthread_t,
-                       pthread_t)
+                       system_thread)
                # This is not AC_CHECK_FUNC to also work with function
                # name mangling in header files.
                AC_MSG_CHECKING(for pthread_attr_setstacksize)
                AC_TRY_LINK([#include <pthread.h>],
-                       [pthread_attr_setstacksize(NULL,0)],
+                       [pthread_attr_t t; pthread_attr_setstacksize(&t,0)],
                        [AC_MSG_RESULT(yes)
                        AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE)],
                        [AC_MSG_RESULT(no)])
-               # If sched_get_priority_min(SCHED_OTHER) returns something 
-               # negative, we ignore it. This happens on Solaris.
                AC_MSG_CHECKING(for minimal/maximal thread priority)
-               AC_TRY_RUN([#include <pthread.h>
-                    int main () 
-                    { return sched_get_priority_min(SCHED_OTHER) < 0;}],
-                    [posix_priority_min="sched_get_priority_min(SCHED_OTHER)"
-                    posix_priority_max="sched_get_priority_max(SCHED_OTHER)"],
-                    [posix_priority_min=none])
                if test x"$posix_priority_min" = xnone; then
                        AC_EGREP_CPP(PX_PRIO_MIN,[#include <pthread.h>
                                PX_PRIO_MIN],,[
@@ -883,27 +943,19 @@ if test x"$enable_threads" = xyes; then
                                posix_priority_min=PRI_OTHER_MIN        
                                posix_priority_max=PRI_OTHER_MAX])
                fi
-               if test x"$posix_priority_min" = xnone; then
-                       case $host in
-                               *-*-solaris*)
-                               posix_priority_min=1
-                               posix_priority_max=127
-                               ;;
-                       esac
-               fi
-               if test x"$posix_priority_min" = xnone; then
+               if test x"$posix_priority_min" = x; then
                        AC_MSG_RESULT(none found)
                        AC_MSG_WARN($POSIX_NO_PRIORITIES)
-                       posix_priority_min=1
-                       posix_priority_max=1
+                       posix_priority_min=-1
+                       posix_priority_max=-1
                else
                        AC_MSG_RESULT($posix_priority_min/$posix_priority_max)
+                       AC_DEFINE_UNQUOTED(POSIX_MIN_PRIORITY,$posix_priority_min)
+                       AC_DEFINE_UNQUOTED(POSIX_MAX_PRIORITY,$posix_priority_max)
                fi
-               AC_DEFINE_UNQUOTED(POSIX_MIN_PRIORITY,$posix_priority_min)
-               AC_DEFINE_UNQUOTED(POSIX_MAX_PRIORITY,$posix_priority_max)
                posix_yield_func=none
                AC_MSG_CHECKING(for posix yield function)
-               for yield_func in pthread_yield_np pthread_yield sched_yield \
+               for yield_func in sched_yield pthread_yield_np pthread_yield \
                                                        thr_yield; do
                        AC_TRY_LINK([#include <pthread.h>],
                                [$yield_func()],
@@ -913,13 +965,19 @@ if test x"$enable_threads" = xyes; then
                if test x"$posix_yield_func" = xnone; then
                        AC_MSG_RESULT(none found)
                        AC_MSG_WARN($POSIX_NO_YIELD)
-                       posix_yield_func="g_thread_sleep(1000)"
+                       posix_yield_func="g_usleep(1000)"
                else
                        AC_MSG_RESULT($posix_yield_func)
                        posix_yield_func="$posix_yield_func()"
                fi
                AC_DEFINE_UNQUOTED(POSIX_YIELD_FUNC,$posix_yield_func)
+               CPPFLAGS="$glib_save_CPPFLAGS"
+       else # solaris threads
+               GLIB_SIZEOF([#include <thread.h>],
+                       thread_t,
+                       system_thread)
        fi
+
        LIBS="$glib_save_LIBS"
        CFLAGS="$glib_save_CFLAGS"
 
@@ -930,7 +988,11 @@ if test x"$enable_threads" = xyes; then
        if test "$ac_cv_func_localtime_r" != "yes"; then
                AC_MSG_WARN($FUNC_NO_LOCALTIME_R)
        fi
-fi
+else 
+       # If no thread implementation exists, we will provide enough
+       # space for a pointer
+       GLIB_SIZEOF(, void*, system_thread)
+fi     
 
 AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c")
 AC_SUBST(G_THREAD_CFLAGS)
@@ -946,6 +1008,10 @@ dnl
 dnl if mutex_has_default = yes, we also got
 dnl mutex_default_type, mutex_default_init and mutex_header_file
 GLIB_IF_VAR_EQ(mutex_has_default, yes,
+       glib_save_CPPFLAGS="$CPPFLAGS"
+       glib_save_LIBS="$LIBS"
+       LIBS="$LIBS $G_THREAD_LIBS"
+       CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
        GLIB_SIZEOF([#include <$mutex_header_file>],
                     $mutex_default_type,
                     gmutex,
@@ -955,14 +1021,11 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes,
                           gmutex,
                           $glib_cv_sizeof_gmutex,
                           $mutex_default_init)
-       if test x"$have_threads" = xposix; then 
-               GLIB_BYTE_CONTENTS([#define __USE_GNU
-#include <$mutex_header_file>],
-                                  $mutex_default_type,
-                                  grecmutex,
-                                  $glib_cv_sizeof_gmutex,
-                                  PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+       if test x"$glib_cv_byte_contents_gmutex" = xno; then
+               mutex_has_default=no
        fi
+       CPPFLAGS="$glib_save_CPPFLAGS"
+       LIBS="$glib_save_LIBS"
        ,
 )
 
@@ -1081,7 +1144,7 @@ _______EOF
 
        if test -n "$gint64"; then
          cat >>$outfile <<_______EOF
-${glib_warning_guard}#define G_HAVE_GINT64 1
+#define G_HAVE_GINT64 1
 
 ${glib_extension}typedef signed $gint64 gint64;
 ${glib_extension}typedef unsigned $gint64 guint64;
@@ -1153,32 +1216,21 @@ typedef struct _GMutex* GStaticMutex;
 #define g_static_mutex_get_mutex(mutex) (g_static_mutex_get_mutex_impl (mutex))
 _______EOF
        fi
-       if test x$g_recmutex_contents != xno -a \
-               x$g_recmutex_contents != x; then
-               # the definition of GStaticRecMutex is not done via 
-               # typedef GStaticMutex GStaticRecMutex to avoid silent
-               # compilation, when a GStaticRecMutex is used where a
-               # GStaticMutex should have been used and vice versa,
-               # because that micht fail on other platforms.
-               cat >>$outfile <<_______EOF
-typedef struct _GStaticRecMutex GStaticRecMutex;
-struct _GStaticRecMutex
+
+       cat >>$outfile <<_______EOF
+/* This represents a system thread as used by the implementation. An
+ * alien implementaion, as loaded by g_thread_init can only count on
+ * "sizeof (gpointer)" bytes to store their info. We however need more
+ * for some of our native implementations. */
+typedef union _GSystemThread GSystemThread;
+union _GSystemThread
 {
-  struct _GMutex *runtime_mutex;
-  union {
-    char   pad[$g_mutex_sizeof];
-    double dummy_double;
-    void  *dummy_pointer;
-    long   dummy_long;
-  } aligned_pad_u;
+  char   data[$g_system_thread_sizeof];
+  double dummy_double;
+  void  *dummy_pointer;
+  long   dummy_long;
 };
-#define G_STATIC_REC_MUTEX_INIT { NULL, { { $g_recmutex_contents} } }
-#define  g_static_rec_mutex_lock(mutex) g_static_mutex_lock (mutex)
-#define  g_static_rec_mutex_trylock(mutex) g_static_mutex_trylock (mutex)
-#define  g_static_rec_mutex_unlock(mutex) g_static_mutex_unlock (mutex)
-#define  g_static_rec_mutex_get_mutex(mutex) (mutex)
 _______EOF
-       fi
 
        echo >>$outfile
        g_bit_sizes="16 32"
@@ -1302,7 +1354,6 @@ $ac_cv_sizeof_int)
   gint64_format='"i"'
   guint64_format='"u"'
   glib_extension=
-  glib_warning_guard=
   gint64_constant='(val)'
   ;;
 $ac_cv_sizeof_long)
@@ -1310,7 +1361,6 @@ $ac_cv_sizeof_long)
   gint64_format='"li"'
   guint64_format='"lu"'
   glib_extension=
-  glib_warning_guard=
   gint64_constant='(val##L)'
   ;;
 $ac_cv_sizeof_long_long)
@@ -1318,14 +1368,6 @@ $ac_cv_sizeof_long_long)
   gint64_format='"'$glib_cv_long_long_format'i"'
   guint64_format='"'$glib_cv_long_long_format'u"'
   glib_extension='G_GNUC_EXTENSION '
-  glib_warning_guard="
-#if defined (__GNUC__) && __GNUC__ >= 2 && __GNUC_MINOR__ >= 8
-#  define G_GNUC_EXTENSION __extension__
-#else
-#  define G_GNUC_EXTENSION
-#endif
-
-"
   gint64_constant='(G_GNUC_EXTENSION (val##LL))'
   ;;
 esac
@@ -1425,8 +1467,8 @@ g_threads_impl_def=$g_threads_impl
 
 g_mutex_has_default="$mutex_has_default"
 g_mutex_sizeof="$glib_cv_sizeof_gmutex"
+g_system_thread_sizeof="$glib_cv_sizeof_system_thread"
 g_mutex_contents="$glib_cv_byte_contents_gmutex"
-g_recmutex_contents="$glib_cv_byte_contents_grecmutex"
 
 case $host in
   *-*-beos*)
@@ -1434,7 +1476,7 @@ case $host in
     ;;
   *-*-cygwin*)
     glib_os="#define G_OS_UNIX
-#define G_HAVE_CYGWIN"
+#define G_WITH_CYGWIN"
     ;;
   *)
     glib_os="#define G_OS_UNIX"
@@ -1450,6 +1492,7 @@ gmodule/gmoduleconf.h
 gmodule/Makefile
 gthread/Makefile
 docs/Makefile
+docs/glib-config.1
 tests/Makefile
 ],[case "$CONFIG_FILES" in
 *glib-config*)chmod +x glib-config;;