diff -Naur ACE_wrappers.orig/ace/config.h ACE_wrappers/ace/config.h
--- ACE_wrappers.orig/ace/config.h	1969-12-31 19:00:00.000000000 -0500
+++ ACE_wrappers/ace/config.h	2012-06-29 12:40:08.000000000 -0400
@@ -0,0 +1 @@
+#include "ace/config-linux.h"
diff -Naur ACE_wrappers.orig/apps/gperf/src/GNUmakefile.gperf ACE_wrappers/apps/gperf/src/GNUmakefile.gperf
--- ACE_wrappers.orig/apps/gperf/src/GNUmakefile.gperf	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/apps/gperf/src/GNUmakefile.gperf	2012-06-29 12:40:08.000000000 -0400
@@ -103,6 +103,8 @@
 ifneq ($(CROSS-COMPILE),)
 all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install:
 	@echo This project will not build on CROSS-COMPILE platforms.
+install:
+	@echo This project will not install on CROSS-COMPILE platforms.
 else
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
diff -Naur ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.adainset ACE_wrappers/apps/gperf/tests/GNUmakefile.adainset
--- ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.adainset	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/apps/gperf/tests/GNUmakefile.adainset	2012-06-29 12:40:08.000000000 -0400
@@ -97,6 +97,8 @@
 ifneq ($(CROSS-COMPILE),)
 all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install:
 	@echo This project will not build on CROSS-COMPILE platforms.
+install:
+	@echo This project will not install on CROSS-COMPILE platforms.
 else
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
diff -Naur ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.cinset ACE_wrappers/apps/gperf/tests/GNUmakefile.cinset
--- ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.cinset	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/apps/gperf/tests/GNUmakefile.cinset	2012-06-29 12:40:08.000000000 -0400
@@ -97,6 +97,8 @@
 ifneq ($(CROSS-COMPILE),)
 all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install:
 	@echo This project will not build on CROSS-COMPILE platforms.
+install:
+	@echo This project will not install on CROSS-COMPILE platforms.
 else
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
diff -Naur ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.cppinset ACE_wrappers/apps/gperf/tests/GNUmakefile.cppinset
--- ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.cppinset	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/apps/gperf/tests/GNUmakefile.cppinset	2012-06-29 12:40:08.000000000 -0400
@@ -97,6 +97,8 @@
 ifneq ($(CROSS-COMPILE),)
 all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install:
 	@echo This project will not build on CROSS-COMPILE platforms.
+install:
+	@echo This project will not install on CROSS-COMPILE platforms.
 else
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
diff -Naur ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.iinset ACE_wrappers/apps/gperf/tests/GNUmakefile.iinset
--- ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.iinset	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/apps/gperf/tests/GNUmakefile.iinset	2012-06-29 12:40:08.000000000 -0400
@@ -97,6 +97,8 @@
 ifneq ($(CROSS-COMPILE),)
 all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install:
 	@echo This project will not build on CROSS-COMPILE platforms.
+install:
+	@echo This project will not install on CROSS-COMPILE platforms.
 else
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
diff -Naur ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.iinset2 ACE_wrappers/apps/gperf/tests/GNUmakefile.iinset2
--- ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.iinset2	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/apps/gperf/tests/GNUmakefile.iinset2	2012-06-29 12:40:08.000000000 -0400
@@ -99,6 +99,8 @@
 ifneq ($(CROSS-COMPILE),)
 all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install:
 	@echo This project will not build on CROSS-COMPILE platforms.
+install:
+	@echo This project will not install on CROSS-COMPILE platforms.
 else
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
diff -Naur ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.m3inset ACE_wrappers/apps/gperf/tests/GNUmakefile.m3inset
--- ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.m3inset	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/apps/gperf/tests/GNUmakefile.m3inset	2012-06-29 12:40:08.000000000 -0400
@@ -97,6 +97,8 @@
 ifneq ($(CROSS-COMPILE),)
 all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install:
 	@echo This project will not build on CROSS-COMPILE platforms.
+install:
+	@echo This project will not install on CROSS-COMPILE platforms.
 else
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
diff -Naur ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.pinset ACE_wrappers/apps/gperf/tests/GNUmakefile.pinset
--- ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.pinset	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/apps/gperf/tests/GNUmakefile.pinset	2012-06-29 12:40:08.000000000 -0400
@@ -97,6 +97,8 @@
 ifneq ($(CROSS-COMPILE),)
 all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install:
 	@echo This project will not build on CROSS-COMPILE platforms.
+install:
+	@echo This project will not install on CROSS-COMPILE platforms.
 else
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
diff -Naur ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.preinset ACE_wrappers/apps/gperf/tests/GNUmakefile.preinset
--- ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.preinset	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/apps/gperf/tests/GNUmakefile.preinset	2012-06-29 12:40:08.000000000 -0400
@@ -97,6 +97,8 @@
 ifneq ($(CROSS-COMPILE),)
 all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install:
 	@echo This project will not build on CROSS-COMPILE platforms.
+install:
+	@echo This project will not install on CROSS-COMPILE platforms.
 else
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
diff -Naur ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.taoinset ACE_wrappers/apps/gperf/tests/GNUmakefile.taoinset
--- ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.taoinset	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/apps/gperf/tests/GNUmakefile.taoinset	2012-06-29 12:40:08.000000000 -0400
@@ -97,6 +97,8 @@
 ifneq ($(CROSS-COMPILE),)
 all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install:
 	@echo This project will not build on CROSS-COMPILE platforms.
+install:
+	@echo This project will not install on CROSS-COMPILE platforms.
 else
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
diff -Naur ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.tinset ACE_wrappers/apps/gperf/tests/GNUmakefile.tinset
--- ACE_wrappers.orig/apps/gperf/tests/GNUmakefile.tinset	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/apps/gperf/tests/GNUmakefile.tinset	2012-06-29 12:40:08.000000000 -0400
@@ -97,6 +97,8 @@
 ifneq ($(CROSS-COMPILE),)
 all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install:
 	@echo This project will not build on CROSS-COMPILE platforms.
+install:
+	@echo This project will not install on CROSS-COMPILE platforms.
 else
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
diff -Naur ACE_wrappers.orig/include/makeinclude/platform_macros.GNU ACE_wrappers/include/makeinclude/platform_macros.GNU
--- ACE_wrappers.orig/include/makeinclude/platform_macros.GNU	1969-12-31 19:00:00.000000000 -0500
+++ ACE_wrappers/include/makeinclude/platform_macros.GNU	2012-06-29 12:40:08.000000000 -0400
@@ -0,0 +1,330 @@
+INSTALL_PREFIX = /usr
+ACE_PLATFORM_CONFIG ?= config-linux.h
+
+debug ?= 0
+optimize ?= 1
+threads ?= 1
+insure ?= 0
+
+LSB_RELEASE_ID := $(echo Distributor ID: Unknown)
+LSB_RELEASE_RELEASE := $(echo Release: Unknown)
+
+PLATFORM_XT_CPPFLAGS=
+PLATFORM_XT_LIBS=
+PLATFORM_XT_LDFLAGS=
+
+PLATFORM_FL_CPPFLAGS=
+PLATFORM_FL_LIBS=
+PLATFORM_FL_LDFLAGS=
+
+PLATFORM_X11_CPPFLAGS=
+PLATFORM_X11_LIBS=
+PLATFORM_X11_LDFLAGS=
+
+PLATFORM_GL_CPPFLAGS=
+PLATFORM_GL_LIBS    =
+PLATFORM_GL_LDFLAGS =
+
+PLATFORM_GTK_CPPFLAGS=
+PLATFORM_GTK_LIBS    =
+PLATFORM_GTK_LDFLAGS =
+
+PLATFORM_FOX_CPPFLAGS ?=
+PLATFORM_FOX_LIBS     ?=
+PLATFORM_FOX_LDFLAGS  ?=
+
+# NOTE: we only support wxWindows over GTK
+PLATFORM_WX_CPPFLAGS=
+PLATFORM_WX_LIBS    =
+PLATFORM_WX_LDFLAGS =
+
+PLATFORM_BOOST_CPPFLAGS ?=
+PLATFORM_BOOST_LDLAGS ?=
+PLATFORM_BOOST_UTF_LIBS ?=
+
+PLATFORM_TK_CPPFLAGS=
+PLATFORM_TK_LIBS=
+PLATFORM_TK_LDFLAGS=
+
+PLATFORM_TCL_CPPFLAGS=
+PLATFORM_TCL_LIBS=
+PLATFORM_TCL_LDFLAGS=
+
+PLATFORM_QT_CPPFLAGS ?=
+PLATFORM_QT_LIBS ?=
+PLATFORM_QT_LDFLAGS ?=
+
+nptl ?= 1
+ifeq ($(nptl),0)
+  CPPFLAGS += -DACE_LACKS_LINUX_NPTL
+endif
+
+ssl ?= 0
+ifeq ($(ssl),1)
+endif # ssl
+
+PIC      = -fPIC
+
+ifneq ($(CROSS_COMPILE),)
+  CROSS-COMPILE = 1
+  # Build using the cross-tools
+  CC  = ${CROSS_COMPILE}gcc
+  CXX = ${CROSS_COMPILE}g++
+  AR  = ${CROSS_COMPILE}ar
+  RANLIB  = ${CROSS_COMPILE}ranlib
+  # Cross-linker requires this for linked in shared libs that depend
+  # themselves on other shared libs (not directly linked in)
+  LDFLAGS += -Wl,-rpath-link,$(ACE_ROOT)/lib
+  ifneq (,$(HOST_ROOT))
+    TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf
+    TAO_IDL = $(HOST_ROOT)/bin/tao_idl
+    TAO_IDL_DEP = $(TAO_IDL)
+    TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_idl2
+    TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
+    TAO_IDL3_TO_XMI = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_xmi
+    TAO_IDL3_TO_XMI_DEP = $(TAO_IDL3_TO_XMI)
+    # make sure to use the target compiler, not the cross-compiler
+    # as preprocessor for the cross-compiled idl tools
+    TAO_IDL_PREPROCESSOR = gcc
+  endif
+else
+  AR      ?= ar
+  ARFLAGS ?= rsuv
+  RANLIB   ?= ranlib
+
+  CC  ?= gcc
+  CXX ?= g++
+endif
+
+CXX_FOR_VERSION_TEST ?= $(CXX)
+
+CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version)
+CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion)
+
+# DT_RUNPATH is preferred over DT_RPATH, but the linker will only use it when
+# this extra flag option (enable-new-dtags) is present
+LD_RPATH_FLAGS += -Wl,--enable-new-dtags
+
+# Rely on _GNU_SOURCE to set these defaults defined in /usr/include/features.h
+# instead of setting them directly here (older versions of gcc don't set it
+# for you): _SVID_SOURCE _BSD_SOURCE _POSIX_SOURCE _POSIX_C_SOURCE=199506L, ...
+CPPFLAGS += -D_GNU_SOURCE
+
+DCFLAGS  += -ggdb
+DCCFLAGS += -ggdb
+DLD      = $(CXX)
+LD       = $(CXX)
+LIBS     += -ldl
+
+ifeq ($(threads),1)
+  FLAGS_C_CC += -pthread
+  SOFLAGS += -pthread
+  LIBS += -lrt
+endif
+
+ifeq ($(optimize),1)
+  SOFLAGS += -Wl,-O3
+endif
+
+SOFLAGS += -shared
+SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \
+          $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
+PRELIB  = @true
+
+ifneq ($(TCPU),)
+  ifeq ($(tunemodelflag),1)
+    FLAGS_C_CC += -mtune=$(TCPU)
+  endif
+
+  ifeq ($(cpumodelflag),1)
+    FLAGS_C_CC += -mcpu=$(TCPU)
+  endif
+
+  ifeq ($(archmodelflag),1)
+    FLAGS_C_CC += -march=$(TCPU)
+  endif
+endif
+
+ifeq ($(gprof),1)
+  FLAGS_C_CC += -pg
+  LDFLAGS += -pg
+endif
+
+ifeq ($(c++0x),1)
+  CCFLAGS += --std=c++0x
+endif
+
+ifeq ($(gcov),1)
+  FLAGS_C_CC += -fprofile-arcs -ftest-coverage
+endif
+
+CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion)
+CXX_MACHINE := $(shell $(CXX_FOR_VERSION_TEST) -dumpmachine)
+CXX_MAJOR_VERSION := $(firstword $(subst ., ,$(CXX_VERSION)))
+CXX_MINOR_VERSION := $(word 2,$(subst ., ,$(CXX_VERSION)))
+ifeq ($(findstring $(CXX_MAJOR_VERSION),1 2 3),$(CXX_MAJOR_VERSION))
+GXX_4_OR_BETTER := 0
+else
+GXX_4_OR_BETTER := 1
+endif
+
+# If no option has been specified, set templates to automatic
+# version of the compiler.
+#
+templates ?= automatic
+
+# The correct flags to pass to the linker for ELF dynamic shared library
+# versioning.
+# If the platform file didn't already set versioned_so, default to 1.
+versioned_so ?= 1
+with_ld ?=
+ifeq ($(versioned_so),1)
+  ifeq ($(with_ld),hpux)
+    SOFLAGS += -Wl,+h -Wl,$(SONAME)
+  else
+    ifeq ($(with_ld),aix)
+    # What to do here???
+    else
+      SOFLAGS += -Wl,-h -Wl,$(SONAME)
+    endif
+  endif
+endif
+
+shared_libs ?= 1
+static_libs_only ?=
+no_hidden_visibility ?= 1
+
+CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version)
+gcc_template_instantiation_visibility ?= 0
+
+# Only modify LDFLAGS if DLD has been set.
+ifneq ($(DLD),)
+  ifeq ($(DLD),$(CXX_FOR_VERSION_TEST)) # only try this is we are using ld through gcc
+    LD_FOR_VERSION_TEST = $(shell $(CXX_FOR_VERSION_TEST) -print-prog-name=ld)
+  else
+    LD_FOR_VERSION_TEST = $(DLD)
+  endif # DLD = CXX_FOR_VERSION_TEST
+  # The -E option is GNU ld specific
+  ifneq ($(mingw32),1)
+    GNU_LD := $(shell sh -c '$(LD_FOR_VERSION_TEST) -v 2>&1 | grep -c "GNU ld"')
+  else
+    GNU_LD := $(if $(findstring GNU ld,$(shell $(LD_FOR_VERSION_TEST) -v)), 1, 0)
+  endif # mingw32
+endif # DLD
+
+ifeq ($(GNU_LD),1)
+  STATIC_LINK_FLAG ?= -static
+endif # GNU_LD
+
+ifeq ($(no-optimize-sibling-calls), 1)
+  FLAGS_C_CC += -fno-optimize-sibling-calls
+endif
+
+ifeq ($(no_strict_aliasing), 1)
+  CCFLAGS += -fno-strict-aliasing
+else
+  ifneq ($(no_strict_aliasing), 0)
+    # if not explicitly disabled enable suppression of strict-aliasing checks by default
+    # for GCC >= 4.2; these checks and the resulting warnings are very controversial and
+    # popular opinion on the web seems to be that it brings little practical value and a
+    # lot of pain to attempt to solve code issues and the best way to deal is to suppress
+    ifeq ($(GXX_4_OR_BETTER), 1)
+      ifneq ($(findstring $(CXX_MAJOR_VERSION).$(CXX_MINOR_VERSION),4.1),$(CXX_MAJOR_VERSION).$(CXX_MINOR_VERSION))
+        CCFLAGS += -fno-strict-aliasing
+      endif
+    endif
+  endif
+endif
+
+ifeq ($(shared_libs), 1)
+  ifneq ($(static_libs_only), 1)
+    # Add all symbols to the dynamic symbol table.  Needed to enable
+    # dynamic_cast<> for shared libraries. (see
+    # http://gcc.gnu.org/faq.html#dso)
+
+    ifeq ($(GNU_LD),1)
+      # Make sure this version of ld supports the -E option.
+      ifneq ($(mingw32),1)
+        LD_EXPORT_DEFINED := $(shell sh -c '$(LD_FOR_VERSION_TEST) -E 2>&1 | egrep -i "(option|flag)" /dev/null; echo $$?')
+      else
+        LD_EXPORT_DEFINED := $(shell $(LD_FOR_VERSION_TEST) -E 2>&1 | grep -c -i -e '(option|flag)')
+	    ifeq ($(LD_EXPORT_DEFINED),0)
+	      LD_EXPORT_DEFINED:=1
+	    else
+	      LD_EXPORT_DEFINED:=0
+	    endif
+      endif # mingw32
+      ifeq ($(LD_EXPORT_DEFINED),1)
+        LDFLAGS += -Wl,-E
+      endif # LD_EXPORT_DEFINED = 1
+    endif # GNU ld
+
+    # Take advantage of G++ (>= 4.x) visibility attributes to generate
+    # improved shared library binaries.
+    ifeq ($(GXX_4_OR_BETTER), 1)
+      ifneq ($(no_hidden_visibility),1)
+        CCFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+        ifeq ($(gcc_template_instantiation_visibility),1)
+          CCFLAGS += -DACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS=1
+        endif # gcc_template_instantiation_visibility
+      else
+        CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
+      endif # no_hidden_visibility
+    endif # GXX_4_OR_BETTER == 1
+  else
+    # Explicitly disable G++ (>= 4.x) visibility attributes since
+    # they are only meant for use when building shared libraries.
+    ifeq ($(GXX_4_OR_BETTER), 1)
+      no_hidden_visibility = 1
+      CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
+    endif # GXX_4_OR_BETTER == 1
+  endif # static_libs_only
+else
+  # Explicitly disable G++ (>= 4.x) visibility attributes since
+  # they are only meant for use when building shared libraries.
+  ifeq ($(GXX_4_OR_BETTER), 1)
+    no_hidden_visibility = 1
+    CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
+  endif # GXX_4_OR_BETTER == 1
+endif # shared_libs
+
+minimaltoc ?= 0
+ifeq ($(minimaltoc),1)
+  FLAGS_C_CC += -mminimal-toc
+endif
+
+pipes ?= 1
+
+FLAGS_C_CC += -Wall -W -Wpointer-arith
+
+# TAO with GCC 4.0.2 and -O3 seems to result in runtime issues, for example
+# the ForwardRequest PI test will fail. For GCC 4.0.2 we default to -O2
+ifeq ($(CXX_VERSION),4.0.2)
+  OCFLAGS ?= -O2
+  OCCFLAGS ?=-O2
+else
+  OCFLAGS ?= -O3
+  OCCFLAGS ?= -O3
+endif
+
+# Added line below to support "Executable Shared Object" files (as
+# needed by the service configurator).
+# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
+ifeq ($(threads),1)
+    ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $<
+    ifndef PRELIB
+       PRELIB = @true
+    endif # ! PRELIB
+endif
+
+#### GNU gas has a string limit of 4096 characters.  On Alphas,
+#### builds will fail due to running over that limit.  There are
+#### at least two workarounds:
+#### 1) Change the limit to 8192 characters and rebuild gas.  See
+####    ACE-INSTALL.html for more information.
+#### 2) Don't use -g when compiling those files.
+#### If you're building on an Alpha and you haven't hacked and
+#### rebuilt gas, you might need to uncomment the following.
+#### ifeq ($(debug),1)
+####   SUPPRESS_DASH_G = 1
+#### endif # debug