From 071f6f46bb071849ab946160d5a7db09e3e6fcf8 Mon Sep 17 00:00:00 2001 From: Mayur Nagekar Date: Thu, 10 Jul 2014 01:51:37 +0530 Subject: [PATCH 1/2] Grouped both the IFs to remove redundat statements for help. --- configure | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 82fd22d..bb28399 100755 --- a/configure +++ b/configure @@ -3,17 +3,7 @@ # uname -s = Linux | OpenBSD | FreeBSD # uname -m = i636 or x86_64 -if [ "$1" = "-h" ]; then - echo Options: - echo " --prefix=path path to install hydra and its datafiles to" - echo " --with-oracle=prefix prefix for oracle include dir" - echo " --with-oracle-lib=prefix prefix for oracle lib dir" - echo " --disable-xhydra disable compilation of hydra GUI" - echo " --nostrip do not per default strip binaries before install" - echo " --help this here" - exit 0 -fi -if [ "$1" = "--help" ]; then +if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then echo Options: echo " --prefix=path path to install hydra and its datafiles to" echo " --with-oracle=prefix prefix for oracle include dir" @@ -362,7 +352,7 @@ for i in $INCDIRS ; do if [ -d "$i/svn" ]; then SVN_IPATH="$i/svn" fi - fi + fi if [ "X" = "X$APR_IPATH" ]; then if [ -d "$i/apr-1.0" ]; then APR_IPATH="$i/apr-1.0" @@ -373,7 +363,7 @@ for i in $INCDIRS ; do if [ -d "$i/apr" ]; then APR_IPATH="$i/apr" fi - fi + fi done if [ "X" = "X$SVN_PATH" -o "X" = "X$SVN_IPATH" -o "X" = "X$APR_IPATH" ]; then From 82a6e755dac617069db08fb2208b1c06b3fa8f6d Mon Sep 17 00:00:00 2001 From: Mayur Nagekar Date: Thu, 10 Jul 2014 02:30:10 +0530 Subject: [PATCH 2/2] Compiles on Mac/Darwin with clang-gcc. So added the support in configure --- configure | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index bb28399..3c4b7d7 100755 --- a/configure +++ b/configure @@ -20,7 +20,8 @@ rm -f Makefile.in SYSS=`uname -s 2> /dev/null` SYSO=`uname -o 2> /dev/null` SIXFOUR="" -if [ "$SYSS" = "Linux" -o "$SYSS" = "OpenBSD" -o "$SYSS" = "FreeBSD" -o "$SYSS" = "NetBSD" ]; then + +if [ "$SYSS" = "Linux" -o "$SYSS" = "OpenBSD" -o "$SYSS" = "FreeBSD" -o "$SYSS" = "NetBSD" -o "$SYSS" = "Darwin" ]; then SF=`uname -m | grep 64` if [ `uname -m` = "s390x" ]; then SF=64 @@ -32,7 +33,10 @@ if [ "$SYSS" = "Linux" -o "$SYSS" = "OpenBSD" -o "$SYSS" = "FreeBSD" -o "$SYSS" SIXFOUR=64 echo Detected 64 Bit $SYSS OS fi +else + echo "Unsupported Platform" fi + PREFIX="" NOSTRIP="" ORACLE_PATH=""