[asterisk-commits] tilghman: branch 1.6.1 r201784 - in /branches/1.6.1: ./ apps/Makefile

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Jun 18 15:54:10 2009
New Revision: 201784

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201784
Log:
Merged revisions 201783 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r201783 | tilghman | 2009-06-18 15:52:36 -0500 (Thu, 18 Jun 2009) | 6 lines
  
  One of the changes in 1.6.1 was to allow app_directory to use functionality
  within app_voicemail for directory functions.  It is therefore no longer
  necessary for app_directory to be linked against the ODBC libraries (and it
  never was necessary for app_directory to be linked against IMAP, though it
  was).
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/Makefile

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/Makefile?view=diff&rev=201784&r1=201783&r2=201784
==============================================================================
--- branches/1.6.1/apps/Makefile (original)
+++ branches/1.6.1/apps/Makefile Thu Jun 18 15:54:10 2009
@@ -18,11 +18,9 @@
 MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail)
 ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
   MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
-  MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
 endif
 ifneq ($(findstring IMAP_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
   MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_IMAP_STORAGE)
-  MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_IMAP_STORAGE)
 endif
 
 all: _all