Remove unused code. Whitespace cleanup.

[platform/upstream/glib.git] / configure.in

diff --git a/configure.in b/configure.in
index 8d90afb..eb4bc46 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,7 @@ m4_define(glib_configure_in)
 #
 m4_define([glib_major_version], [2])
 m4_define([glib_minor_version], [17])
-m4_define([glib_micro_version], [5])
+m4_define([glib_micro_version], [7])
 m4_define([glib_interface_age], [0])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])
@@ -115,10 +115,12 @@ AC_MSG_RESULT([$glib_native_beos])
 dnl
 
 AC_MSG_CHECKING([for Win32])
+LIB_EXE_MACHINE_FLAG=X86
 case "$host" in
   *-*-mingw*)
     glib_native_win32=yes
     glib_pid_type='void *'
+    glib_cv_stack_grows=no
     # Unfortunately the mingw implementations of C99-style snprintf and vsnprintf
     # don't seem to be quite good enough, at least not in mingw-runtime-3.14.
     # (Sorry, I don't know exactly what is the problem, but it is related to
@@ -128,6 +130,11 @@ case "$host" in
     # So preset the autoconf cache variables.
     ac_cv_func_vsnprintf_c99=no
     ac_cv_func_snprintf_c99=no
+    case "$host" in
+    x86_64-*-*)
+      LIB_EXE_MACHINE_FLAG=X64
+      ;;
+    esac
     ;;
   *)
     glib_native_win32=no
@@ -142,6 +149,8 @@ esac
 
 AC_MSG_RESULT([$glib_native_win32])
 
+AC_SUBST(LIB_EXE_MACHINE_FLAG)
+
 glib_have_carbon=no
 AC_MSG_CHECKING([for Mac OS X Carbon support])
 AC_TRY_CPP([
@@ -152,6 +161,7 @@ AC_TRY_CPP([
 AC_MSG_RESULT([$glib_have_carbon])
 
 AM_CONDITIONAL(OS_WIN32, [test "$glib_native_win32" = "yes"])
+AM_CONDITIONAL(OS_WIN32_X64, [test "$LIB_EXE_MACHINE_FLAG" = "X64"])
 AM_CONDITIONAL(OS_UNIX, [test "$glib_native_win32" != "yes"])
 AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"])
 AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"])
@@ -848,6 +858,7 @@ AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct
 AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <sys/statfs.h>
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
@@ -879,6 +890,12 @@ case $ac_cv_sizeof_size_t in
   $ac_cv_sizeof_long) 
       glib_size_type=long
       ;;
+  $ac_cv_sizeof_long_long)
+      glib_size_type='long long'
+      ;;
+  $ac_cv_sizeof__int64)
+      glib_size_type='__int64'
+      ;;
   *)  AC_MSG_ERROR([No type matching size_t in size])
       ;;
 esac
@@ -2631,7 +2648,7 @@ _______EOF
        if test x$glib_sys_poll_h = xyes; then
          echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile
        fi
-       if test x$enable_included_printf != xyes; then
+       if test x$glib_included_printf != xyes; then
           echo "
 /* Specifies that GLib's g_print*() functions wrap the
  * system printf functions.  This is useful to know, for example,
@@ -2746,6 +2763,9 @@ _______EOF
 
 #define GINT_TO_POINTER(i)     ((gpointer) ${glib_gpi_cast} (i))
 #define GUINT_TO_POINTER(u)    ((gpointer) ${glib_gpui_cast} (u))
+
+typedef signed $glib_intptr_type_define gintptr;
+typedef unsigned $glib_intptr_type_define guintptr;
 _______EOF
        else
          echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
@@ -2931,6 +2951,13 @@ _______EOF
 
 #define G_MODULE_SUFFIX "$g_module_suffix"
 
+/* A GPid is an abstraction for a process "handle". It is *not* an
+ * abstraction for a process identifier in general. GPid is used in
+ * GLib only for descendant processes spawned with the g_spawn*
+ * functions. On POSIX there is no "process handle" concept as such,
+ * but on Windows a GPid is a handle to a process, a kind of pointer,
+ * not a process identifier.
+ */
 typedef $g_pid_type GPid;
 
 G_END_DECLS
@@ -2990,6 +3017,10 @@ if test x$ac_cv_header_sys_poll_h = xyes ; then
   glib_sys_poll_h=yes
 fi
 
+if test x$enable_included_printf = xyes ; then
+  glib_included_printf=yes
+fi
+
 case 2 in
 $ac_cv_sizeof_short)           
   gint16=short
@@ -3067,11 +3098,11 @@ $ac_cv_sizeof___int64)
   ;;
 esac
 glib_size_t=$ac_cv_sizeof_size_t
-glib_size_type_define=$glib_size_type
-glib_void_p=$ac_cv_sizeof_long
-glib_long=$ac_cv_sizeof_void_p
+glib_size_type_define="$glib_size_type"
+glib_void_p=$ac_cv_sizeof_void_p
+glib_long=$ac_cv_sizeof_long
 
-case $glib_size_type in
+case "$glib_size_type" in
 short)
   gsize_modifier='"h"'
   gsize_format='"hu"'
@@ -3090,16 +3121,41 @@ long)
   gssize_format='"li"'
   glib_msize_type='LONG'
   ;;
+"long long"|__int64)
+  gsize_modifier='"I64"'
+  gsize_format='"I64u"'
+  gssize_format='"I64i"'
+  glib_msize_type='INT64'
+  ;;
 esac
 
 gintbits=`expr $ac_cv_sizeof_int \* 8`
 glongbits=`expr $ac_cv_sizeof_long \* 8`
 
-
 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 ;;
+$ac_cv_sizeof_int)
+  glib_intptr_type_define=int
+  glib_gpi_cast=''
+  glib_gpui_cast=''
+  ;;
+$ac_cv_sizeof_long)
+  glib_intptr_type_define=long
+  glib_gpi_cast='(glong)'
+  glib_gpui_cast='(gulong)'
+  ;;
+$ac_cv_sizeof_long_long)
+  glib_intptr_type_define='long long'
+  glib_gpi_cast='(gint64)'
+  glib_gpui_cast='(guint64)'
+  ;;
+$ac_cv_sizeof___int64)
+  glib_intptr_type_define=__int64
+  glib_gpi_cast='(gint64)'
+  glib_gpui_cast='(guint64)'
+  ;;
+*)
+  glib_unknown_void_p=yes
+  ;;
 esac