Need to use the right libtool on OS X

Change-Id: I37b2a892143892740674ce9882ed61ea88eda894

config_host.mk.in

@@ -302,6 +302,7 @@ export LIBPNG_CFLAGS=$(gb_SPACE)@LIBPNG_CFLAGS@
 export LIBPNG_LIBS=$(gb_SPACE)@LIBPNG_LIBS@
 export LIBREPOSITORY_JAR=@LIBREPOSITORY_JAR@
 export LIBSERIALIZER_JAR=@LIBSERIALIZER_JAR@
+export LIBTOOL=@LIBTOOL@
 export LIBXML_CFLAGS=$(gb_SPACE)@LIBXML_CFLAGS@
 export LIBXML_JAR=@LIBXML_JAR@
 export LIBXML_LIBS=$(gb_SPACE)@LIBXML_LIBS@

configure.ac

@@ -2591,6 +2591,7 @@ if test $_os = Darwin; then
     fi
 
     # If no CC and CXX environment vars, try to guess where the compiler is
+    LIBTOOL=libtool
     if test -z "$save_CC"; then
         AC_MSG_CHECKING([what compiler to use])
         case $with_macosx_sdk in
@@ -2604,6 +2605,7 @@ if test $_os = Darwin; then
                 CC="gcc-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
                 CXX="g++-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
             fi
+            LIBTOOL=libtool
             ;;
         10.7|10.8|10.9)
             if test "$enable_libc__" = yes -a "$with_macosx_version_min_required" != 10.6; then
@@ -2619,6 +2621,7 @@ if test $_os = Darwin; then
             CXX="`xcrun -find clang++` $bitness $lto $stdlib -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
             XCRUN=xcrun
             AR=`xcrun -find ar`
+            LIBTOOL=`xcrun -find libtool`
             RANLIB=`xcrun -find ranlib`
             ;;
         esac
@@ -2715,6 +2718,7 @@ AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
 AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED)
 AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED)
 AC_SUBST(XCRUN)
+AC_SUBST(LIBTOOL) # Note that the OS X libtool command is unrelated to GNU libtool
 AC_SUBST(MACOSX_CODESIGNING_IDENTITY)
 AC_SUBST(ENABLE_MACOSX_SANDBOX)
 AC_SUBST(MACOSX_BUNDLE_IDENTIFIER)
@@ -2761,6 +2765,7 @@ if test $_os = iOS; then
     CXX="`xcrun -find clang++` -arch $arch -isysroot $sysroot $lto $versionmin"
     XCRUN=xcrun
     AR=`xcrun -find ar`
+    LIBTOOL=`xcrun -find libtool`
     RANLIB=`xcrun -find ranlib`
 fi
 

lpsolve/lp_solve_5.5.patch

@@ -87,7 +87,8 @@
  
 -$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
 +$c $extra_cflags -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $extra_cdefs $src
- libtool -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
+-libtool -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++$LIBTOOL -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
  
  if [ "$so" != "" ]
  then