[svn-commits] branch group/autoconf_and_menuselect r20786 - in /team/group/autoconf_and_men...

[svn-commits at lists.digium.com]

Author: russell
Date: Sun Apr 16 21:56:53 2006
New Revision: 20786

URL: http://svn.digium.com/view/asterisk?rev=20786&view=rev
Log:
configurify the build of format_ogg_vorbis

Modified:
    team/group/autoconf_and_menuselect/configure.ac
    team/group/autoconf_and_menuselect/formats/Makefile
    team/group/autoconf_and_menuselect/formats/format_ogg_vorbis.c

Modified: team/group/autoconf_and_menuselect/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/configure.ac?rev=20786&r1=20785&r2=20786&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/configure.ac (original)
+++ team/group/autoconf_and_menuselect/configure.ac Sun Apr 16 21:56:53 2006
@@ -147,7 +147,7 @@
 	esac])
 
 AST_EXT_LIB([ogg], [ogg_sync_init], [OGG], [OGG])
-AST_EXT_LIB([vorbis], [vorbis_info_init], [VORBIS], [Vorbis])
+AST_EXT_LIB([vorbis], [vorbis_info_init], [VORBIS], [Vorbis], [-lm -lvorbisenc])
 AST_EXT_LIB([asound], [snd_spcm_init], [ALSA], [Advanced Linux Sound Architecture], [-lm -ldl])
 AST_EXT_LIB([nbs], [nbs_setup], [NBS], [Network Broadcast Sound])
 AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [OSS], [Open Sound System])

Modified: team/group/autoconf_and_menuselect/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/formats/Makefile?rev=20786&r1=20785&r2=20786&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/formats/Makefile (original)
+++ team/group/autoconf_and_menuselect/formats/Makefile Sun Apr 16 21:56:53 2006
@@ -41,7 +41,10 @@
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lm
 
 format_ogg_vorbis.so : format_ogg_vorbis.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm
+	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(OGG_LIB) $(VORBIS_LIB)
+
+format_ogg_vorbis.o: format_ogg_vorbis.c
+	$(CC) -c -o $@ ${CFLAGS} $(OGG_INCLUDE) $(VORBIS_INCLUDE) $<
 
 install: all
 	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done

Modified: team/group/autoconf_and_menuselect/formats/format_ogg_vorbis.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/formats/format_ogg_vorbis.c?rev=20786&r1=20785&r2=20786&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/formats/format_ogg_vorbis.c (original)
+++ team/group/autoconf_and_menuselect/formats/format_ogg_vorbis.c Sun Apr 16 21:56:53 2006
@@ -563,5 +563,6 @@
 STD_MOD1;
 
 /*** MODULEINFO
-	<depend>oggvorbis</depend>
+	<depend>libvorbis</depend>
+	<depend>ogg</depend>
  ***/