[Commit-gnuradio] r10152 - gnuradio/branches/developers/eb/gcell-wip2/config

[eb]

Author: eb
Date: 2008-12-21 19:12:37 -0700 (Sun, 21 Dec 2008)
New Revision: 10152

Added:
   gnuradio/branches/developers/eb/gcell-wip2/config/gr_gcell.m4
Modified:
   gnuradio/branches/developers/eb/gcell-wip2/config/Makefile.am
   gnuradio/branches/developers/eb/gcell-wip2/config/gr_standalone.m4
   gnuradio/branches/developers/eb/gcell-wip2/config/pkg.m4
Log:
updated config macros

Modified: gnuradio/branches/developers/eb/gcell-wip2/config/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip2/config/Makefile.am       
2008-12-22 00:33:42 UTC (rev 10151)
+++ gnuradio/branches/developers/eb/gcell-wip2/config/Makefile.am       
2008-12-22 02:12:37 UTC (rev 10152)
@@ -79,6 +79,7 @@
        grc_gr_msdd6000.m4 \
        gr_doxygen.m4 \
        gr_fortran.m4 \
+       gr_gcell.m4 \
        gr_gprof.m4 \
        gr_lib64.m4 \
        gr_libgnuradio_core_extra_ldflags.m4 \

Added: gnuradio/branches/developers/eb/gcell-wip2/config/gr_gcell.m4
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip2/config/gr_gcell.m4               
                (rev 0)
+++ gnuradio/branches/developers/eb/gcell-wip2/config/gr_gcell.m4       
2008-12-22 02:12:37 UTC (rev 10152)
@@ -0,0 +1,36 @@
+#
+# Copyright 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 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+AC_DEFUN([GR_GCELL],[
+  passed=yes
+  PKG_CHECK_MODULES(GCELL, gcell >= 3.1, [],
+    [passed=no; AC_MSG_RESULT([gcell not found])])
+  PKG_CHECK_MODULES(GCELL_SPU, gcell_spu >= 3.1, [],
+    [passed=no; AC_MSG_RESULT([gcell_spu not found])])
+
+  GCELL_EMBEDSPU_LIBTOOL=
+  if test $passed = yes; then
+    GCELL_EMBEDSPU_LIBTOOL=`$PKG_CONFIG --variable=gcell_embedspu_libtool 
gcell 2>/dev/null`
+    AC_DEFINE(HAVE_GCELL,[1],[Define if you have gcell installed])
+  fi
+  AC_SUBST([GCELL_EMBEDSPU_LIBTOOL])
+
+  AM_CONDITIONAL([HAVE_GCELL], [test "$passed" = "yes"])
+])


Property changes on: 
gnuradio/branches/developers/eb/gcell-wip2/config/gr_gcell.m4
___________________________________________________________________
Name: svn:eol-style
   + LF

Modified: gnuradio/branches/developers/eb/gcell-wip2/config/gr_standalone.m4
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip2/config/gr_standalone.m4  
2008-12-22 00:33:42 UTC (rev 10151)
+++ gnuradio/branches/developers/eb/gcell-wip2/config/gr_standalone.m4  
2008-12-22 02:12:37 UTC (rev 10152)
@@ -70,6 +70,17 @@
   GR_NO_UNDEFINED      dnl do we need the -no-undefined linker flag
   GR_SCRIPTING         dnl Locate python, SWIG, etc
 
+  AC_ARG_WITH([python],
+    AC_HELP_STRING([--with-python], [Should we use python? [[default=yes]]]),
+    [case "$with_python" in
+      (no | yes) ;;
+      (*) AC_MSG_ERROR([Invalid argument ($with_python) to --with-python]) ;;
+     esac],
+    [with_python=yes])
+
+  AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes])
+
+
   dnl Set the c++ compiler that we use for the build system when cross 
compiling
   if test "x$CXX_FOR_BUILD" = x
   then
@@ -93,6 +104,13 @@
   AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
   AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
 
+  dnl Define where to look for cppunit includes and libs
+  dnl sets CPPUNIT_CFLAGS and CPPUNIT_LIBS
+  dnl Try using pkg-config first, then fall back to cppunit-config.
+  PKG_CHECK_EXISTS(cppunit,
+    [PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.9.14)],
+    [AM_PATH_CPPUNIT([1.9.14],[],
+                    [AC_MSG_ERROR([GNU Radio requires cppunit.  Stop])])])
+
   PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3)
-  LIBS="$LIBS $GNURADIO_CORE_LIBS"
 ])

Modified: gnuradio/branches/developers/eb/gcell-wip2/config/pkg.m4
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip2/config/pkg.m4    2008-12-22 
00:33:42 UTC (rev 10151)
+++ gnuradio/branches/developers/eb/gcell-wip2/config/pkg.m4    2008-12-22 
02:12:37 UTC (rev 10152)
@@ -111,8 +111,11 @@
 # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 #
 # --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_DEFUN([PKG_CHECK_MODULES],[
+AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_INCLUDEDIR], [includedir for $1, overriding pkg-config])dnl
@@ -124,7 +127,17 @@
 
 if test x$cross_compiling = xyes
 then
-  _PKG_CONFIG([$1][_LIBS], [libs-only-l --static], [$2])
+  dnl _PKG_CONFIG([$1][_LIBS], [libs-only-l --static], [$2])
+  _PKG_CONFIG([$1][_LIBS], [libs --static], [$2])
+  dnl prune out any -L/lib or -L/usr/lib since they're pointing to the wrong 
filesystem root
+  _pkg_tmp=
+  for flag in [$]pkg_cv_[$1][_LIBS]; do
+    case $flag in
+    (-L/lib* | -L/usr/lib* )      ;; # ignore
+    (*) _pkg_tmp="$_pkg_tmp $flag" ;;
+    esac
+  done
+  pkg_cv_[$1][_LIBS]="$_pkg_tmp"
 else
   _PKG_CONFIG([$1][_LIBS], [libs --static], [$2])
 fi