merge 428371 428435 440329
block 428371 by 445795
tags 428371 + patch
thanks
This patch is applied over the one in #445795 (which thus has to be applied
first).
---
configure.in | 12 +++---------
debian/control | 2 +-
debian/rules | 1 +
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/configure.in b/configure.in
index afcbc00..9403b30 100644
--- a/configure.in
+++ b/configure.in
@@ -96,15 +96,9 @@ CFLAGS=$lrintf_save_CFLAGS [EMAIL PROTECTED]@/intl [EMAIL
PROTECTED]@
if [ echo ${CFLAGS} | grep "\-march=" ]; then
AC_MSG_WARN([CFLAGS appears to allready contain architecture specifaction,
using exiting one])
else
- AC_MSG_WARN([Can't find architecture specifaction in CFLAGS, picking one
from build host CPU type])
- AC_MSG_WARN([May result in non-portable code])
- dnl For gcc use:
- MACHINE="-march=${build_cpu}"
- if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
- if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
- if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
-
- CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce
-funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
+ AC_MSG_WARN([Can't find architecture specifaction in CFLAGS])
+
+ CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce
-funroll-loops -ffast-math -fPIC -DPIC ${USE_SSE} ${DARWIN_CFLAGS}"
dnl For Intel's C compiler use:
dnl CC="icc"
diff --git a/debian/control b/debian/control
index 429f524..86774bd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: swh-plugins
Section: sound
Priority: optional
Maintainer: Anand Kumria <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), libtool, automake1.9, ladspa-sdk,
libfftw3-dev (>= 3.0.1-1), ed, pkg-config
+Build-Depends: debhelper (>> 4.0.0), libtool, automake1.9, ladspa-sdk,
libfftw3-dev (>= 3.0.1-1), ed, pkg-config, autoconf (>= 2.61-4)
Standards-Version: 3.7.2
Package: swh-plugins
diff --git a/debian/rules b/debian/rules
index 2f35af4..1a27898 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,7 @@ endif
config.status: configure
dh_testdir
# Add here commands to configure the package.
+ autoreconf -f -i
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
# okay, edit the metadata Makefile to work around some brokeness in
upstream
--
1.5.3.4
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
