diff --git a/checkin_notes b/checkin_notes
index b92c0f0dc4..e1dbc6b5d5 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4578,3 +4578,12 @@ David  26 June 2012
     m4/
         boinc_check_fcgi.m4
         libcurl.m4
+        
+
+David  26 June 2012
+    - Unix build: remove "if" around AC_PROG_OBJCXX;
+        apparently this is needed for Gentoo build.
+        You may need a recent automake for this to work.
+        Fixes #1193.
+
+    configure.ac
diff --git a/configure.ac b/configure.ac
index d9c8de4957..93c8f2f248 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,12 +38,7 @@ dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 AC_CANONICAL_HOST
-case $host_os in
-  darwin*)
-          AC_PROG_OBJCXX
-          ;;
-esac
-
+AC_PROG_OBJCXX
 AC_PROG_F77
 AC_PROG_CPP
 AC_PROG_MAKE_SET