[svn-commits] seanbright: branch 1.6.0 r152994 - in /branches/1.6.0: ./ bootstrap.sh

[SVN commits to the Digium repositories]

Author: seanbright
Date: Thu Oct 30 16:00:13 2008
New Revision: 152994

URL: http://svn.digium.com/view/asterisk?view=rev&rev=152994
Log:
Merged revisions 152993 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r152993 | seanbright | 2008-10-30 16:59:17 -0400 (Thu, 30 Oct 2008) | 10 lines

Merged revisions 152992 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r152992 | seanbright | 2008-10-30 16:58:24 -0400 (Thu, 30 Oct 2008) | 2 lines

The -I argument to aclocal needs a space before the include directory name.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/bootstrap.sh

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

Modified: branches/1.6.0/bootstrap.sh
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/bootstrap.sh?view=diff&rev=152994&r1=152993&r2=152994
==============================================================================
--- branches/1.6.0/bootstrap.sh (original)
+++ branches/1.6.0/bootstrap.sh Thu Oct 30 16:00:13 2008
@@ -40,7 +40,7 @@
 
 echo "Generating the configure script ..."
 
-aclocal${MY_AM_VER} -Iautoconf
+aclocal${MY_AM_VER} -I autoconf
 autoconf${MY_AC_VER}
 autoheader${MY_AC_VER}
 automake${MY_AM_VER} --add-missing --copy 2>/dev/null