[packages/opal] - updated to 3.10.9 - removed obsolete svn-revision patch - added sh patch (use POSIX-compatible sh

qboosh qboosh at pld-linux.org
Thu Jan 24 19:58:04 CET 2013


commit a7e6bfefe63fdae1f44c830b72ffa403377166ed
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jan 24 19:58:44 2013 +0100

    - updated to 3.10.9
    - removed obsolete svn-revision patch
    - added sh patch (use POSIX-compatible sh syntax)
    - added libilbc patch (support webrtc libilbc variant)
    - added ah patch (autoheader fixes)

 opal-3.10.8-svn-revision.patch |  11 ---
 opal-ah.patch                  |  27 ++++++
 opal-libilbc.patch             |  70 +++++++++++++++
 opal-sh.patch                  | 188 +++++++++++++++++++++++++++++++++++++++++
 opal.spec                      |  97 +++++++++++++--------
 5 files changed, 345 insertions(+), 48 deletions(-)
---
diff --git a/opal.spec b/opal.spec
index 740fd4e..3e922e4 100644
--- a/opal.spec
+++ b/opal.spec
@@ -1,17 +1,24 @@
 # TODO:
+#	SBC plugin is missing bluez_sbc subdir
 #	fix static libname (libopal_s.a)
 #	IPv6 support requires IPv6 support in ptlib
 #	x264+ffmpeg detection sucks - it doesn't work with --as-needed
 #       SpanDSP FAX support requires t38_indicator symbol
 #	MPEG4 rate control correction requires libavcodec sources
 #       CAPI support
+#	VPB support (--enable-libvpb, needs exceptions enabled in ptlib, BR: libvpb)
 #
 # WARNING: opal version should match Ekiga and ptlib versions
 #      Recommendations: http://wiki.ekiga.org/index.php/Download_Ekiga_sources
 #
 # Conditional build:
 %bcond_with	sip_fax_only	# Minimal build for t38modem + SIP
-%bcond_without	celt		# Build with CELT codec support
+%bcond_without	celt		# CELT codec support
+%bcond_with	srtp		# SRTP protocol support (mutually exclusive with zrtp)
+%bcond_with	zrtp		# ZRTP protocol support [TODO: libzrtp[3]]
+%bcond_with	capi		# CAPI [TODO: libcapi20, capi20.h]
+%bcond_with	java		# Java JNI support
+%bcond_with	ruby		# Ruby support
 #
 # Don't touch this! strip removes all symbols from library
 %define		no_install_post_strip		1
@@ -19,34 +26,42 @@
 Summary:	Open Phone Abstraction Library (aka OpenH323 v2)
 Summary(pl.UTF-8):	Biblioteka Open Phone Abstraction Library (aka OpenH323 v2)
 Name:		opal
-Version:	3.10.8
-Release:	3
-License:	MPL
+Version:	3.10.9
+Release:	1
+License:	MPL v1.0
 Group:		Libraries
-URL:		http://www.opalvoip.org
 Source0:	http://downloads.sourceforge.net/opalvoip/%{name}-%{version}.tar.bz2
-# Source0-md5:	b4907073e00889a9e7c6c49d41e4e2d4
+# Source0-md5:	f5dee986b7ae0d840bcc502785ea5bd7
 Patch0:		%{name}-build.patch
-Patch1:		%{name}-3.10.8-svn-revision.patch
-Patch2:		%{name}-ffmpeg10.patch
-BuildRequires:	autoconf
+Patch1:		%{name}-ffmpeg10.patch
+Patch2:		%{name}-sh.patch
+Patch3:		%{name}-libilbc.patch
+Patch4:		%{name}-ah.patch
+URL:		http://www.opalvoip.org/
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 %{?with_celt:BuildRequires:	celt-devel}
 BuildRequires:	expat-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
-BuildRequires:	ptlib-devel >= 1:2.10.8
+BuildRequires:	ptlib-devel >= 1:2.10.9
 BuildRequires:	sed >= 4.0
-%{?with_celt:Requires:	celt}
 %if %{without sip_fax_only}
 BuildRequires:	SDL-devel
+# libavcodec >= 51.11.0 libavutil
 BuildRequires:	ffmpeg-devel
+%{?with_java:BuildRequires:	jdk}
 BuildRequires:	libgsm-devel
 BuildRequires:	libtheora-devel
-BuildRequires:	libx264-devel
+# ABI 0.102
+BuildRequires:	libx264-devel >= 0.1.3-1.20101031_2245.1
 BuildRequires:	webrtc-libilbc-devel
 BuildRequires:	openssl-devel
-BuildRequires:	speex-devel >= 1:1.1.5
+%{?with_ruby:BuildRequires:	ruby-devel}
+# with speexdsp
+BuildRequires:	speex-devel >= 1:1.2
+BuildRequires:	spandsp-devel
+BuildRequires:	swig
 BuildRequires:	unixODBC-devel
 %endif
 %requires_eq	ptlib
@@ -72,7 +87,7 @@ Summary(pl.UTF-8):	Pliki dla developerów Opal
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	libstdc++-devel
-Requires:	ptlib-devel
+Requires:	ptlib-devel >= 1:2.10.9
 
 %description devel
 Header files and libraries for developing applications that use OPAL.
@@ -98,6 +113,8 @@ Biblioteki statyczne OPAL.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 PWLIBDIR=%{_prefix}; export PWLIBDIR
@@ -105,43 +122,47 @@ OPALDIR=`pwd`; export OPALDIR
 OPAL_BUILD="yes"; export OPAL_BUILD
 %{__aclocal}
 %{__autoconf}
+# don't run autoheader here, include/opal/buildopts.h.in is manually written
 cd plugins
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 cd ..
 # Run  grep '^OPAL_.*=' configure.ac|grep 'yes\|no'  to check current defaults
 %configure \
 %if %{with sip_fax_only}
-	--enable-sip \
-	--enable-t38 \
-	--enable-fax \
-	--enable-statistics \
-	--disable-java \
-	--disable-video \
-	--disable-h323 \
-	--disable-iax \
+	--disable-aec \
+	--disable-g711plc \
 	--disable-h224 \
 	--disable-h281 \
-	--disable-sipim \
-	--disable-rfc4103 \
+	--disable-h323 \
 	--disable-h450 \
 	--disable-h460 \
 	--disable-h501 \
-	--disable-lid \
+	--disable-iax \
 	--disable-ivr \
-	--disable-rfc4175 \
-	--disable-aec \
-	--disable-g711plc \
+	--disable-java \
+	--disable-lid \
 	--disable-plugins
+	--disable-rfc4103 \
+	--disable-rfc4175 \
+	--disable-sipim \
+	--disable-video \
 %else
-%{!?with_celt:--disable-celt} \
-	--enable-ixj
+	%{?with_capi:--enable-capi} \
+	%{!?with_celt:--disable-celt} \
+	--enable-ixj \
+	%{?with_java:--enable-java} \
+	%{?with_ruby:--enable-ruby} \
+	%{?with_srtp:--enable-srtp} \
+	%{?with_zrtp:--enable-zrtp}
 %endif
 
 %{__make} %{?debug:debug}%{!?debug:opt} \
 	CC="%{__cc}" \
 	CPLUS="%{__cxx}" \
-	OPTCCFLAGS="%{rpmcflags} %{!?debug:-DNDEBUG}"
+	OPTCCFLAGS="%{rpmcflags} %{!?debug:-DNDEBUG}" \
+	VERBOSE=1
 
 %{__cp} -a */libopal* .
 %if %{without sip_fax_only}
@@ -179,14 +200,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libopal.so.%{version}
 %if %{without sip_fax_only}
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/simpleopal
 %dir %{_libdir}/opal-%{version}
 %dir %{_libdir}/opal-%{version}/codecs
 %dir %{_libdir}/opal-%{version}/codecs/audio
-%dir %{_libdir}/opal-%{version}/codecs/video
-%dir %{_libdir}/opal-%{version}/lid
 %{?with_celt:%attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/celt_ptplugin.so}
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/g722_ptplugin.so
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/g7221_ptplugin.so
@@ -199,22 +218,26 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/lpc10_ptplugin.so
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/silk_ptplugin.so
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/audio/speex_ptplugin.so
+%dir %{_libdir}/opal-%{version}/codecs/video
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h261_vic_ptplugin.so
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h263_ffmpeg_ptplugin.so
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h264_video_pwplugin_helper
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/h264_x264_ptplugin.so
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/mpeg4_ffmpeg_ptplugin.so
 %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/theora_ptplugin.so
+%dir %{_libdir}/opal-%{version}/fax
+%attr(755,root,root) %{_libdir}/opal-%{version}/fax/spandsp_ptplugin.so
+%dir %{_libdir}/opal-%{version}/lid
 %attr(755,root,root) %{_libdir}/opal-%{version}/lid/ixj_lid_pwplugin.so
 #%attr(755,root,root) %{_libdir}/opal-%{version}/lid/vpb_lid_pwplugin.so
 %endif
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
+%attr(755,root,root) %{_libdir}/libopal.so
 %{_includedir}/opal
 %{_pkgconfigdir}/opal.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libopal_s.a
diff --git a/opal-3.10.8-svn-revision.patch b/opal-3.10.8-svn-revision.patch
deleted file mode 100644
index 3249ca9..0000000
--- a/opal-3.10.8-svn-revision.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- opal-3.10.8/revision.h.in~	2012-10-05 08:20:38.000000000 +0200
-+++ opal-3.10.8/revision.h.in	2012-10-16 22:21:39.989092374 +0200
-@@ -22,7 +22,7 @@
-  *
-  * Contributor(s): ______________________________________.
-  *
-- * $Revision$
-+ * $Revision: 28475
-  */
- 
- #ifndef _OPAL_REVISION_H
diff --git a/opal-ah.patch b/opal-ah.patch
new file mode 100644
index 0000000..ecb229d
--- /dev/null
+++ b/opal-ah.patch
@@ -0,0 +1,27 @@
+--- opal-3.10.9/plugins/configure.ac.orig	2013-01-24 15:50:58.908808589 +0100
++++ opal-3.10.9/plugins/configure.ac	2013-01-24 16:05:12.328790801 +0100
+@@ -517,11 +517,11 @@
+         ],
+         [
+           AC_MSG_RESULT(yes);
+-          AC_DEFINE([AV_PICTURE_TYPE_NONE], [(AVPictureType)0])
++          AC_DEFINE([AV_PICTURE_TYPE_NONE], [(AVPictureType)0], [Compatibilty with various versions of the libavcodec library])
+         ],
+         [
+           AC_MSG_RESULT(no)
+-          AC_DEFINE([AV_PICTURE_TYPE_NONE], [0])
++          AC_DEFINE([AV_PICTURE_TYPE_NONE], [0], [Compatibilty with various versions of the libavcodec library])
+         ]
+       )
+     ]
+--- opal-3.10.9/configure.ac.orig	2012-11-26 11:49:22.000000000 +0100
++++ opal-3.10.9/configure.ac	2013-01-24 16:06:31.778789145 +0100
+@@ -400,7 +400,7 @@
+ if test "x$OPAL_CAPI" = "xyes" ; then
+   AC_CHECK_HEADERS([capi20.h], [OPAL_CAPI=yes], [OPAL_CAPI=no])
+   if test "x$OPAL_CAPI" = "xyes" ; then
+-    AC_DEFINE([OPAL_CAPI], [1])
++    AC_DEFINE([OPAL_CAPI], [1], [CAPI support])
+     OPAL_ADD_CFLAGS_LIBS([], [-lcapi20])
+   fi
+ fi
diff --git a/opal-libilbc.patch b/opal-libilbc.patch
new file mode 100644
index 0000000..8dd670f
--- /dev/null
+++ b/opal-libilbc.patch
@@ -0,0 +1,70 @@
+--- opal-3.10.9/opal.m4.orig	2012-11-26 11:49:22.000000000 +0100
++++ opal-3.10.9/opal.m4	2013-01-24 14:11:21.415599845 +0100
+@@ -969,11 +969,11 @@
+ 
+           saved_LIBS="$LIBS"
+           LIBS="$LIBS -lilbc"
+-          AC_CHECK_LIB(ilbc, iLBC_encode, [has_ilbc=yes], [has_ilbc=no])
++          AC_CHECK_LIB(ilbc, iLBC_encode, [has_ilbc=yes], [AC_CHECK_LIB(ilbc, WebRtcIlbcfix_EncodeImpl, [has_ilbc=yes], [has_ilbc=no])])
+           LIBS=$saved_LIBS
+ 
+           if test "x${has_ilbc}" = "xyes"; then
+-              AC_CHECK_HEADERS([ilbc/iLBC_decode.h ilbc/iLBC_define.h ilbc/iLBC_encode.h], [has_ilbc=yes], [has_ilbc=no])
++              AC_CHECK_HEADERS([ilbc.h], [has_ilbc=yes], [AC_CHECK_HEADERS([ilbc/iLBC_decode.h ilbc/iLBC_define.h ilbc/iLBC_encode.h], [has_ilbc=yes], [has_ilbc=no])])
+           fi
+ 
+ 					if test "x${has_ilbc}" = "xyes"; then
+--- opal-3.10.9/plugins/audio/iLBC/ilbccodec.c.orig	2012-11-26 11:48:21.000000000 +0100
++++ opal-3.10.9/plugins/audio/iLBC/ilbccodec.c	2013-01-24 16:11:10.948783326 +0100
+@@ -37,9 +37,24 @@
+ 
+ #include <codec/opalplugin.h>
+ 
++#if defined(HAVE_ILBC_ILBC_DECODE_H) && defined(HAVE_ILBC_ILBC_ENCODE_H) && defined(HAVE_ILBC_ILBC_DEFINE_H)
++#include <ilbc/iLBC_encode.h> 
++#include <ilbc/iLBC_decode.h> 
++#include <ilbc/iLBC_define.h> 
++#define ILBC_SAMPLE_TYPE float
++#elif defined(HAVE_ILBC_H)
++#include <ilbc.h>
++#define ILBC_SAMPLE_TYPE WebRtc_Word16
++#define NO_OF_BYTES_20MS 38
++#define NO_OF_BYTES_30MS 50
++#define MIN_SAMPLE -32768
++#define MAX_SAMPLE 32767
++#else
++#define ILBC_SAMPLE_TYPE float
+ #include "iLBC/iLBC_encode.h" 
+ #include "iLBC/iLBC_decode.h" 
+ #include "iLBC/iLBC_define.h" 
++#endif
+ 
+ #define	BITRATE_30MS	NO_OF_BYTES_30MS*8*8000/BLOCKL_30MS
+ #define	BITRATE_20MS	NO_OF_BYTES_20MS*8*8000/BLOCKL_20MS
+@@ -91,7 +91,7 @@
+                                        unsigned * toLen,
+                                    unsigned int * flag)
+ {
+-  float block[BLOCKL_MAX];
++  ILBC_SAMPLE_TYPE block[BLOCKL_MAX];
+   int i;
+ 
+   struct iLBC_Enc_Inst_t_ * encoder = (struct iLBC_Enc_Inst_t_ *)context;
+@@ -102,7 +102,7 @@
+ 
+   /* convert signal to float */
+   for (i = 0; i < encoder->blockl; i++)
+-    block[i] = (float)sampleBuffer[i];
++    block[i] = (ILBC_SAMPLE_TYPE)sampleBuffer[i];
+ 
+   /* do the actual encoding */
+   iLBC_encode(to, block, encoder);
+@@ -124,7 +124,7 @@
+                                    unsigned int * flag)
+ {
+   int i;
+-  float block[BLOCKL_MAX];
++  ILBC_SAMPLE_TYPE block[BLOCKL_MAX];
+ 
+   struct iLBC_Dec_Inst_t_ * decoder = (struct iLBC_Dec_Inst_t_ *)context;
+   short * sampleBuffer = (short *)to;
diff --git a/opal-sh.patch b/opal-sh.patch
new file mode 100644
index 0000000..cf3f379
--- /dev/null
+++ b/opal-sh.patch
@@ -0,0 +1,188 @@
+--- opal-3.10.9/plugins/configure.ac.orig	2012-11-26 11:48:31.000000000 +0100
++++ opal-3.10.9/plugins/configure.ac	2013-01-20 17:38:22.322544339 +0100
+@@ -158,7 +158,7 @@
+ fi
+ if test "x${HAVE_GSM0610}" = "xyes" ; then
+   AC_CONFIG_FILES(audio/GSM0610/Makefile)
+-  SUBDIRS+=" audio/GSM0610"
++  SUBDIRS="$SUBDIRS audio/GSM0610"
+ 
+   AC_ARG_ENABLE([localgsm],
+                 [AC_HELP_STRING([--enable-localgsm],[Force use local version of GSM library rather than system version])],
+@@ -208,7 +208,7 @@
+ fi
+ if test "x${HAVE_GSMAMR}" = "xyes" ; then
+   AC_CONFIG_FILES(audio/gsm-amr/Makefile)
+-  SUBDIRS+=" audio/gsm-amr"
++  SUBDIRS="$SUBDIRS audio/gsm-amr"
+ fi
+ 
+ dnl #########
+@@ -223,7 +223,7 @@
+ fi
+ if test "x${HAVE_iLBC}" = "xyes" ; then
+   AC_CONFIG_FILES(audio/iLBC/Makefile)
+-  SUBDIRS+=" audio/iLBC"
++  SUBDIRS="$SUBDIRS audio/iLBC"
+ 
+   OPAL_DETERMINE_ILBC()
+   AC_SUBST(ILBC_SYSTEM)
+@@ -244,7 +244,7 @@
+ if test "x${HAVE_SPEEX}" = "xyes" ; then
+   AC_OUTPUT(audio/Speex/libspeex/speex_config_types.h)
+   AC_CONFIG_FILES(audio/Speex/Makefile)
+-  SUBDIRS+=" audio/Speex"
++  SUBDIRS="$SUBDIRS audio/Speex"
+ 
+   OPAL_SPEEX_TYPES()
+   AC_SUBST(SIZE16)
+@@ -267,7 +267,7 @@
+ fi
+ if test "x${HAVE_G722}" = "xyes" ; then
+   AC_CONFIG_FILES(audio/G722/Makefile)
+-  SUBDIRS+=" audio/G722"
++  SUBDIRS="$SUBDIRS audio/G722"
+ fi
+ 
+ dnl #########
+@@ -282,7 +282,7 @@
+ fi
+ if test "x${HAVE_G7221}" = "xyes" ; then
+   AC_CONFIG_FILES(audio/G.722.1/Makefile)
+-  SUBDIRS+=" audio/G.722.1"
++  SUBDIRS="$SUBDIRS audio/G.722.1"
+ fi
+ 
+ dnl #########
+@@ -297,7 +297,7 @@
+ fi
+ if test "x${HAVE_G7222}" = "xyes" ; then
+   AC_CONFIG_FILES(audio/G.722.2/Makefile)
+-  SUBDIRS+=" audio/G.722.2"
++  SUBDIRS="$SUBDIRS audio/G.722.2"
+ fi
+ 
+ dnl #########
+@@ -312,7 +312,7 @@
+ fi
+ if test "x${HAVE_G726}" = "xyes" ; then
+   AC_CONFIG_FILES(audio/G726/Makefile)
+-  SUBDIRS+=" audio/G726"
++  SUBDIRS="$SUBDIRS audio/G726"
+ fi
+ 
+ dnl #########
+@@ -327,7 +327,7 @@
+ fi
+ if test "x${HAVE_LPC10}" = "xyes" ; then
+   AC_CONFIG_FILES(audio/LPC_10/Makefile)
+-  SUBDIRS+=" audio/LPC_10"
++  SUBDIRS="$SUBDIRS audio/LPC_10"
+ fi
+ 
+ dnl #########
+@@ -342,7 +342,7 @@
+ fi
+ if test "x${HAVE_IMA_ADPCM}" = "xyes" ; then
+   AC_CONFIG_FILES(audio/IMA_ADPCM/Makefile)
+-  SUBDIRS+=" audio/IMA_ADPCM"
++  SUBDIRS="$SUBDIRS audio/IMA_ADPCM"
+ fi
+ 
+ dnl #########
+@@ -362,7 +362,7 @@
+ fi
+ if test "x${HAVE_SBC}" = "xyes" ; then
+   AC_CONFIG_FILES(audio/SBC/Makefile)
+-  SUBDIRS+=" audio/SBC"
++  SUBDIRS="$SUBDIRS audio/SBC"
+ fi
+ 
+ dnl #########
+@@ -388,7 +388,7 @@
+   CELT_CFLAGS="${CELT_CFLAGS} -DCELT_VERSION=\"`pkg-config --modversion celt | \
+                   sed -e "s/\./*10000+/" -e "s/\./*100+/"`\""
+   AC_CONFIG_FILES(audio/celt/Makefile)
+-  SUBDIRS+=" audio/celt"
++  SUBDIRS="$SUBDIRS audio/celt"
+ fi
+ 
+ dnl #########
+@@ -403,7 +403,7 @@
+ fi
+ if test "x${HAVE_SILK}" = "xyes" ; then
+   AC_CONFIG_FILES(audio/SILK/Makefile)
+-  SUBDIRS+=" audio/SILK"
++  SUBDIRS="$SUBDIRS audio/SILK"
+ fi
+ 
+ 
+@@ -421,7 +421,7 @@
+ fi
+ if test "x${HAVE_H261}" = "xyes" ; then
+   AC_CONFIG_FILES(video/H.261-vic/Makefile)
+-  SUBDIRS+=" video/H.261-vic"
++  SUBDIRS="$SUBDIRS video/H.261-vic"
+ fi
+ 
+ 
+@@ -534,12 +534,12 @@
+ 
+ if test "x${HAVE_LIBAVCODEC}" = "xyes"; then
+   AC_CONFIG_FILES(video/H.263-1998/Makefile)
+-  SUBDIRS+=" video/H.263-1998"
++  SUBDIRS="$SUBDIRS video/H.263-1998"
+ fi
+ 
+ if test "x${HAVE_LIBAVCODEC}" = "xyes"; then
+   AC_CONFIG_FILES(video/MPEG4-ffmpeg/Makefile)
+-  SUBDIRS+=" video/MPEG4-ffmpeg"
++  SUBDIRS="$SUBDIRS video/MPEG4-ffmpeg"
+ fi
+ 
+ 
+@@ -577,7 +577,7 @@
+                 [AC_HELP_STRING([--enable-x264-licensed],[enable commercially licensed x264 support])],
+                 [IS_H264_LICENSED=$enableval])
+ 
+-  SUBDIRS+=" video/H.264"
++  SUBDIRS="$SUBDIRS video/H.264"
+   AC_CONFIG_FILES(video/H.264/Makefile)
+   AC_CONFIG_FILES(video/H.264/gpl/Makefile)
+ fi
+@@ -605,7 +605,7 @@
+ fi
+ if test "x$HAVE_THEORA" = "xyes" ; then
+   AC_CONFIG_FILES(video/THEORA/Makefile)
+-  SUBDIRS+=" video/THEORA"
++  SUBDIRS="$SUBDIRS video/THEORA"
+ fi
+ 
+ 
+@@ -639,7 +639,7 @@
+ 
+ if test "x$HAVE_IXJ" = "xyes" ; then
+   AC_CONFIG_FILES(LID/IxJ/Makefile)
+-  SUBDIRS+=" LID/IxJ"
++  SUBDIRS="$SUBDIRS LID/IxJ"
+ fi
+ 
+ dnl     ########################
+@@ -650,7 +650,7 @@
+ fi
+ if test "x$HAVE_VPB" = "xyes" ; then
+   AC_CONFIG_FILES(LID/VPB/Makefile)
+-  SUBDIRS+=" LID/VPB"
++  SUBDIRS="$SUBDIRS LID/VPB"
+ fi
+ 
+ 
+@@ -675,7 +675,7 @@
+ 
+ if test "x$HAVE_SPANDSP" = "xyes" ; then
+   AC_CONFIG_FILES(fax/fax_spandsp/Makefile)
+-  SUBDIRS+=" fax/fax_spandsp"
++  SUBDIRS="$SUBDIRS fax/fax_spandsp"
+ fi
+ 
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/opal.git/commitdiff/a7e6bfefe63fdae1f44c830b72ffa403377166ed



More information about the pld-cvs-commit mailing list