[svn-commits] branch group/autoconf_and_menuselect r21034 - /team/group/autoconf_and_menuse...

[svn-commits at lists.digium.com]

Author: russell
Date: Mon Apr 17 14:36:11 2006
New Revision: 21034

URL: http://svn.digium.com/view/asterisk?rev=21034&view=rev
Log:
let autoconf find dot instead of looking for it manually in the Makefile

Modified:
    team/group/autoconf_and_menuselect/Makefile
    team/group/autoconf_and_menuselect/configure.ac
    team/group/autoconf_and_menuselect/makeopts.in

Modified: team/group/autoconf_and_menuselect/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/Makefile?rev=21034&r1=21033&r2=21034&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/Makefile (original)
+++ team/group/autoconf_and_menuselect/Makefile Mon Apr 17 14:36:11 2006
@@ -418,7 +418,7 @@
 endif
 
 # This is used when generating the doxygen documentation
-ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),)
+ifneq ($(DOT),:)
   HAVEDOT=yes
 else
   HAVEDOT=no

Modified: team/group/autoconf_and_menuselect/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/configure.ac?rev=21034&r1=21033&r2=21034&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/configure.ac (original)
+++ team/group/autoconf_and_menuselect/configure.ac Mon Apr 17 14:36:11 2006
@@ -134,6 +134,7 @@
 AC_PATH_PROG([DIRNAME], [dirname], :)
 AC_PATH_PROG([SHELL], [sh], :)
 AC_PATH_PROG([LN], [ln], :)
+AC_PATH_PROG([DOT], [dot], :)
 
 AC_LANG(C)
 

Modified: team/group/autoconf_and_menuselect/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/makeopts.in?rev=21034&r1=21033&r2=21034&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/makeopts.in (original)
+++ team/group/autoconf_and_menuselect/makeopts.in Mon Apr 17 14:36:11 2006
@@ -13,6 +13,7 @@
 SHELL=@SHELL@
 LN=@LN@
 QTMOC=@QTMOC@
+DOT=@DOT@
 
 CROSS_ARCH=@PBX_OSTYPE@
 CROSS_PROC=@PBX_CPU@