[asterisk-commits] branch group/autoconf_and_menuselect r20263 - in /team/group/autoconf_and_men...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sat Apr 15 00:40:07 2006
New Revision: 20263

URL: http://svn.digium.com/view/asterisk?rev=20263&view=rev
Log:
- add zlib to menuselect-deps.in
- list zlib as a dependency for pbx_dundi
- update pbx Makefile to use zlib info from autoconf

Modified:
    team/group/autoconf_and_menuselect/build_tools/menuselect-deps.in
    team/group/autoconf_and_menuselect/pbx/Makefile
    team/group/autoconf_and_menuselect/pbx/pbx_dundi.c

Modified: team/group/autoconf_and_menuselect/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/build_tools/menuselect-deps.in?rev=20263&r1=20262&r2=20263&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/build_tools/menuselect-deps.in (original)
+++ team/group/autoconf_and_menuselect/build_tools/menuselect-deps.in Sat Apr 15 00:40:07 2006
@@ -12,6 +12,7 @@
 LIBSPEEX=@PBX_LIBspeex@
 LIBVORBIS=@PBX_LIBvorbis@
 NBS=@PBX_LIBnbs@
+OGG=@PBX_LIBogg@
 OSSAUDIO=@PBX_LIBossaudio@
 PGSQL=@PBX_LIBpq@
 PTLIB=@PBX_LIBPWLIB@
@@ -20,6 +21,6 @@
 SSL=@PBX_LIBssl@
 UNIXODBC=@PBX_LIBodbc@
 VPBAPI=@PBX_LIBvpb@
+WIN32=@OSISWIN32@
+ZLIB=@PBX_LIBz@
 ZAPTEL=@PBX_LIBtonezone@
-OGG=@PBX_LIBogg@
-WIN32=@OSISWIN32@

Modified: team/group/autoconf_and_menuselect/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/pbx/Makefile?rev=20263&r1=20262&r2=20263&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/pbx/Makefile (original)
+++ team/group/autoconf_and_menuselect/pbx/Makefile Sat Apr 15 00:40:07 2006
@@ -53,7 +53,10 @@
 	$(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS)
 
 pbx_dundi.so: dundi-parser.o pbx_dundi.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB}
+	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o $(Z_LIB) ${CYGSOLIB}
+
+pbx_dundi.o: pbx_dundi.c
+	$(CC) -c -o $@ ${CFLAGS} $(Z_INCLUDE) $<
 
 %.moc : %.h
 	$(MOC) $< -o $@

Modified: team/group/autoconf_and_menuselect/pbx/pbx_dundi.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/pbx/pbx_dundi.c?rev=20263&r1=20262&r2=20263&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/pbx/pbx_dundi.c (original)
+++ team/group/autoconf_and_menuselect/pbx/pbx_dundi.c Sat Apr 15 00:40:07 2006
@@ -4720,3 +4720,7 @@
 }
 
 STD_MOD(MOD_1 | NO_USECOUNT | NO_UNLOAD, reload, NULL, NULL);
+
+/*** MODULEINFO
+	<depend>zlib</depend>
+ ***/