Index: opal-3.5.1/configure.ac
===================================================================
--- opal-3.5.1/configure.ac	(revision 21846)
+++ opal-3.5.1/configure.ac	(working copy)
@@ -116,10 +116,10 @@
 OPAL_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${BUILD_NUMBER}"
 BUILD_TYPE=`cat ${OPALDIR}/version.h | grep BUILD_TYPE | cut -f 3 -d ' ' | sed 's/BetaCode/-beta/' | sed 's/AlphaCode/-alpha/' | sed 's/ReleaseCode/\./'`
 
-AC_DEFINE_UNQUOTED(OPAL_MAJOR,   ${MAJOR_VERSION})
-AC_DEFINE_UNQUOTED(OPAL_MINOR,   ${MINOR_VERSION})
-AC_DEFINE_UNQUOTED(OPAL_BUILD,   ${BUILD_NUMBER})
-AC_DEFINE_UNQUOTED(OPAL_VERSION, "$OPAL_VERSION")
+AC_DEFINE_UNQUOTED(OPAL_MAJOR,   [${MAJOR_VERSION}], [Major version])
+AC_DEFINE_UNQUOTED(OPAL_MINOR,   [${MINOR_VERSION}], [Minor version])
+AC_DEFINE_UNQUOTED(OPAL_BUILD,   [${BUILD_NUMBER}], [Build number])
+AC_DEFINE_UNQUOTED(OPAL_VERSION, ["$OPAL_VERSION"], [Opal version string])
 
 AC_MSG_NOTICE(Opal version is ${OPAL_VERSION});
 
@@ -516,6 +516,15 @@
 
 
 dnl ########################################################################
+dnl Special defines
+dnl ########################################################################
+
+if test "x${OPAL_HAS_SIPIM}" = "xyes" -o "x${OPAL_HAS_MSRP}" = "xyes" -o "x${OPAL_HAS_RFC4103}" = "xyes" ; then
+    AC_DEFINE(OPAL_HAS_IM, [1], [Enable IM support])
+fi
+
+
+dnl ########################################################################
 dnl Output make directives
 dnl ########################################################################
 
Index: opal-3.5.1/opal.m4
===================================================================
--- opal-3.5.1/opal.m4	(revision 21846)
+++ opal-3.5.1/opal.m4	(working copy)
@@ -712,7 +712,7 @@
             if test "x$SPEEXDSP_SYSTEM" = "xyes" ; then
               old_CFLAGS="$CFLAGS"
               CFLAGS="$CFLAGS $SPEEXDSP_CFLAGS"
-              AC_CHECK_HEADERS([speex/speex.h], [AC_DEFINE(OPAL_HAVE_SPEEX_SPEEX_H)])
+              AC_CHECK_HEADERS([speex/speex.h], [AC_DEFINE(OPAL_HAVE_SPEEX_SPEEX_H, [1], [speex/speex.h available])])
               CFLAGS="$old_CFLAGS"
             fi
           fi
Index: opal-3.5.1/plugins/configure.ac
===================================================================
--- opal-3.5.1/plugins/configure.ac	(revision 21846)
+++ opal-3.5.1/plugins/configure.ac	(working copy)
@@ -192,7 +193,7 @@
   AC_CHECK_LIB(samplerate,src_get_version,has_samplerate=yes,has_samplerate=no)
   if test "$has_samplerate" = "yes" ; then
     HAVE_SBC=yes
-    AC_DEFINE(HAVE_SBC, yes)
+    AC_DEFINE(HAVE_SBC, [1], [Enable SBC codec])
     AC_MSG_NOTICE(Enabling SBC codec)
   fi
 fi