diff --git a/configure.ac.ltv2 b/configure.ac.ltv2
index b3ddd7be3..014d9496f 100644
--- a/configure.ac.ltv2
+++ b/configure.ac.ltv2
@@ -187,6 +187,11 @@ darwin* | rhapsody*)
   # TODO: check the compiler actually does support these options
   CFLAGS="${CFLAGS} -no-cpp-precomp"
   CXXFLAGS="${CXXFLAGS} -no-cpp-precomp"
+  # Tell the OS X linker to allocate enough space inside the
+  # libhamlib.X.dylib shared object for install_name_tool(1) to
+  # work. This is useful when including hamlib in an app bundle.
+  OSXLDFLAGS="-Wl,-headerpad_max_install_names"
+  AC_SUBST([OSXLDFLAGS])
   ;;
 mingw* | pw32* | cygwin*)
   WINLDFLAGS="-Wl,--output-def,libhamlib.def -Wl,--add-stdcall-alias"
@@ -243,11 +248,9 @@ BINDING_LIB_TARGETS=""
 
 dnl Check if cxx-binding not wanted, default is to build it
 
-if test x"${CXX}" = x; then
-	cf_with_cxx=no
-else
-	cf_with_cxx=yes
-fi
+# TODO: check whether CXX is functional
+AC_CHECK_PROG(cf_with_cxx, "${CXX}", [yes], [no])
+
 AC_MSG_CHECKING(whether to build C++ binding and demo)
 AC_ARG_WITH(cxx-binding,
         [  --without-cxx-binding   do not build C++ binding and demo],
@@ -374,6 +377,7 @@ if test "${cf_with_cxx}" = "yes" ; then
 		[AC_DEFINE(HAVE_USRP,[1],[Define if usrp is available])])
   fi
 fi
+AM_CONDITIONAL(ENABLE_CXX, test x"${cf_with_cxx}" = "xyes")
 
 
 PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1, , 
@@ -496,6 +500,7 @@ easycomm/Makefile
 fodtrack/Makefile
 gs232a/Makefile
 heathkit/Makefile
+spid/Makefile
 sartek/Makefile
 rpcrig/Makefile
 rpcrot/Makefile
@@ -508,7 +513,6 @@ doc/Makefile
 doc/hamlib.cfg
 rotorez/Makefile
 flexradio/Makefile
-spid/Makefile
 hamlib.pc
 hamlib.spec]
 )