Merged r5033:5116 from developer branch jcorgan/snd, with minor edits. Trunk passes...

[debian/gnuradio] / configure.ac

diff --git a/configure.ac b/configure.ac
index d934c5c35afa546e9b0d38d7ff6cea69ac5d15c6..d718b367132ccfd21010b724ee1a8fff0e4f86f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,19 @@ if test "$user_set_cxxflags" != yes; then
   autoconf_default_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=""
   if test "$GXX" = yes; then
-    swig_CXXFLAGS="-g1 -O1"
+    case "$host_os" in
+       darwin*)
+       if test "$host_cpu" = i386; then
+          swig_CXXFLAGS="-g1 -O1"
+       else
+          # "-O1" breaks PPC-OSX for some reason
+          swig_CXXFLAGS="-g1 -O2"
+       fi      
+       ;;
+       *) 
+       swig_CXXFLAGS="-g1 -O1"
+       ;;
+    esac
   fi
 fi
 AC_SUBST(autoconf_default_CXXFLAGS)
@@ -196,17 +208,20 @@ GRC_GR_AUDIO_PORTAUDIO
 GRC_GR_AUDIO_WINDOWS
 GRC_GR_ATSC
 GRC_GR_COMEDI
+GRC_GR_CVSD_VOCODER
 GRC_GR_GSM_FR_VOCODER
 GRC_GR_PAGER
 GRC_GR_RADIO_ASTRONOMY
 GRC_GR_TRELLIS
 GRC_GR_VIDEO_SDL
+GRC_GR_QTGUI
 GRC_GR_WXGUI
 GRC_PMT
 GRC_MBLOCK                     dnl this must come after GRC_PMT
 GRC_EZDOP              
 GRC_GR_EZDOP                   dnl this must come after GRC_EZDOP
 GRC_GR_RDF
+GRC_GR_SOUNDER                 dnl this must come after GRC_USRP
 GRC_GNURADIO_EXAMPLES          dnl must come last
 
 # Each component is now either to be built, was skipped, or failed dependencies