maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2742 knielsen@xxxxxxxxxxxxxxx	2009-09-30 [merge]
      Merge autotools fixes to be able to build with builddir != srcdir.
      Author: Peter Lieverdink
      modified:
        config/ac-macros/libevent.m4
        configure.in
        extra/libevent/Makefile.am

=== modified file 'config/ac-macros/libevent.m4'
--- a/config/ac-macros/libevent.m4	2009-03-12 22:27:35 +0000
+++ b/config/ac-macros/libevent.m4	2009-09-29 23:36:15 +0000
@@ -13,7 +13,7 @@ AC_DEFUN([MYSQL_USE_BUNDLED_LIBEVENT], [
   AC_SUBST([libevent_dir])
 
   libevent_libs="\$(top_builddir)/extra/libevent/libevent.a"
-  libevent_includes="-I\$(top_builddir)/extra/libevent"
+  libevent_includes="-I\$(top_srcdir)/extra/libevent"
   libevent_test_option="--mysqld=--thread-handling=pool-of-threads"
   AC_SUBST(libevent_libs)
   AC_SUBST(libevent_includes)

=== modified file 'configure.in'
--- a/configure.in	2009-09-15 11:55:37 +0000
+++ b/configure.in	2009-09-29 22:50:10 +0000
@@ -2697,7 +2697,7 @@ case $SYSTEM_TYPE in
     fi
 
     # if there is no readline, but we want to build with readline, we fail
-    if [test "$want_to_use_readline" = "yes"] && [test ! -d "./cmd-line-utils/readline"]
+    if [test "$want_to_use_readline" = "yes"] && [test ! -d "$srcdir/cmd-line-utils/readline"]
     then
 	AC_MSG_ERROR([This commercially licensed MySQL source package can't
 	      be built with libreadline. Please use --with-libedit to use

=== modified file 'extra/libevent/Makefile.am'
--- a/extra/libevent/Makefile.am	2009-03-12 22:27:35 +0000
+++ b/extra/libevent/Makefile.am	2009-09-29 23:00:57 +0000
@@ -22,7 +22,7 @@ include_HEADERS = event.h evutil.h event
 
 BUILT_SOURCES = event-config.h
 
-event-config.h: $(top_srcdir)/include/config.h
+event-config.h: $(top_builddir)/include/config.h
 	echo '/* event-config.h' > $@
 	echo ' * Generated by autoconf; post-processed by libevent.' >> $@
 	echo ' * Do not edit this file.' >> $@
@@ -33,7 +33,7 @@ event-config.h: $(top_srcdir)/include/co
 
 	sed -e 's/#define /#define _EVENT_/' \
 	    -e 's/#undef /#undef _EVENT_/' \
-	    -e 's/#ifndef /#ifndef _EVENT_/' < $(top_srcdir)/include/config.h >> $@
+	    -e 's/#ifndef /#ifndef _EVENT_/' < $(top_builddir)/include/config.h >> $@
 	echo "#endif" >> $@
 
 AM_CPPFLAGS = -Icompat -I$(top_srcdir)/include