Make it possible to pass libtool aclocal.

slapos/patch/xtrabackup_build.sh_with_prefix.patch

@@ -10,25 +10,40 @@ index dbb15d5..852a627 100644
 +	install -m 755 innobackupex-1.5.1 $(BIN_DIR)/innobackupex
  	install -m 755 xtrabackup_*  $(BIN_DIR)
 diff --git a/utils/build.sh b/utils/build.sh
-index 3f0cee7..ae0f35b 100755
+index 3f0cee7..c41dc89 100755
 --- a/utils/build.sh
 +++ b/utils/build.sh
-@@ -21,12 +21,13 @@ function usage()
+@@ -21,12 +21,14 @@ function usage()
  {
      echo "Build an xtrabackup binary against the specified InnoDB flavor."
      echo
 -    echo "Usage: `basename $0` CODEBASE"
-+    echo "Usage: `basename $0` CODEBASE PREFIX"
++    echo "Usage: `basename $0` CODEBASE PREFIX LIBTOOL_LOCATION"
      echo "where CODEBASE can be one of the following values or aliases:"
      echo "  innodb51_builtin | 5.1	build against built-in InnoDB in MySQL 5.1"
      echo "  innodb55         | 5.5	build against InnoDB in MySQL 5.5"
      echo "  xtradb51         | xtradb   build against Percona Server with XtraDB 5.1"
      echo "  xtradb55         | xtradb55 build against Percona Server with XtraDB 5.5"
 +    echo "where PREFIX is abolute path for install location"
++    echo "where LIBTOOL_LOCATION is abolute path of libtool"
      exit -1
  }
  
-@@ -92,9 +93,10 @@ function build_xtrabackup()
+@@ -79,7 +81,12 @@ function build_server()
+ {
+     echo "Configuring the server"
+     cd $server_dir
+-    BUILD/autorun.sh
++    libtoolize -c -f
++    aclocal -I $libtool_location/share/aclocal -I config/ac-macros
++    autoheader
++    automake -c -a -f
++    autoconf
++    touch sql/sql_yacc.yy
+     eval $configure_cmd
+ 
+     echo "Building the server"
+@@ -92,9 +99,10 @@ function build_xtrabackup()
      echo "Building XtraBackup"
      mkdir $build_dir
      cp $top_dir/Makefile $top_dir/xtrabackup.c $build_dir
@@ -40,7 +55,7 @@ index 3f0cee7..ae0f35b 100755
      cd $top_dir
  }
  
-@@ -103,11 +105,36 @@ function build_tar4ibd()
+@@ -103,11 +111,36 @@ function build_tar4ibd()
      echo "Building tar4ibd"
      unpack_and_patch libtar-1.2.11.tar.gz tar4ibd_libtar-1.2.11.patch
      cd libtar-1.2.11
@@ -78,7 +93,7 @@ index 3f0cee7..ae0f35b 100755
  ################################################################################
  # Do all steps to build the server, xtrabackup and tar4ibd
  # Expects the following variables to be set before calling:
-@@ -136,9 +163,15 @@ function build_all()
+@@ -136,9 +169,15 @@ function build_all()
  
      build_server
  
@@ -88,15 +103,15 @@ index 3f0cee7..ae0f35b 100755
 +    build_tar4ibd $1
 +
 +    install_server
++
++    install_xtrabackup $1
  
 -    build_tar4ibd
-+    install_xtrabackup $1
-+
 +    install_tar4ibd
  }
  
  if ! test -f xtrabackup.c
-@@ -148,6 +181,10 @@ then
+@@ -148,6 +187,15 @@ then
  fi
  
  type=$1
@@ -104,10 +119,15 @@ index 3f0cee7..ae0f35b 100755
 +if [ "x$prefix" == "x" ] ; then
 +  usage
 +fi
++libtool_location=$3
++if [ "x$libtool_location" == "x" ] ; then
++  usage
++fi
++
  top_dir=`pwd`
  
  case "$type" in
-@@ -161,9 +198,10 @@ case "$type" in
+@@ -161,9 +209,10 @@ case "$type" in
  	    --with-plugins=innobase \
  	    --with-zlib-dir=bundled \
  	    --enable-shared \
@@ -120,7 +140,7 @@ index 3f0cee7..ae0f35b 100755
  	;;
  
  "innodb55" | "5.5")
-@@ -225,7 +263,7 @@ case "$type" in
+@@ -225,7 +274,7 @@ case "$type" in
  
  	build_server
  

slapos/profile/xtrabackup.cfg

@@ -15,7 +15,7 @@ parts =
 [xtrabackup-build-patch-download]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/../patch/${:filename}
-md5sum = 93856cdb8fba76a0c9261d975a5d7377
+md5sum = e018df8bb3ed672891388556b8e91e35
 download-only = true
 filename = xtrabackup_build.sh_with_prefix.patch
 
@@ -27,7 +27,7 @@ make-binary = true
 patches = ${xtrabackup-build-patch-download:location}/${xtrabackup-build-patch-download:filename}
 patch-options = -p1
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-configure-command = utils/build.sh innodb51_builtin ${:location}
+configure-command = utils/build.sh innodb51_builtin ${:location} ${libtool:location}
 environment =
   CPPFLAGS =-I${zlib:location}/include
   LDFLAGS =-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib