From 2d9f2d38c45e424bdc7abc998ae5d9141b2188ec Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Sun, 28 Dec 2014 11:34:22 +0000
Subject: [PATCH] trunk: minor cleanup.

---
 config/configure.ac |  4 ++--
 jenkins_build.sh    | 22 +++-------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/config/configure.ac b/config/configure.ac
index 8d253fde..d4132b12 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -181,7 +181,7 @@ if test "$with_curl" != "no"; then
                 CURL_LDFLAGS="-L${CURL_DIR}/lib"
             fi],[found_curl=no]),[found_curl=no])
     if test "$found_curl" = "no"; then
-        AC_MSG_ERROR(either specify a valid curl installation with --with-curl=DIR or disable libcurl support with --disable-curl)
+        AC_MSG_ERROR(either specify a valid curl installation with --with-curl=DIR or use --without-curl)
     fi
     AC_SUBST(CURL_CPPFLAGS)
     AC_SUBST(CURL_LDFLAGS)
@@ -221,7 +221,7 @@ if test "$with_ssh" != "no"; then
                 SSH_LDFLAGS="-L${SSH_DIR}/lib"
             fi],[found_ssh=no]),[found_ssh=no])
     if test "$found_ssh" = "no"; then
-        AC_MSG_ERROR(either specify a valid libssh installation with --with-ssh=DIR or disable libssh support with --disable-ssh)
+        AC_MSG_ERROR(either specify a valid libssh installation with --with-ssh=DIR or use --without-ssh)
     fi
     AC_SUBST(SSH_CPPFLAGS)
     AC_SUBST(SSH_LDFLAGS)
diff --git a/jenkins_build.sh b/jenkins_build.sh
index a063dd4c..7bceba10 100755
--- a/jenkins_build.sh
+++ b/jenkins_build.sh
@@ -64,22 +64,6 @@ if [ "$1" == "status" ]; then
     exit $result
 fi
 
-
-##
-# Quick dodge, use rmills ~/bin/.profile to set some environment variables
-# I think I need this is necessary to find pkg-config
-# This code will be removed later
-# set +v
-DIR="$PWD"
-if [ -e /home/rmills/bin/.profile ]; then
-    source /home/rmills/bin/.profile
-fi
-if [ -e /Users/rmills/bin/.profile ]; then
-    source /Users/rmills/bin/.profile
-fi
-cd "$DIR"
-# set -v
-
 ##
 # where are we?
 export PLATFORM=''
@@ -193,9 +177,9 @@ case "$build" in
 
   MING) 
         if [ ! -z "$BUILDMINGW" ]; then
-            export CC=$(which gcc)
-            export CXX=$(which g++)
-            export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+            export  CC=$(which gcc)
+            export  CXX=$(which g++)
+            export "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig"
             echo --- recursive MinGW build ---
 
             ##########################