third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trunk: minor cleanup.

Browse Source
This commit is contained in:
Robin Mills 2014-12-28 11:34:22 +00:00
parent 1afb17b527
commit 2d9f2d38c4
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/configure.ac
View File

@ -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)

22
jenkins_build.sh
View File

@ -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 ---
##########################