# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1375978775 14400
# Node ID c56f388f1297ee5758114fbd062e20175d76fbb6
# Parent  7e6673cf2255dd8aabee2032e5bc2dbf2f453af6
make using lib64 directory configurable

diff -r 7e6673cf2255 -r c56f388f1297 Makefile.in
--- a/Makefile.in	Thu Aug 08 12:10:55 2013 -0400
+++ b/Makefile.in	Thu Aug 08 12:19:35 2013 -0400
@@ -47,6 +47,9 @@
 # Use openblas for octave
 ENABLE_OPENBLAS := @ENABLE_OPENBLAS@
 
+# Look in lib64 directory.
+MXE_USE_LIB64_DIRECTORY := @ENABLE_LIB64_DIRECTORY@
+
 ## end of configuration variables.
 
 ifneq ($(MXE_NATIVE_BUILD),yes)
@@ -163,7 +166,11 @@
 PATH := $(BUILD_TOOLS_PREFIX)/bin:$(PATH)
 
 CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include'
-CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib'
+ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
+  CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib -L$(HOST_PREFIX)/lib64'
+else
+  CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib'
+endif
 CONFIGURE_POST_HOOK := true
 
 ifeq ($(MXE_NATIVE_BUILD),yes)
@@ -251,10 +258,15 @@
     NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++
   endif
 else ifneq ($(MXE_SYSTEM),msvc)
-  LD_LIBRARY_PATH := $(HOST_LIBDIR):$(HOST_LIB64DIR)
+  MXE_CPPFLAGS := '-I$(HOST_INCDIR)'
+  ifeq ($MXE_USE_LIB64_DIRECTORY)
+    MXE_LDFLAGS := '-L$(HOST_LIBDIR) -L$(HOST_LIB64DIR)'
+    LD_LIBRARY_PATH := $(HOST_LIBDIR):$(HOST_LIB64DIR)
+  else
+    MXE_LDFLAGS := '-L$(HOST_LIBDIR)'
+    LD_LIBRARY_PATH := $(HOST_LIBDIR)
+  endif
   export LD_LIBRARY_PATH
-  MXE_CPPFLAGS := '-I$(HOST_INCDIR)'
-  MXE_LDFLAGS := '-L$(HOST_LIBDIR)'
 endif
 
 LN := ln
diff -r 7e6673cf2255 -r c56f388f1297 configure.ac
--- a/configure.ac	Thu Aug 08 12:10:55 2013 -0400
+++ b/configure.ac	Thu Aug 08 12:19:35 2013 -0400
@@ -101,6 +101,13 @@
   [if test "$enableval" = yes; then USE_SYSTEM_GCC=yes; else USE_SYSTEM_GCC=no; fi], [])
 AC_SUBST(USE_SYSTEM_GCC)
 
+ENABLE_LIB64_DIRECTORY=no
+AC_ARG_ENABLE(lib64-directory,
+  [AS_HELP_STRING([--enable-lib64-directory],
+    [Search lib64 directory for libraries])],
+  [if test "$enableval" = yes; then ENABLE_LIB64_DIRECTORY=yes; fi], [])
+AC_SUBST(ENABLE_LIB64_DIRECTORY)
+
 USE_PIC_FLAG=no
 AC_ARG_ENABLE([pic-flag],
   [AS_HELP_STRING([--enable-pic-flag], [Compile with PIC flag])],