bk commit into 5.0 tree (petr:1.1853)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.0 repository of cps. When cps does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1853 05/05/18 16:05:58 petr@stripped +1 -0
  fix for compilation problem with --with-openssl reported by Guilhem

  server-tools/instance-manager/Makefile.am
    1.24 05/05/18 16:05:53 petr@stripped +2 -1
    fix for compilation problem with --with-openssl

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/mysql-5.0

--- 1.23/server-tools/instance-manager/Makefile.am	2005-04-04 03:49:06 +04:00
+++ 1.24/server-tools/instance-manager/Makefile.am	2005-05-18 16:05:53 +04:00
@@ -14,7 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include
+INCLUDES= @ZLIB_INCLUDES@ -I$(top_srcdir)/include \
+	$(openssl_includes) -I$(top_builddir)/include
 
 DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER