From: VMware, Inc <>
Date: Thu, 18 Nov 2010 22:18:04 +0000 (-0800)
Subject: OVT: a few build fixes.
X-Git-Tag: 2010.11.17-327185~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd8872203259d5fa6ab9abfe62087dad48138dab;p=thirdparty%2Fopen-vm-tools.git

OVT: a few build fixes.

. support ICU > 3.8 correctly (not just 3.8)
. clean up generated rpcgen files so "make distclean" works more like it
should.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 8134e0ef0..ee5ff7db5 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -791,13 +791,22 @@ if test "$with_icu" = "yes"; then
                       [],
                       [ICU_CPPFLAGS="$ICU_CPPFLAGS -DUSE_ICU"],
                       [AC_MSG_ERROR([ICU library not found. Please configure without ICU (using --without-icu) or install ICU - http://www.icu-project.org])])
-   # Check whether we have ICU 3.8.
+   # Check whether we have ICU >= 3.8.
    AC_LANG_PUSH([C++])
-   AC_CHECK_LIB([icuuc],
-                [ucasemap_utf8ToTitle_3_8],
-                [ICU_CPPFLAGS="$ICU_CPPFLAGS -DHAVE_ICU_38"],
-                [],
-                [$ICU_LIBS])
+   AC_MSG_CHECKING([for ucasemap_utf8ToTitle in ICU])
+   ORIGINAL_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"
+   AC_TRY_COMPILE([#include <unicode/ucasemap.h>],
+                  [
+                     (void) &ucasemap_utf8ToTitle;
+                     return 0;
+                  ],
+                  [
+                     ICU_CPPFLAGS="$ICU_CPPFLAGS -DHAVE_ICU_38"
+                     AC_MSG_RESULT([yes])
+                  ],
+                  [AC_MSG_RESULT([no])])
+   CPPFLAGS="$ORIGINAL_CPPFLAGS"
    AC_LANG_POP([C++])
 
    # Easier to give all modules the ICU defines/includes...
diff --git a/open-vm-tools/libguestlib/Makefile.am b/open-vm-tools/libguestlib/Makefile.am
index b0fe36589..4a0681e8e 100644
--- a/open-vm-tools/libguestlib/Makefile.am
+++ b/open-vm-tools/libguestlib/Makefile.am
@@ -47,6 +47,9 @@ BUILT_SOURCES += guestlibV3_xdr.c
 BUILT_SOURCES += guestlibIoctl.h
 BUILT_SOURCES += guestlibIoctl_xdr.c
 
+CLEANFILES =
+CLEANFILES += $(BUILT_SOURCES)
+
 CFLAGS += -Wno-unused
 
 EXTRA_DIST = vmguestlib.pc.in
diff --git a/open-vm-tools/services/plugins/dndcp/Makefile.am b/open-vm-tools/services/plugins/dndcp/Makefile.am
index 62de89158..dc71f01e1 100644
--- a/open-vm-tools/services/plugins/dndcp/Makefile.am
+++ b/open-vm-tools/services/plugins/dndcp/Makefile.am
@@ -68,6 +68,9 @@ BUILT_SOURCES =
 BUILT_SOURCES += cpFileContents.h
 BUILT_SOURCES += cpFileContents_xdr.c
 
+CLEANFILES =
+CLEANFILES += $(BUILT_SOURCES)
+
 libdndcp_la_SOURCES += cpFileContents_xdr.c
 
 cpFileContents.h: cpFileContents.x
diff --git a/open-vm-tools/services/plugins/unity/Makefile.am b/open-vm-tools/services/plugins/unity/Makefile.am
index 7e0e9fea2..3f06b06a7 100644
--- a/open-vm-tools/services/plugins/unity/Makefile.am
+++ b/open-vm-tools/services/plugins/unity/Makefile.am
@@ -109,6 +109,9 @@ BUILT_SOURCES =
 BUILT_SOURCES += $(RPCGEN_HDRS)
 BUILT_SOURCES += $(RPCGEN_SRCS)
 
+CLEANFILES =
+CLEANFILES += $(BUILT_SOURCES)
+
 libunity_la_SOURCES += $(RPCGEN_SRCS)
 
 ## `make clean` should also remove the copied headers.