--- configure.orig 2013-08-02 13:35:56.000000000 +0200
+++ configure 2013-09-04 00:47:08.000000000 +0200
@@ -262,171 +262,7 @@
PCRE_PATH=""
PCRE_IPATH=""
fi
-
-echo "Checking for Postgres (libpq.so, libpq-fe.h) ..."
-if [ "$SYSO" = "Cygwin" ]; then
- echo " ... DISABLED - postgres is buggy in Cygwin at the moment"
- POSTGRES_PATH=""
- POSTGRES_IPATH=""
-else
- for i in $LIBDIRS ; do
- if [ "X" = "X$POSTGRES_PATH" ]; then
- if [ -f "$i/libpq.so" -o -f "$i/libpq.dylib" -o -f "$i/libpq.a" ]; then
- POSTGRES_PATH="$i"
- fi
- fi
- if [ "X" = "X$POSTGRES_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libpq.so* 2> /dev/null | grep pq`
- if [ -n "$TMP_LIB" ]; then
- POSTGRES_PATH="$i"
- fi
- fi
- if [ "X" = "X$POSTGRES_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libpq.dll* 2> /dev/null | grep pq`
- if [ -n "$TMP_LIB" ]; then
- POSTGRES_PATH="$i"
- fi
- fi
- done
- POSTGRES_IPATH=
- for i in $INCDIRS \
- /opt/p*sql*/include /usr/*p*sql*/include /usr/local/*psql*/include
- do
- if [ "X" = "X$POSTGRES_IPATH" ]; then
- if [ -f "$i/libpq-fe.h" ]; then
- POSTGRES_IPATH="$i"
- fi
- if [ -f "$i/pgsql/libpq-fe.h" ]; then
- POSTGRES_IPATH="$i/pgsql"
- fi
- if [ -f "$i/postgresql/libpq-fe.h" ]; then
- POSTGRES_IPATH="$i/postgresql"
- fi
- fi
- done
-
- if [ -n "$POSTGRES_PATH" -a -n "$POSTGRES_IPATH" ]; then
- echo " ... found"
- fi
- if [ "X" = "X$POSTGRES_PATH" -o "X" = "X$POSTGRES_IPATH" ]; then
- echo " ... NOT found, module postgres disabled"
- POSTGRES_PATH=""
- POSTGRES_IPATH=""
- fi
-fi
-
-echo "Checking for SVN (libsvn_client-1 libapr-1.so libaprutil-1.so) ..."
-for i in $LIBDIRS ; do
- if [ "X" = "X$SVN_PATH" ]; then
- if [ -f "$i/libsvn_client-1.so" ]&&[ -f "$i/libapr-1.so" ]&&[ -f "$i/libaprutil-1.so" ]; then
- SVN_PATH="$i"
- APR_PATH="$i"
- fi
- fi
- if [ "X" = "X$SVN_PATH" ]; then
- if [ -f "$i/libsvn_client-1.dylib" ]&&[ -f "$i/libapr-1.dylib" ]&&[ -f "$i/libaprutil-1.dylib" ]; then
- SVN_PATH="$i"
- APR_PATH="$i"
- fi
- fi
- if [ "X" = "X$SVN_PATH" ]; then
- if [ -f "$i/libsvn_client-1.a" ]&&[ -f "$i/libapr-1.a" ]&&[ -f "$i/libaprutil-1.a" ]; then
- SVN_PATH="$i"
- APR_PATH="$i"
- fi
- fi
- if [ "X" = "X$SVN_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libsvn_client*.so* 2> /dev/null | grep libsvn_client.`
- if [ -n "$TMP_LIB" ]; then
- SVN_PATH="$i"
- APR_PATH="$i"
- fi
- fi
- if [ "X" = "X$SVN_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libsvn_client*.dll* 2> /dev/null | grep libsvn_client.`
- if [ -n "$TMP_LIB" ]; then
- SVN_PATH="$i"
- APR_PATH="$i"
- fi
- fi
-done
-for i in $INCDIRS ; do
- if [ "X" = "X$SVN_IPATH" ]; then
- if [ -d "$i/subversion-1" ]; then
- SVN_IPATH="$i/subversion-1"
- fi
- if [ -d "$i/svn" ]; then
- SVN_IPATH="$i/svn"
- fi
- fi
- if [ "X" = "X$APR_IPATH" ]; then
- if [ -d "$i/apr-1.0" ]; then
- APR_IPATH="$i/apr-1.0"
- fi
- if [ -d "$i/apr-1" ]; then
- APR_IPATH="$i/apr-1"
- fi
- if [ -d "$i/apr" ]; then
- APR_IPATH="$i/apr"
- fi
- fi
-done
-
-if [ "X" = "X$SVN_PATH" -o "X" = "X$SVN_IPATH" -o "X" = "X$APR_IPATH" ]; then
- SVN_PATH=""
- SVN_IPATH=""
- APR_IPATH=""
-fi
-if [ "$SVN_IPATH" = "/usr/include" ]; then
- SVN_IPATH=""
-fi
-if [ "$APR_IPATH" = "/usr/include" ]; then
- APR_IPATH=""
-fi
-
-if [ -n "$SVN_PATH" -a -n "$APR_PATH" ]; then
- echo " ... found"
-fi
-if [ "X" = "X$SVN_PATH" -o "X" = "X$APR_PATH" ]; then
- echo " ... NOT found, module svn disabled"
-fi
-
-echo "Checking for firebird (libfbclient.so) ..."
-for i in $LIBDIRS ; do
- if [ "X" = "X$FIREBIRD_PATH" ]; then
- if [ -f "$i/libfbclient.so" -o -f "$i/libfbclient.dylib" -o -f "$i/libfbclient.a" ]; then
- FIREBIRD_PATH="$i"
- fi
- fi
- if [ "X" = "X$FIREBIRD_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libfbclient.so.* 2> /dev/null | grep libfbclient.`
- if [ -n "$TMP_LIB" ]; then
- FIREBIRD_PATH="$i"
- fi
- fi
- if [ "X" = "X$FIREBIRD_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libfbclient.dll* 2> /dev/null | grep libfbclient.`
- if [ -n "$TMP_LIB" ]; then
- FIREBIRD_PATH="$i"
- fi
- fi
-done
-for i in $INCDIRS ; do
- if [ "X" != "X$FIREBIRD_PATH" ]; then
- if [ -f "$i/ibase.h" ]; then
- FIREBIRD_IPATH="$i"
- fi
- fi
-done
-if [ -n "$FIREBIRD_PATH" -a -n "$FIREBIRD_IPATH" ]; then
- echo " ... found"
-fi
-if [ "X" = "X$FIREBIRD_PATH" -o "X" = "X$FIREBIRD_IPATH" ]; then
- echo " ... NOT found, module firebird disabled"
- FIREBIRD_PATH=""
- FIREBIRD_IPATH=""
-fi
-
+#@@CUT_MYSQLA
echo "Checking for MYSQL client (libmysqlclient.so, math.h) ..."
for i in $LIBDIRS ; do
if [ "X" = "X$MYSQL_PATH" ]; then
@@ -450,13 +286,15 @@
for i in $INCDIRS ; do
if [ "X" != "X$MYSQL_PATH" ]; then
if [ -f "$i/mysql/mysql.h" ]; then
- MYSQL_IPATH="$i/mysql"
+ MYSQL_IPATH="$i"
fi
fi
done
+#CUT_MYSQLA@@
MATH=""
if [ -f "/usr/include/math.h" ]; then
MATH="-DHAVE_MATH_H"
+#@@CUT_MYSQLB
if [ -n "$MYSQL_PATH" -a -n "$MYSQL_IPATH" -a -n "$MATH" ]; then
echo " ... found"
else
@@ -466,117 +304,8 @@
fi
else
echo " ... math.h not found, module Mysql disabled"
+#CUT_MYSQLB@@
fi
-echo "Checking for AFP (libafpclient.so) ..."
-for i in $LIBDIRS ; do
- if [ "X" = "X$AFP_PATH" ]; then
- if [ -f "$i/libafpclient.so" -o -f "$i/libafpclient.so" -o -f "$i/libafpclient.a" ]; then
- AFP_PATH="$i"
- fi
- fi
- if [ "X" = "X$AFP_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libafpclient.so.* 2> /dev/null | grep libafpclient.`
- if [ -n "$TMP_LIB" ]; then
- AFP_PATH="$i"
- fi
- fi
- if [ "X" = "X$AFP_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libafpclient.dll* 2> /dev/null | grep libafpclient.`
- if [ -n "$TMP_LIB" ]; then
- AFP_PATH="$i"
- fi
- fi
-done
-for i in $INCDIRS ; do
- if [ "X" != "X$AFP_PATH" ]; then
- if [ -f "$i/afpfs-ng/afp.h" ]; then
- AFP_IPATH="$i/afpfs-ng"
- fi
- fi
-done
-if [ -n "$AFP_PATH" -a -n "$AFP_IPATH" ]; then
- echo " ... found"
-fi
-if [ "X" = "X$AFP_PATH" -o "X" = "X$AFP_IPATH" ]; then
- echo " ... NOT found, module Apple Filing Protocol disabled - Apple sucks anyway"
- AFP_PATH=""
- AFP_IPATH=""
-fi
-
-echo "Checking for NCP (libncp.so / nwcalls.h) ..."
-for i in $LIBDIRS ; do
- if [ "X" = "X$NCP_PATH" ]; then
- if [ -f "$i/libncp.so" -o -f "$i/libncp.dylib" -o -f "$i/libncp.a" ]; then
- NCP_PATH="$i"
- fi
- fi
- if [ "X" = "X$NCP_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libncp.so.* 2> /dev/null | grep ncp.`
- if [ -n "$TMP_LIB" ]; then
- NCP_PATH="$i"
- fi
- fi
- if [ "X" = "X$NCP_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libncp.dll* 2> /dev/null | grep ncp.`
- if [ -n "$TMP_LIB" ]; then
- NCP_PATH="$i"
- fi
- fi
-done
-for i in $INCDIRS ; do
- if [ "X" != "X$NCP_PATH" ]; then
- if [ -f "$i/ncp/nwcalls.h" ]; then
- NCP_IPATH="$i"
- fi
- fi
-done
-if [ -n "$NCP_PATH" -a -n "$NCP_IPATH" ]; then
- echo " ... found"
-fi
-if [ "X" = "X$NCP_PATH" -o "X" = "X$NCP_IPATH" ]; then
- echo " ... NOT found, module NCP disabled"
- NCP_PATH=""
- NCP_IPATH=""
-fi
-
-echo "Checking for SAP/R3 (librfc/saprfc.h) ..."
-for i in $LIBDIRS ; do
- if [ "X" = "X$SAPR3_PATH" ]; then
- if [ -f "$i/librfc.a" -o -f "$i/librfc.dylib" -o "$i/librfc32.dll" ]; then
- SAPR3_PATH="$i"
- fi
- fi
- if [ "X" = "X$SAPR3_PATH" ]; then
- TMP_LIB=`/bin/ls $i/librfc.* $i/librfc32.* 2> /dev/null | grep librfc`
- if [ -n "$TMP_LIB" ]; then
- SAPR3_PATH="$i"
- fi
- fi
-done
-for i in $INCDIRS ; do
- if [ "X" = "X$SAPR3_IPATH" ]; then
- if [ -f "$i/saprfc.h" ]; then
- SAPR3_IPATH="$i"
- fi
- fi
-done
-if [ "X" = "X$SAPR3_PATH" ]; then
- SAPR3_IPATH=""
-fi
-if [ "X" = "X$SAPR3_IPATH" ]; then
- SAPR3_PATH=""
-fi
-if [ -n "$SAPR3_PATH" ]; then
- echo " ... found"
-fi
-if [ "X" = "X$SAPR3_PATH" ]; then
- echo " ... NOT found, module sapr3 disabled"
- echo "Get it from http://www.sap.com/solutions/netweaver/linux/eval/index.asp"
-fi
-if [ "$SAPR3_IPATH" = "/usr/include" ]; then
- SAPR3_IPATH=""
-fi
-
echo "Checking for libssh (libssh/libssh.h) ..."
for i in $LIBDIRS ; do
if [ "X" = "X$SSH_PATH" ]; then
@@ -658,100 +387,6 @@
fi
-echo "Checking for Oracle (libocci.so libclntsh.so / oci.h and libaio.so) ..."
-#assume if we find oci.h other headers should also be in that dir
-#for libs we will test the 2
-if [ "X" != "X$WORACLE_PATH" ]; then
- INCDIRS="$INCDIRS $WORACLE_PATH"
-fi
-if [ "X" != "X$WORACLE_LIB_PATH" ]; then
- LIBDIRS="$LIBDIRS $WORACLE_LIB_PATH"
-fi
-
-for i in $LIBDIRS ; do
- if [ "X" = "X$ORACLE_PATH" ]; then
- if [ -f "$i/libocci.so" ]&&[ -f "$i/libclntsh.so" ]; then
- ORACLE_PATH="$i"
- fi
- fi
- if [ "X" = "X$ORACLE_PATH" ]; then
- if [ -f "$i/libocci.dylib" ]&&[ -f "$i/libclntsh.dylib" ]; then
- ORACLE_PATH="$i"
- fi
- fi
- if [ "X" = "X$ORACLE_PATH" ]; then
- if [ -f "$i/libocci.a" ]&&[ -f "$i/libclntsh.a" ]; then
- ORACLE_PATH="$i"
- fi
- fi
- if [ "X" = "X$ORACLE_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libocci.so.* 2> /dev/null | grep occi.`
- if [ -n "$TMP_LIB" ]; then
- ORACLE_PATH="$i"
- fi
- if [ "X" != "X$ORACLE_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libclntsh.so.* 2> /dev/null | grep clntsh.`
- if [ -z "$TMP_LIB" ]; then
- ORACLE_PATH=""
- fi
- fi
- fi
- if [ "X" = "X$ORACLE_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libocci.dll* 2> /dev/null | grep occi.`
- if [ -n "$TMP_LIB" ]; then
- ORACLE_PATH="$i"
- 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
-done
-#check for Kernel Asynchronous I/O (AIO) lib support
-if [ "X" != "X$ORACLE_PATH" ]; then
- LIBAIO=""
- for i in $LIBDIRS ; do
- if [ "X" = "X$LIBAIO" ]; then
- if [ -f "$i/libaio.so" -o -f "$i/libaio.dylib" -o -f "$i/libaio.a" ]; then
- LIBAIO="$i"
- fi
- fi
- if [ "X" = "X$LIBAIO" ]; then
- TMP_LIB=`/bin/ls $i/libaio.so.* 2> /dev/null | grep aio.`
- if [ -n "$TMP_LIB" ]; then
- LIBAIO="$i"
- fi
- TMP_LIB=`/bin/ls $i/libaio.dll* 2> /dev/null | grep aio.`
- if [ -n "$TMP_LIB" ]; then
- LIBAIO="$i"
- fi
- fi
- done
- if [ "X" = "X$LIBAIO" ]; then
- ORACLE_PATH=""
- fi
-fi
-
-for i in $INCDIRS ; do
- if [ "X" != "X$ORACLE_PATH" ]; then
- if [ -f "$i/oci.h" ]; then
- ORACLE_IPATH="$i"
- fi
- fi
-done
-if [ -n "$ORACLE_PATH" -a -n "$ORACLE_IPATH" ]; then
- echo " ... found"
-fi
-if [ "X" = "X$ORACLE_PATH" -o "X" = "X$ORACLE_IPATH" ]; then
- echo " ... NOT found, module Oracle disabled"
- echo "Get basic and sdk package from http://www.oracle.com/technetwork/database/features/instant-client/index.html"
- ORACLE_PATH=""
- ORACLE_IPATH=""
-fi
-
-
if [ "X" = "X$XHYDRA_SUPPORT" ]; then
echo "Checking for GUI req's (pkg-config, gtk+-2.0) ..."
XHYDRA_SUPPORT=`pkg-config --help > /dev/null 2>&1 || echo disabled`
@@ -830,7 +465,7 @@
XIPATHS=""
if [ -n "$FIREBIRD_PATH" -o -n "$PCRE_PATH" -o -n "$IDN_PATH" -o -n "$SSL_PATH" -o -n "$CRYPTO_PATH" -o -n "$NSL_PATH" -o -n "$SOCKET_PATH" -o -n "$RESOLV_PATH" -o -n "$SAPR3_PATH" -o -n "$SSH_PATH" -o -n "$POSTGRES_PATH" -o -n "$SVN_PATH" -o -n "$NCP_PATH" -o -n "$CURSES_PATH" -o -n "$ORACLE_PATH" -o -n "$AFP_PATH" -o -n "$MYSQL_PATH" ]; then
- XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib"
+ XLIBPATHS=""
fi
if [ -n "$SSL_PATH" ]; then
if [ -n "$SSLNEW" ]; then
@@ -972,16 +607,11 @@
if [ -n "$RESOLV_PATH" ]; then
XLIBS="$XLIBS -lresolv"
fi
-
-if [ -d /usr/kerberos/include ]; then
- XIPATHS="$XIPATHS -I/usr/kerberos/include"
-fi
-
if [ "X" = "X$PREFIX" ]; then
PREFIX="/usr/local"
fi
-if [ "X" = "X$XHYDRA_SUPPORT" ]; then
+if [ "X" = "X$XHYDRA_SUPPORT" -o "Xdisable" = "X$XHYDRA_SUPPORT" ]; then
XHYDRA_SUPPORT=""
else
XHYDRA_SUPPORT="xhydra"