Ticket #38453: patch-configure.diff

configure

@@ -261 +261 @@
     PCRE_PATH=""
     PCRE_IPATH=""
 fi
-
+#@@CUT_POSTGRES
 echo "Checking for Postgres (libpq.so, libpq-fe.h) ..."
 for i in $LIBDIRS ; do
     if [ "X" = "X$POSTGRES_PATH" ]; then
@@ -307 +307 @@
     POSTGRES_PATH=""
     POSTGRES_IPATH=""
 fi
-
+#CUT_POSTGRES@@
+#@@CUT_SVN
 echo "Checking for SVN (libsvn_client-1 libapr-1.so libaprutil-1.so) ..."
 for i in $LIBDIRS ; do
     if [ "X" = "X$SVN_PATH" ]; then
@@ -383 +384 @@
 if [ "X" = "X$SVN_PATH" -o "X" = "X$APR_PATH" ]; then
     echo "                                                               ... NOT found, module svn disabled"
 fi
-
+#CUT_SVN@@
+#@@CUT_FB
 echo "Checking for firebird (libfbclient.so) ..."
 for i in $LIBDIRS ; do
     if [ "X" = "X$FIREBIRD_PATH" ]; then
@@ -419 +421 @@
     FIREBIRD_PATH=""
     FIREBIRD_IPATH=""
 fi
-
+#CUT_FB@@
+#@@CUT_MYSQLA
 echo "Checking for MYSQL client (libmysqlclient.so, math.h) ..."
 for i in $LIBDIRS ; do
     if [ "X" = "X$MYSQL_PATH" ]; then
@@ -447 +450 @@
         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
@@ -459 +464 @@
    fi
 else
       echo "                                       ... math.h not found, module Mysql disabled"
+#CUT_MYSQLB@@
 fi
+#@@CUT_AFP
 echo "Checking for AFP (libafpclient.so) ..."
 for i in $LIBDIRS ; do
     if [ "X" = "X$AFP_PATH" ]; then
@@ -495 +502 @@
     AFP_PATH=""
     AFP_IPATH=""
 fi
-
+#CUT_AFP@@
+#@@CUT_NCP
 echo "Checking for NCP (libncp.so / nwcalls.h) ..."
 for i in $LIBDIRS ; do
     if [ "X" = "X$NCP_PATH" ]; then
@@ -531 +539 @@
     NCP_PATH=""
     NCP_IPATH=""
 fi
-
+#CUT_NCP@@
+#@@CUT_SAP
 echo "Checking for SAP/R3 (librfc/saprfc.h) ..."
 for i in $LIBDIRS  ; do
     if [ "X" = "X$SAPR3_PATH" ]; then
@@ -569 +578 @@
 if [ "$SAPR3_IPATH" = "/usr/include" ]; then
     SAPR3_IPATH=""
 fi
-
+#CUT_SAP@@
 echo "Checking for libssh (libssh/libssh.h) ..."
 for i in $LIBDIRS ; do
     if [ "X" = "X$SSH_PATH" ]; then
@@ -650 +659 @@
   done
 fi
 
-
+#@@CUT_ORACLE
 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
@@ -743 +752 @@
     ORACLE_PATH=""
     ORACLE_IPATH=""
 fi
-
+#CUT_ORACLE@@
 
 if [ "X" = "X$XHYDRA_SUPPORT" ]; then
     echo "Checking for GUI req's (pkg-config, gtk+-2.0) ..."
@@ -938 +947 @@
 if [ -n "$RESOLV_PATH" ]; then
     XLIBS="$XLIBS -lresolv"
 fi
-
+#@@CUT_KRB
 if [ -d /usr/kerberos/include ]; then
   XIPATHS="$XIPATHS -I/usr/kerberos/include"
 fi
-
+#CUT_KRB@@
 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"