[rtems commit] libmisc: Provide libutf8proc conditionally

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    91404ded256023f89c1065ae92ef3ba181bfd635
Changeset: http://git.rtems.org/rtems/commit/?id=91404ded256023f89c1065ae92ef3ba181bfd635

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Jul 26 09:34:32 2013 +0200

libmisc: Provide libutf8proc conditionally

---

 cpukit/configure.ac        |    4 ++++
 cpukit/libmisc/Makefile.am |    2 ++
 cpukit/wrapup/Makefile.am  |    4 ++++
 3 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index f897ece..da02f24 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -280,6 +280,8 @@ AC_CHECK_SIZEOF([off_t])
 # FIXME: We should get rid of this. It's a cludge.
 AC_CHECK_SIZEOF([time_t])
 
+AC_CHECK_SIZEOF([size_t])
+
 # FIXME: Mandatory in SUSv4, optional in SUSv3. 
 #   Not implemented in GCC/newlib, so far.
 AC_CHECK_DECLS([WORD_BIT],,,[#include <limits.h>])
@@ -317,6 +319,8 @@ AM_CONDITIONAL([LIBSERDBG],[test x"$rtems_cv_cc_attribute_weak" = x"yes"])
 AM_CONDITIONAL([LIBGNAT],[test x"$rtems_cv_HAS_POSIX_API" = x"yes" \
 && test x"$enable_ada" = x"yes"])
 
+AM_CONDITIONAL([LIBUTF8PROC],[test $ac_cv_sizeof_size_t -gt 2])
+
 AM_CONDITIONAL([LIBDOSFS],[dnl
 test x"$ac_cv_type_uint8_t" = xyes \
 && test x"$ac_cv_type_uint16_t" = xyes])
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index 4c409ef..bc9edd0 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -154,8 +154,10 @@ noinst_LIBRARIES += libfsmount.a
 libfsmount_a_SOURCES = fsmount/fsmount.c fsmount/fsmount.h
 
 ## utf8proc
+if LIBUTF8PROC
 noinst_LIBRARIES += libutf8proc.a
 libutf8proc_a_SOURCES = utf8proc/utf8proc.c
+endif
 
 ## uuid
 noinst_LIBRARIES += libuuid.a
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index d7d69cd..26a5bd0 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -52,7 +52,11 @@ TMP_LIBS += ../libmisc/libfsmount.a
 TMP_LIBS += ../libmisc/libmouse.a
 TMP_LIBS += ../libmisc/libmw-fb.a
 TMP_LIBS += ../libmisc/libstringto.a
+
+if LIBUTF8PROC
 TMP_LIBS += ../libmisc/libutf8proc.a
+endif
+
 TMP_LIBS += ../libmisc/libuuid.a
 
 TMP_LIBS += ../libi2c/libi2c.a