[Commit-gnuradio] r8898 - in gnuradio/branches/developers/eb/sched-wip: . config

[eb]

Author: eb
Date: 2008-07-15 20:04:19 -0600 (Tue, 15 Jul 2008)
New Revision: 8898

Added:
   gnuradio/branches/developers/eb/sched-wip/config/gr_lib64.m4
Removed:
   gnuradio/branches/developers/eb/sched-wip/config/gr_x86_64.m4
Modified:
   gnuradio/branches/developers/eb/sched-wip/config/Makefile.am
   gnuradio/branches/developers/eb/sched-wip/configure.ac
Log:
Replaced gr_x86_64.m4 with gr_lib64.m4.  gr_lib64.m4 gives more reliable
answers, works on x86_64 and powerpc64, and also works when cross-compiling.


Modified: gnuradio/branches/developers/eb/sched-wip/config/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/Makefile.am        
2008-07-16 00:04:34 UTC (rev 8897)
+++ gnuradio/branches/developers/eb/sched-wip/config/Makefile.am        
2008-07-16 02:04:19 UTC (rev 8898)
@@ -79,6 +79,7 @@
        gr_doxygen.m4 \
        gr_fortran.m4 \
        gr_gprof.m4 \
+       gr_lib64.m4 \
        gr_libgnuradio_core_extra_ldflags.m4 \
        gr_no_undefined.m4 \
        gr_omnithread.m4 \
@@ -90,7 +91,6 @@
        gr_subversion.m4 \
        gr_swig.m4 \
        gr_sysv_shm.m4 \
-       gr_x86_64.m4 \
        lf_cc.m4 \
        lf_cxx.m4 \
        lf_warnings.m4 \

Copied: gnuradio/branches/developers/eb/sched-wip/config/gr_lib64.m4 (from rev 
8747, gnuradio/branches/developers/eb/sched-wip/config/gr_x86_64.m4)
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/gr_lib64.m4                
                (rev 0)
+++ gnuradio/branches/developers/eb/sched-wip/config/gr_lib64.m4        
2008-07-16 02:04:19 UTC (rev 8898)
@@ -0,0 +1,57 @@
+dnl
+dnl Copyright 2005,2008 Free Software Foundation, Inc.
+dnl 
+dnl This file is part of GNU Radio
+dnl 
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl 
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING.  If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+dnl 
+
+# GR_LIB64()
+#
+# Checks to see if we're on a x86_64 or powerpc64 machine, and if so, detemine
+# if libdir should end in "64" or not.
+# 
+# May append "64" to libdir.
+# Sets gr_libdir_suffix to "" or "64"
+#
+AC_DEFUN([GR_LIB64],[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_PROG_CXX])
+
+  # If we're using g++, extract the first SEARCH_DIR("...") entry from the 
linker script
+  # and see if it contains a suffix after the final .../lib part of the path.
+  # (This works because the linker script varies depending on whether we're 
generating
+  # 32-bit or 64-bit executables)
+
+  AC_MSG_CHECKING([libdir suffix])
+  if test "$ac_cv_cxx_compiler_gnu" = "yes";
+  then
+    gr_libdir_suffix=`$CXX -Wl,--verbose 2>/dev/null | sed -n -e 
'/SEARCH_DIR/{s/;.*$//; s,^.*/,,; s/".*$//; s/^lib//; p}'`
+  fi
+  AC_MSG_RESULT([$gr_libdir_suffix])
+  AC_SUBST(gr_libdir_suffix)
+
+  if test "$host_cpu" = "x86_64" || test "$host_cpu" = "powerpc64" ; then
+    AC_MSG_CHECKING([libdir for lib64 suffix])
+    t=${libdir##*/lib}
+    if test "$t" != 64 && test "$gr_libdir_suffix" = "64"; then
+      libdir=${libdir}64
+      AC_MSG_RESULT([no. Setting libdir to $libdir])
+    else
+      AC_MSG_RESULT([yes])
+    fi
+  fi
+])

Deleted: gnuradio/branches/developers/eb/sched-wip/config/gr_x86_64.m4

Modified: gnuradio/branches/developers/eb/sched-wip/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/configure.ac      2008-07-16 
00:04:34 UTC (rev 8897)
+++ gnuradio/branches/developers/eb/sched-wip/configure.ac      2008-07-16 
02:04:19 UTC (rev 8898)
@@ -29,7 +29,7 @@
 AM_INIT_AUTOMAKE(gnuradio,3.1svn)
 
 dnl add ${prefix}/lib/pkgconfig to the head of the PKG_CONFIG_PATH
-if test [x]${PKG_CONFIG_PATH} = x; then
+if test x${PKG_CONFIG_PATH} = x; then
     PKG_CONFIG_PATH=${prefix}/lib/pkgconfig
 else
     PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${PKG_CONFIG_PATH}
@@ -44,9 +44,9 @@
   user_set_cxxflags=yes
 fi
 
-GR_X86_64              dnl check for lib64 suffix
 LF_CONFIGURE_CC
 LF_CONFIGURE_CXX
+GR_LIB64               dnl check for lib64 suffix after choosing compilers
 
 dnl The three macros above are known to override CXXFLAGS if the user
 dnl didn't specify them.  Though I'm sure somebody thought this was