From 6dbf82a96253add5ed5f6c923080f4de4366c874 Mon Sep 17 00:00:00 2001
From: JuanJo Ciarlante <juanjosec@gmail.com>
Date: Sun, 27 Mar 2011 23:41:22 +0200
Subject: * ipv6-0.4.16: fix mingw32 build

---
 install-win32/makeopenvpn | 60 +++++++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

(limited to 'install-win32')

diff --git a/install-win32/makeopenvpn b/install-win32/makeopenvpn
index 0f06a01..ced2a54 100755
--- a/install-win32/makeopenvpn
+++ b/install-win32/makeopenvpn
@@ -2,27 +2,34 @@
 
 H=`pwd`
 
-# get version.nsi definitions
-. autodefs/defs.sh
-
-[ -z "$CC" ] && CC=gcc
-LZO_INC_DIR=$H/$LZO_DIR/include
-LZO_LIB_DIR=$H/$LZO_DIR
-PKCS11_INC_DIR=$H/$PKCS11_HELPER_DIR/usr/local/include
-PKCS11_LIB_DIR=$H/$PKCS11_HELPER_DIR/usr/local/lib
-XAUTOCONF=""
-
 case "`uname -o 2>/dev/null`" in
-  *inux) 
+  *inux)
+
     # cross-compiling, make dude's life easier
-    XAUTOCONF="--host=i586-mingw32msvc --build=i386-linux"
+    XAUTOCONF="--host=i586-mingw32msvc --build=i386-linux $XAUTOCONF"
     export CC=i586-mingw32msvc-gcc
     export CXXCPP=i586-mingw32msvc-cpp
     export CXX=i586-mingw32msvc-g++
-    # when cross-compiling from src, you'll typically get:
-    LZO_LIB_DIR=$H/$LZO_DIR/src/.libs
-    PKCS11_INC_DIR=$H/$PKCS11_HELPER_DIR/include/pkcs11-helper-1.0/
-    PKCS11_LIB_DIR=$H/$PKCS11_HELPER_DIR/lib/.libs/
+    # this requires the human to setup these environ vars:
+    # OPENSSL_DIR LZO_DIR PKCS11_HELPER_DIR
+    OPENSSL_INC_DIR=$OPENSSL_DIR/include
+    OPENSSL_LIB_DIR=$OPENSSL_DIR/out
+    LZO_INC_DIR=$LZO_DIR/include
+    LZO_LIB_DIR=$LZO_DIR/src/.libs
+    PKCS11_INC_DIR=$PKCS11_HELPER_DIR/include/pkcs11-helper-1.0/
+    PKCS11_LIB_DIR=$PKCS11_HELPER_DIR/lib/.libs/
+    ;;
+  *)
+    # get version.nsi definitions
+    . autodefs/defs.sh
+    XAUTOCONF=""
+    # default configuration creates relative-path environ vars:
+    OPENSSL_INC_DIR=$H/$OPENSSL_DIR/include
+    OPENSSL_LIB_DIR=$H/$OPENSSL_DIR/out
+    LZO_INC_DIR=$H/$LZO_DIR/include
+    LZO_LIB_DIR=$H/$LZO_DIR
+    PKCS11_INC_DIR=$H/$PKCS11_HELPER_DIR/usr/local/include
+    PKCS11_LIB_DIR=$H/$PKCS11_HELPER_DIR/usr/local/lib
     ;;
 esac
 if $CC --version &>/dev/null && [ -d "$OPENSSL_DIR" ] && [ -d "$LZO_DIR" ] && [ -d "$PKCS11_HELPER_DIR" ]; then
@@ -34,23 +41,26 @@ if $CC --version &>/dev/null && [ -d "$OPENSSL_DIR" ] && [ -d "$LZO_DIR" ] && [
 	    --enable-strict \
 	    --prefix=$H/windest \
 	    MAN2HTML=true \
-	    --with-ssl-headers=$H/$OPENSSL_DIR/include \
-	    --with-ssl-lib=$H/$OPENSSL_DIR/out \
+	    --with-ssl-headers=$OPENSSL_INC_DIR \
+	    --with-ssl-lib=$OPENSSL_LIB_DIR \
 	    --with-lzo-headers=$LZO_INC_DIR \
 	    --with-lzo-lib=$LZO_LIB_DIR \
 	    --with-pkcs11-helper-headers=$PKCS11_INC_DIR \
-	    --with-pkcs11-helper-lib=$PKCS11_LIB_DIR
+	    --with-pkcs11-helper-lib=$PKCS11_LIB_DIR \
+	    || exit 1
     fi
 
     make -j $MAKE_JOBS && make install
 
+    if [ -n "$GENOOUT" ];then
     # copy OpenVPN and service executables to GENOUT/bin
-    mkdir -p $GENOUT/bin &>/dev/null
-    cp windest/sbin/openvpn.exe $GENOUT/bin
-    cp windest/sbin/openvpnserv.exe $GENOUT/bin
-    if [ -z "$NO_STRIP" ]; then
-	strip $GENOUT/bin/openvpn.exe
-	strip $GENOUT/bin/openvpnserv.exe
+      mkdir -p $GENOUT/bin &>/dev/null
+      cp windest/sbin/openvpn.exe $GENOUT/bin
+      cp windest/sbin/openvpnserv.exe $GENOUT/bin
+      if [ -z "$NO_STRIP" ]; then
+  	strip $GENOUT/bin/openvpn.exe
+  	strip $GENOUT/bin/openvpnserv.exe
+      fi
     fi
 else
     echo DID NOT BUILD openvpn.exe and openvpnserv.exe because one or more of gcc, OPENSSL_DIR, LZO_DIR, or PKCS11_HELPER_DIR directories were missing
-- 
cgit v1.2.3