Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / bootstrap

diff --git a/bootstrap b/bootstrap
index 7df375eeab49314418462328b5e7f363305f2336..463ff165b2c97c6b2c0b0129eda1b37c7d1a4ff2 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-# Copyright 2001,2005 Free Software Foundation, Inc.
+# Copyright 2001,2005,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # GNU Radio is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
 
 
 rm -fr config.cache autom4te*.cache
@@ -26,4 +26,8 @@ aclocal -I config
 autoconf
 autoheader
 libtoolize --automake
-automake --add-missing
+automake --add-missing -Wno-portability -Wno-override -Wnone
+#automake --add-missing -Wno-portability
+
+# Run bootstrap in any subprojects
+(cd usrp2/firmware ; ./bootstrap)