diff options
author | Eric Blossom | 2010-12-21 13:31:58 -0800 |
---|---|---|
committer | Eric Blossom | 2010-12-21 13:31:58 -0800 |
commit | 75b650ef2506fe5c607517a3d5188b0705f60fde (patch) | |
tree | 99cb6fd6adc3e91edc832cbaee236d2fe30fa3fd /volk/config/lf_x11.m4 | |
parent | 1984aab345857296564e174395cf3af1375e1469 (diff) | |
parent | ed78ba5d9999bbe50507373a1aa2877ef0da64c6 (diff) | |
download | gnuradio-75b650ef2506fe5c607517a3d5188b0705f60fde.tar.gz gnuradio-75b650ef2506fe5c607517a3d5188b0705f60fde.tar.bz2 gnuradio-75b650ef2506fe5c607517a3d5188b0705f60fde.zip |
Merge branch 'next' into guile.
Passes distcheck.
* next: (32 commits)
volk: Fix for popcnt's 64/32-bit issues.
Using a copy of config.guess and config.sub instead of sym links.
Including time header to qa files.
Changed python env variable to more globally usable version.
gr_uhd: Quick fix for make distcheck failures if UHD is not installed.
PFB resampler: fix it this way to avoid the signed/unsigned warning.
PFB resampler: fixes bug where filter could be looking past the number of inputs.
resampler PFB: Sets relative rate when rate is changed.
Create method to set rate on pfb_arb_resamp after it has been created. Allow it to be called from GRC.
volk: fix for running 32-bit OS on 64-bit processor. System is correctly identified as 32-bit and compiles with the correct flags.
volk: changing the path variables again. This works on my various systems tested. Using abs_ path names failed on Ubuntu 8.04 32-bit.
volk: May be a hack, but it was required for my 32-bit Fedora 13 to work.
volk: Removing unnecessary shell script; last commit takes care if its functions.
volk: Fixing build system to handle making volk_mktables, volk_tables.h, and volk_config.h instead of a standalone shell script.
volk: readding 16sc_magnitude_32f_sse with fix for SSE hadd_ps error.
volk: Adding a few more generic-only test cases.
volk: adding generic QA test for 16sc_magnitude_32f.
volk: modified the configure scripts to output which architectures it will be building based on the configure tests.
uhd: update notes in grc blocks for addressing scheme
volk: Removing erroneous SSE function that actually usese an SSE3 intrin (mm_hadd_ps).
...
Diffstat (limited to 'volk/config/lf_x11.m4')
-rw-r--r-- | volk/config/lf_x11.m4 | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/volk/config/lf_x11.m4 b/volk/config/lf_x11.m4 new file mode 100644 index 000000000..460cd605f --- /dev/null +++ b/volk/config/lf_x11.m4 @@ -0,0 +1,39 @@ +dnl Copyright (C) 1988 Eleftherios Gkioulekas <lf@amath.washington.edu> +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 +dnl the Free Software Foundation; either version 3 of the License, or +dnl (at your option) any later version. +dnl +dnl This program 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 this program; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a configuration +dnl script generated by Autoconf, you may include it under the same +dnl distribution terms that you use for the rest of that program. + + +#----------------------------------------------------------------------- +# This macro searches for Xlib and when it finds it it adds the +# appropriate flags to CXXFLAGS and export the link sequence to +# the variable XLIB. +# In your configure.in file add: +# LF_PATH_XLIB +# In your Makefile.am add +# program_LDADD = .... $(XLIB) +#------------------------------------------------------------------------ + +AC_DEFUN([LF_PATH_XLIB],[ + AC_PATH_XTRA + CXXFLAGS="$CXXFLAGS $X_CFLAGS" + XLIB="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" + AC_SUBST(XLIB) +]) + |