diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2011-01-21 11:20:08 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2011-01-21 11:25:15 -0800 |
| commit | b6850bbdaeab5ce85d2414cfa9c8344fb6f91883 (patch) | |
| tree | a734ff207bf91945bc7157dba35829a11a7653a8 /volk/configure.ac | |
| parent | e3600f59e76c3dc08aedfd77629b7c5c48df86af (diff) | |
| parent | d429522b8cc0916c0dd8167284e9f7373f8c1663 (diff) | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into volk_rename
Conflicts:
volk/lib/Makefile.am
Diffstat (limited to 'volk/configure.ac')
| -rw-r--r-- | volk/configure.ac | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/volk/configure.ac b/volk/configure.ac index 5a1eac3f2f..ebbebb7d26 100644 --- a/volk/configure.ac +++ b/volk/configure.ac @@ -1,5 +1,5 @@ dnl -dnl Copyright 2010 Free Software Foundation, Inc. +dnl Copyright 2010,2011 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 @@ -63,13 +63,6 @@ dnl AX_BOOST_WSERIALIZATION AC_CONFIG_HEADERS([volk_config.h]) LV_SET_SIMD_FLAGS -# FIXME: Not very extensible to supporting more processors easily -AM_CONDITIONAL([MYCPU_X86], [test "$MD_CPU" = "x86"]) -AM_CONDITIONAL([MYSUBCPU_X86], [test "$MD_SUBCPU" = "x86"]) -AM_CONDITIONAL([MYSUBCPU_X86_64], [test "$MD_SUBCPU" = "x86_64"]) -AM_CONDITIONAL([MYSUBCPU_POWERPC], [test "$MD_SUBCPU" = "powerpc"]) -AM_CONDITIONAL([MYSUBCPU_GENERIC], [test "$MD_SUBCPU" != "powerpc" && test "$MD_SUBCPU" != "x86" && test "$MD_SUBCPU" != "x86_64"]) - AC_CONFIG_FILES([\ Makefile \ config/Makefile \ |