From 8a7a4e6ab4ebac28cbda0aecd01806117c3a1041 Mon Sep 17 00:00:00 2001
From: Christian Hohnstaedt <christian@hohnstaedt.de>
Date: Sat, 22 Nov 2014 01:13:16 +0100
Subject: [PATCH] Fix compile script and configure for MacOSX

---
 configure.ac      | 13 +++++++++++--
 misc/build-mac.sh |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3e91a73b..43c5bf2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,13 +26,15 @@ esac
 if test -n "${DARWIN}"; then
   AC_MSG_NOTICE([Mac OSX ${DARWIN} detected])
   CXXFLAGS="${CXXFLAGS} -pipe -gdwarf-2"
-  MACDEPLOYQT=macdeployqt
 fi
 AC_SUBST([DARWIN])
 AC_SUBST([MACDEPLOYQT])
 
 export PKG_CONFIG_PATH
 export LD_LIBRARY_PATH
+if test -n "$DARWIN"; then
+  export DYLD_LIBRARY_PATH
+fi
 
 # Detect the OpenSSL libraries and header
 #########################################
@@ -49,6 +51,7 @@ if test -n "${_OPENSSLDIR}" && test -d "${_OPENSSLDIR}"; then
   _OPENSSLDIR=`cd ${_OPENSSLDIR} && pwd`
   PKG_CONFIG_PATH="${_OPENSSLDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}"
   LD_LIBRARY_PATH="${_OPENSSLDIR}/lib:${LD_LIBRARY_PATH}"
+  DYLD_LIBRARY_PATH="${_OPENSSLDIR}/lib:${DYLD_LIBRARY_PATH}"
 fi
 
 PKG_CHECK_MODULES([OPENSSL],
@@ -74,12 +77,15 @@ AC_ARG_WITH([qt],
 if test -n "${_QTDIR}" && test -d "${_QTDIR}"; then
   _QTDIR=`cd ${_QTDIR} && pwd`
   PKG_CONFIG_PATH="${_QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}"
-  LD_LIBRARY_PATH="${_QTDIR}/lib:${LD_LIBRARY_PATH}"
+  DYLD_LIBRARY_PATH="${_QTDIR}/lib:${DYLD_LIBRARY_PATH}"
 fi
 
 PKG_CHECK_MODULES(QT, [QtCore >= 4.6, QtCore < 5.0, QtGui >= 4.6, QtGui < 5.0], [
   QT_MOC="`pkg-config --variable=moc_location QtCore`"
   QT_UIC="`pkg-config --variable=uic_location QtCore`"
+  if test -n "$DARWIN"; then
+    QT_CFLAGS="$QT_CFLAGS -F`pkg-config --variable=libdir QtCore`"
+  fi
 ], [
   if test -z "$DARWIN"; then
     QT_LIBS=" -lQtCore -lQtGui "
@@ -97,6 +103,9 @@ if test "x${QT_UIC}" = "x"; then
   QT_UIC="`which uic-qt4 || which uic`"
 fi
 QT_LRELEASE=`echo ${QT_MOC} | sed 's/moc/lrelease/'`
+if test -n "$DARWIN"; then
+  MACDEPLOYQT=`echo ${QT_MOC} | sed 's/moc/macdeployqt/'`
+fi
 QT_RCC=`echo ${QT_MOC} | sed 's/moc/rcc/'`
 if ! test -x ${QT_RCC}; then
   QT_RCC=`echo ${QT_MOC} | sed 's/moc.*/rcc/'`
diff --git a/misc/build-mac.sh b/misc/build-mac.sh
index 7d044302..5d8815e9 100755
--- a/misc/build-mac.sh
+++ b/misc/build-mac.sh
@@ -47,7 +47,7 @@ for i in "" -brainpool; do
   mkdir -p "$XCA_BUILD"
   cd "$XCA_BUILD"
 
-  export CXXFLAGS="-arch i386 -I${INSTALL_DIR}/include -L${INSTALL_DIR}/lib"
+  export CXXFLAGS="-arch i386 -I${INSTALL_DIR}/include -L${INSTALL_DIR}/lib -F$QTDIR"
 
   (cd $XCA_DIR && ./bootstrap)
   $XCA_DIR/configure --with-openssl="$INSTALL_DIR" --with-qt="$QTDIR"