Skip to content

Commit

Permalink
fixed release scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
obiltschnig committed Sep 25, 2012
1 parent 984d8a5 commit 5ff5d24
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 8 deletions.
29 changes: 21 additions & 8 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,12 @@ Options:
--library-path=<path>
Add search path for library files.
--odbc-lib-dir=<path>
--odbc-lib=<path>
Specify the directory where ODBC library is located.
--odbc-include=<path>
Specify the directory where ODBC header files are located.
--cflags=<flags>
Pass additional flags to compiler.
Example: --cflags=-wall
Expand Down Expand Up @@ -114,7 +117,8 @@ flags=""
omit=""
includepath=""
librarypath=""
odbclibdir="/usr/lib"
odbclib=""
odbcinclude=""
unbundled=""
static=""
shared=""
Expand All @@ -139,8 +143,11 @@ while [ $# -ge 1 ]; do
--library-path=*)
librarypath="`echo ${1} | awk '{print substr($0,16)}' | tr ',;' ' '`" ;;

--odbc-lib-dir=*)
odbclibdir="`echo ${1} | awk '{print substr($0,16)}'`" ;;
--odbc-lib=*)
odbclib="`echo ${1} | awk '{print substr($0,16)}'`" ;;

--odbc-include=*)
odbcinclude="`echo ${1} | awk '{print substr($0,16)}'`" ;;

--cflags=*)
cflags="`echo ${1} | awk '{print substr($0,10)}'`" ;;
Expand Down Expand Up @@ -254,8 +261,11 @@ fi
if [ -n "$librarypath" ] ; then
echo "POCO_ADD_LIBRARY = $librarypath" >>$build/config.make
fi
if [ -n "$odbclibdir" ] ; then
echo "POCO_ODBC_LIB_DIR = $odbclibdir" >>$build/config.make
if [ -n "$odbclib" ] ; then
echo "POCO_ODBC_LIB = $odbclib" >>$build/config.make
fi
if [ -n "$odbcinclude" ] ; then
echo "POCO_ODBC_INCLUDE = $odbcinclude" >>$build/config.make
fi
if [ -n "$unbundled" ] ; then
echo "POCO_UNBUNDLED = 1" >>$build/config.make
Expand All @@ -281,8 +291,11 @@ fi
if [ -n "$librarypath" ] ; then
echo "export POCO_ADD_LIBRARY" >>$build/config.make
fi
if [ -n "$odbclibdir" ] ; then
echo "export POCO_ODBC_LIB_DIR" >>$build/config.make
if [ -n "$odbclib" ] ; then
echo "export POCO_ODBC_LIB" >>$build/config.make
fi
if [ -n "$odbcinclude" ] ; then
echo "export POCO_ODBC_INCLUDE" >>$build/config.make
fi
if [ -n "$unbundled" ] ; then
echo "export POCO_UNBUNDLED" >>$build/config.make
Expand Down
1 change: 1 addition & 0 deletions release/script/mkrelease
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ cat >${target}/Makefile <<'ENDOFSCRIPT'
#
sinclude config.make
sinclude config.build
ifndef POCO_BASE
$(warning WARNING: POCO_BASE is not defined. Assuming current directory.)
Expand Down

0 comments on commit 5ff5d24

Please sign in to comment.