Merge pilot.blaudden:/home/msvensson/mysql/bug25337/my51-bug25337

into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

Merge pilot.blaudden:/home/msvensson/mysql/bug25337/my51-bug25337
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
f2501d2e · msvensson@pilot.blaudden · b436722b · 05277130 · f2501d2e
Commit f2501d2e authored Apr 04, 2007 by msvensson@pilot.blaudden
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

sql/Makefile.am sql/Makefile.am +1 -2

No files found.
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -21,8 +21,7 @@ MYSQLBASEdir=		$(prefix)
 MYSQLLIBdir=            $(pkglibdir)
 INCLUDES =		@ZLIB_INCLUDES@ \
 			-I$(top_builddir)/include -I$(top_srcdir)/include \
-			-I$(top_srcdir)/regex -I$(srcdir) \
+			-I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes)
-                        $(openssl_includes)
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld