github/thc-hydra
1
0
Fork 0
mirror of https://github.com/vanhauser-thc/thc-hydra.git synced 2025-08-21 05:43:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #523 from maaaaz/cygwin_oracle

Browse source 
oracle on cygwin support
This commit is contained in:
van Hauser 2020-04-26 16:50:51 +02:00 • committed by GitHub
commit 9abb946dc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
configure vendored
View file

@ -864,7 +864,7 @@ if [ "$SSH_IPATH" = "/usr/include" ]; then
SSH_IPATH="" SSH_IPATH=""
fi fi
echo "Checking for Oracle (libocci.so libclntsh.so / oci.h and libaio.so) ..." echo "Checking for Oracle (libocci.so libclntsh.so / oci.h and libaio.so / liboci.a and oci.dll) ..."
#assume if we find oci.h other headers should also be in that dir #assume if we find oci.h other headers should also be in that dir
#for libs we will test the 2 #for libs we will test the 2
if [ "X" != "X$WORACLE_PATH" ]; then if [ "X" != "X$WORACLE_PATH" ]; then
@ -894,6 +894,11 @@ for i in $LIBDIRS ; do
ORACLE_PATH="$i" ORACLE_PATH="$i"
fi fi
fi fi
if [ "X" = "X$ORACLE_PATH" ]; then
if [ -f "$i/liboci.a" -a -f "$i/oci.dll" ]; then
ORACLE_PATH="$i"
fi
fi
if [ "X" = "X$ORACLE_PATH" ]; then if [ "X" = "X$ORACLE_PATH" ]; then
TMP_LIB=`/bin/ls $i/libocci.so.* 2> /dev/null | grep occi.` TMP_LIB=`/bin/ls $i/libocci.so.* 2> /dev/null | grep occi.`
if [ -n "$TMP_LIB" ]; then if [ -n "$TMP_LIB" ]; then
@ -907,23 +912,17 @@ for i in $LIBDIRS ; do
fi fi
fi fi
if [ "X" = "X$ORACLE_PATH" ]; then if [ "X" = "X$ORACLE_PATH" ]; then
TMP_LIB=`/bin/ls $i/libocci.dll* 2> /dev/null | grep occi.` TMP_LIB=`/bin/ls $i/oci.dll* 2> /dev/null | grep occi.`
if [ -n "$TMP_LIB" ]; then if [ -n "$TMP_LIB" ]; then
ORACLE_PATH="$i" ORACLE_PATH="$i"
fi fi
if [ "X" != "X$ORACLE_PATH" ]; then
TMP_LIB=`/bin/ls $i/libclntsh.dll* 2> /dev/null | grep clntsh.`
if [ -z "$TMP_LIB" ]; then
ORACLE_PATH=""
fi
fi
fi fi
done done
if [ "X" != "X$DEBUG" ]; then if [ "X" != "X$DEBUG" ]; then
echo DEBUG: ORACLE_PATH=$ORACLE_PATH/libocci echo DEBUG: ORACLE_PATH=$ORACLE_PATH/libocci
fi fi
#check for Kernel Asynchronous I/O (AIO) lib support #check for Kernel Asynchronous I/O (AIO) lib support, no need on Cygwin
if [ "X" != "X$ORACLE_PATH" ]; then if [ "X" != "X$ORACLE_PATH" -a "$SYSO" != "Cygwin" ]; then
LIBAIO="" LIBAIO=""
for i in $LIBDIRS ; do for i in $LIBDIRS ; do
if [ "X" = "X$LIBAIO" ]; then if [ "X" = "X$LIBAIO" ]; then
@ -951,10 +950,8 @@ if [ "X" != "X$DEBUG" ]; then
fi fi
for i in $INCDIRS ; do for i in $INCDIRS ; do
if [ "X" != "X$ORACLE_PATH" ]; then if [ -f "$i/oci.h" ]; then
if [ -f "$i/oci.h" ]; then ORACLE_IPATH="$i"
ORACLE_IPATH="$i"
fi
fi fi
done done
if [ "X" != "X$DEBUG" ]; then if [ "X" != "X$DEBUG" ]; then
@ -1542,9 +1539,12 @@ fi
if [ -n "$NCP_PATH" ]; then if [ -n "$NCP_PATH" ]; then
XLIBS="$XLIBS -lncp" XLIBS="$XLIBS -lncp"
fi fi
if [ -n "$ORACLE_PATH" ]; then if [ -n "$ORACLE_PATH" -a "$SYSO" != "Cygwin" ]; then
XLIBS="$XLIBS -locci -lclntsh" XLIBS="$XLIBS -locci -lclntsh"
fi fi
if [ -n "$ORACLE_PATH" -a "$SYSO" = "Cygwin" ]; then
XLIBS="$XLIBS -loci"
fi
if [ -n "$FIREBIRD_PATH" ]; then if [ -n "$FIREBIRD_PATH" ]; then
XLIBS="$XLIBS -lfbclient" XLIBS="$XLIBS -lfbclient"
fi fi