[Commit-gnuradio] r11016 - in gnuradio/branches/developers/eb/t364: . config

[eb]

Author: eb
Date: 2009-05-12 17:16:52 -0600 (Tue, 12 May 2009)
New Revision: 11016

Modified:
   gnuradio/branches/developers/eb/t364/Makefile.common
   gnuradio/branches/developers/eb/t364/config/lf_warnings.m4
   gnuradio/branches/developers/eb/t364/configure.ac
Log:
work-in-progress: removed -Werror option.  Normal code no longer has
duplicate -O2 -g -O2 -g nor duplicate -pthread -pthread.  Swig code is
still borked.



Modified: gnuradio/branches/developers/eb/t364/Makefile.common
===================================================================
--- gnuradio/branches/developers/eb/t364/Makefile.common        2009-05-12 
21:23:57 UTC (rev 11015)
+++ gnuradio/branches/developers/eb/t364/Makefile.common        2009-05-12 
23:16:52 UTC (rev 11016)
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-AM_CXXFLAGS = @autoconf_default_CXXFLAGS@
+#AM_CXXFLAGS = @autoconf_default_CXXFLAGS@
 
 # includes
 grincludedir = $(includedir)/gnuradio

Modified: gnuradio/branches/developers/eb/t364/config/lf_warnings.m4
===================================================================
--- gnuradio/branches/developers/eb/t364/config/lf_warnings.m4  2009-05-12 
21:23:57 UTC (rev 11015)
+++ gnuradio/branches/developers/eb/t364/config/lf_warnings.m4  2009-05-12 
23:16:52 UTC (rev 11016)
@@ -1,4 +1,5 @@
 dnl Copyright (C) 1988 Eleftherios Gkioulekas <address@hidden>
+dnl Copyright (C) 2009 Free Software Foundation, Inc.
 dnl  
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -97,26 +98,15 @@
 ])
 
 # ----------------------------------------------------------------------
-# Enable compiler warnings.  Conditionally enable -Werror.
-# Call this command AFTER you have configured ALL your
-# compilers. 
+# Enable compiler warnings. 
+# Call this command AFTER you have configured ALL your compilers. 
 # ----------------------------------------------------------------------
 
 AC_DEFUN([LF_SET_WARNINGS],[
-  lf_warnings_as_errors=""
-  AC_ARG_ENABLE([warnings-as-errors],
-    AC_HELP_STRING([--enable-warnings-as-errors], [Treat compiler warnings as 
errors (no)]),
-    [case "$enableval" in 
-      (no) ;;
-      (yes) lf_warnings_as_errors="-Werror" ;;
-      (*) AC_MSG_ERROR([Invalid argument ($enableval) to 
--enable-warnings-as-errors]) ;;
-     esac],
-    [])
-     
   dnl Warnings for the two main compilers
   dnl add -Wextra when you're got time to fix a bunch of them ;-)
-  cc_warning_flags="-Wall -Werror-implicit-function-declaration 
$lf_warnings_as_errors"
-  cxx_warning_flags="-Wall -Woverloaded-virtual $lf_warnings_as_errors"
+  cc_warning_flags="-Wall -Werror-implicit-function-declaration"
+  cxx_warning_flags="-Wall -Woverloaded-virtual"
   if test -n "${CC}"
   then
     LF_CHECK_CC_FLAG($cc_warning_flags)

Modified: gnuradio/branches/developers/eb/t364/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/t364/configure.ac   2009-05-12 21:23:57 UTC 
(rev 11015)
+++ gnuradio/branches/developers/eb/t364/configure.ac   2009-05-12 23:16:52 UTC 
(rev 11016)
@@ -66,7 +66,6 @@
 AC_SUBST(autoconf_default_CXXFLAGS)
 AC_SUBST(swig_CXXFLAGS)
 
-
 dnl add ${prefix}/lib${gr_libdir_suffix}/pkgconfig to the head of the 
PKG_CONFIG_PATH
 if test x${PKG_CONFIG_PATH} = x; then
     PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig
@@ -75,7 +74,7 @@
 fi
 export PKG_CONFIG_PATH
 
-
+LF_SET_WARNINGS
 GR_SET_GPROF
 GR_SET_PROF
 AM_PROG_AS
@@ -114,8 +113,6 @@
 
 dnl check for omnithreads (will soon be removed)
 GR_OMNITHREAD
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
 
 dnl Set the c++ compiler that we use for the build system when cross compiling
 if test x$CXX_FOR_BUILD = x
@@ -344,11 +341,6 @@
 dnl run_tests.sh is created from run_tests.sh.in .  Make it executable.
 AC_CONFIG_COMMANDS([run_tests_build], [chmod +x run_tests.sh])
 
-dnl Enable warnings as the last thing before generating output, since
-dnl this may add -Werror to CFLAGS which can cause various configure
-dnl checks to fail.
-LF_SET_WARNINGS
-
 AC_OUTPUT
 
 echo