--- opal-3.10.4/plugins/configure	2012-03-12 14:42:27.893741234 -0400
+++ opal-3.10.4/plugins/configure	2012-03-12 14:15:49.914988363 -0400
@@ -6968,10 +6968,9 @@
 
             LIBS="$LIBS -lgsm"
             if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+  opal_gsm=yes
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7002,7 +7001,7 @@
 $as_echo "$opal_gsm" >&6; }
 
             if test "x${opal_gsm}" = "xyes" ; then
-              GSM_CFLAGS="-I/usr/include/gsm -I/usr/local/include/gsm"
+              GSM_CFLAGS=""
               GSM_LIBS="-lgsm"
             fi
 
@@ -7075,10 +7074,9 @@
 
             LIBS="$LIBS -lgsm"
             if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+  opal_gsm=yes
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7109,7 +7107,7 @@
 $as_echo "$opal_gsm" >&6; }
 
             if test "x${opal_gsm}" = "xyes" ; then
-              GSM_CFLAGS="-I/usr/include/gsm -I/usr/local/include/gsm"
+              GSM_CFLAGS=""
               GSM_LIBS="-lgsm"
             fi
 
--- opal-3.10.4/plugins/plugin-inc.mak.in	2012-03-12 15:01:30.623737220 -0400
+++ opal-3.10.4/plugins/plugin-inc.mak.in	2012-03-12 15:01:37.143736268 -0400
@@ -30,7 +30,7 @@
 
 CC            := @CC@
 CXX           := @CXX@
-CFLAGS        += @CFLAGS@ -I@prefix@/include -I$(PLUGINDIR)/../include -I$(PLUGINDIR)
+CFLAGS        += @CFLAGS@ -I$(PLUGINDIR)/../include -I$(PLUGINDIR)
 LDFLAGS       += @LDFLAGS@ @LDSO@
 PLUGINEXT     :=@PLUGINEXT@
 
--- opal-3.10.4/plugins/audio/SILK/SILK_SDK/Makefile	2012-03-12 15:05:13.414987127 -0400
+++ opal-3.10.4/plugins/audio/SILK/SILK_SDK/Makefile	2012-03-12 15:04:29.514986320 -0400
@@ -16,10 +16,10 @@
 LIBSUFFIX = .a
 OBJSUFFIX = .o
 
-CC     = $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX)
-AR     = $(TOOLCHAIN_PREFIX)ar
-RANLIB = $(TOOLCHAIN_PREFIX)ranlib
-CP     = $(TOOLCHAIN_PREFIX)cp
+CC     ?= $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX)
+AR     ?= $(TOOLCHAIN_PREFIX)ar
+RANLIB ?= $(TOOLCHAIN_PREFIX)ranlib
+CP     ?= $(TOOLCHAIN_PREFIX)cp
 
 cflags-from-defines    = $(addprefix -D,$(1))
 cflags-from-includes   = $(addprefix -I,$(1))