Regen patch and remove useless.

This commit is contained in:
ajacoutot 2012-09-06 13:30:12 +00:00
parent dbff291cac
commit 0dcf36737f
2 changed files with 5 additions and 50 deletions

View File

@ -1,14 +1,7 @@
$OpenBSD: patch-ext_Makefile_am,v 1.1.1.1 2012/09/06 13:01:31 ajacoutot Exp $
$OpenBSD: patch-ext_Makefile_am,v 1.2 2012/09/06 13:30:12 ajacoutot Exp $
--- ext/Makefile.am.orig Sat May 26 13:03:30 2012
+++ ext/Makefile.am Wed Sep 5 13:44:54 2012
@@ -70,13 +70,18 @@ else
PULSE_DIR =
endif
-
if USE_SHOUT2
SHOUT2_DIR = shout2
else
+++ ext/Makefile.am Thu Sep 6 15:29:06 2012
@@ -77,6 +77,12 @@ else
SHOUT2_DIR =
endif
@ -21,7 +14,7 @@ $OpenBSD: patch-ext_Makefile_am,v 1.1.1.1 2012/09/06 13:01:31 ajacoutot Exp $
if USE_SOUP
SOUP_DIR=soup
else
@@ -116,6 +121,7 @@ SUBDIRS = \
@@ -116,6 +122,7 @@ SUBDIRS = \
$(MIKMOD_DIR) \
$(PULSE_DIR) \
$(SHOUT2_DIR) \
@ -29,7 +22,7 @@ $OpenBSD: patch-ext_Makefile_am,v 1.1.1.1 2012/09/06 13:01:31 ajacoutot Exp $
$(SOUP_DIR) \
$(SPEEX_DIR) \
$(TAGLIB_DIR) \
@@ -134,6 +140,7 @@ DIST_SUBDIRS = \
@@ -134,6 +141,7 @@ DIST_SUBDIRS = \
pulse \
raw1394 \
shout2 \

View File

@ -1,38 +0,0 @@
$OpenBSD: patch-m4_aalib_m4,v 1.1.1.1 2012/09/06 13:01:31 ajacoutot Exp $
--- m4/aalib.m4.orig Wed Feb 11 17:44:05 2004
+++ m4/aalib.m4 Tue Jan 9 12:04:34 2007
@@ -29,6 +29,8 @@ AC_ARG_ENABLE(aalibtest,
[do not try to compile and run a test AALIB program]),
, enable_aalibtest=yes)
+ enable_aalibtest=no
+
if test x$aalib_exec_prefix != x ; then
aalib_args="$aalib_args --exec-prefix=$aalib_exec_prefix"
if test x${AALIB_CONFIG+set} != xset ; then
@@ -42,22 +44,12 @@ AC_ARG_ENABLE(aalibtest,
fi
fi
- AC_PATH_PROG(AALIB_CONFIG, aalib-config, no)
- min_aalib_version=ifelse([$1], ,0.11.0,$1)
- AC_MSG_CHECKING(for AALIB - version >= $min_aalib_version)
- no_aalib=""
- if test "$AALIB_CONFIG" = "no" ; then
+ if test x$aalib_prefix == x ; then
no_aalib=yes
else
- AALIB_CFLAGS=`$AALIB_CONFIG $aalibconf_args --cflags`
- AALIB_LIBS=`$AALIB_CONFIG $aalibconf_args --libs`
+ AALIB_CFLAGS="-I$aalib_prefix/include"
+ AALIB_LIBS="-L$aalib_prefix/lib -laa"
- aalib_major_version=`$AALIB_CONFIG $aalib_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- aalib_minor_version=`$AALIB_CONFIG $aalib_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- aalib_micro_version=`$AALIB_CONFIG $aalib_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_aalibtest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"