Revision: 6397
Author: ek.kato
Date: Thu May 27 19:03:07 2010
Log: * Merge r6393, r6396 from trunk.

http://code.google.com/p/uim/source/detail?r=6397

Modified:
 /branches/1.5/configure.ac
 /branches/1.5/uim/Makefile.am

=======================================
--- /branches/1.5/configure.ac  Sat May 15 04:36:33 2010
+++ /branches/1.5/configure.ac  Thu May 27 19:03:07 2010
@@ -613,6 +613,23 @@
                [define if you have struct sockaddr_storage data type])
 fi

+dnl cred related
+AC_CACHE_CHECK([for struct cmsgcred], ac_cv_have_struct_cmsgcred, [
+       AC_TRY_COMPILE(
+               [
+#include <sys/types.h>
+#include <sys/socket.h>
+               ],
+               [ struct cmsgcred s; ],
+               [ ac_cv_have_struct_cmsgcred="yes" ],
+               [ ac_cv_have_struct_cmsgcred="no" ]
+       )
+])
+if test "x$ac_cv_have_struct_cmsgcred" = "xyes" ; then
+       AC_DEFINE(HAVE_STRUCT_CMSGCRED, 1,
+               [define if you have struct cmsgcred data type])
+fi
+
 AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_have_struct_sockaddr_in6, [
        AC_TRY_COMPILE(
                [
=======================================
--- /branches/1.5/uim/Makefile.am       Wed Mar 24 21:25:51 2010
+++ /branches/1.5/uim/Makefile.am       Thu May 27 19:03:07 2010
@@ -165,13 +165,16 @@
                         -I$(top_srcdir)/sigscheme/src \
                         -I$(top_builddir)/sigscheme/src \
                         $(GCROOTS_CFLAGS)
+# GCC 4.4's optimization may causes problem with combination of
+# alloc.c and read.c imported from sigscheme
+libuim_scm_la_CFLAGS = -fno-strict-aliasing
 if DEBUG
   libuim_scm_la_CPPFLAGS += -DDEBUG=1 -DDEBUG_SCM=1
 endif
 # Since the generated Makefile will have the order
 # '$(libuim_scm_la_CFLAGS) $(CFLAGS)', overriding -Werror in $CFLAGS
 # by -Wno-error in $UIM_SCM_CFLAGS does not work.
-#libuim_scm_la_CFLAGS = $(UIM_SCM_CFLAGS)
+#libuim_scm_la_CFLAGS += $(UIM_SCM_CFLAGS)

 # NOTE: Don't depend on -export-symbols-regex to avoid symbol
 # conflict. The libtool option is not and will not be supported on

Reply via email to