Ticket #38453: patch-configure.diff

File patch-configure.diff, 3.1 KB (added by zan@…, 12 years ago)
  • configure

    old new  
    261261    PCRE_PATH=""
    262262    PCRE_IPATH=""
    263263fi
    264 
     264#@@CUT_POSTGRES
    265265echo "Checking for Postgres (libpq.so, libpq-fe.h) ..."
    266266for i in $LIBDIRS ; do
    267267    if [ "X" = "X$POSTGRES_PATH" ]; then
     
    307307    POSTGRES_PATH=""
    308308    POSTGRES_IPATH=""
    309309fi
    310 
     310#CUT_POSTGRES@@
     311#@@CUT_SVN
    311312echo "Checking for SVN (libsvn_client-1 libapr-1.so libaprutil-1.so) ..."
    312313for i in $LIBDIRS ; do
    313314    if [ "X" = "X$SVN_PATH" ]; then
     
    383384if [ "X" = "X$SVN_PATH" -o "X" = "X$APR_PATH" ]; then
    384385    echo "                                                               ... NOT found, module svn disabled"
    385386fi
    386 
     387#CUT_SVN@@
     388#@@CUT_FB
    387389echo "Checking for firebird (libfbclient.so) ..."
    388390for i in $LIBDIRS ; do
    389391    if [ "X" = "X$FIREBIRD_PATH" ]; then
     
    419421    FIREBIRD_PATH=""
    420422    FIREBIRD_IPATH=""
    421423fi
    422 
     424#CUT_FB@@
     425#@@CUT_MYSQLA
    423426echo "Checking for MYSQL client (libmysqlclient.so, math.h) ..."
    424427for i in $LIBDIRS ; do
    425428    if [ "X" = "X$MYSQL_PATH" ]; then
     
    447450        fi
    448451    fi
    449452done
     453#CUT_MYSQLA@@
    450454MATH=""
    451455if [ -f "/usr/include/math.h" ]; then
    452456   MATH="-DHAVE_MATH_H"
     457#@@CUT_MYSQLB
    453458   if [ -n "$MYSQL_PATH" -a -n "$MYSQL_IPATH" -a -n "$MATH" ]; then
    454459      echo "                                                      ... found"
    455460   else
     
    459464   fi
    460465else
    461466      echo "                                       ... math.h not found, module Mysql disabled"
     467#CUT_MYSQLB@@
    462468fi
     469#@@CUT_AFP
    463470echo "Checking for AFP (libafpclient.so) ..."
    464471for i in $LIBDIRS ; do
    465472    if [ "X" = "X$AFP_PATH" ]; then
     
    495502    AFP_PATH=""
    496503    AFP_IPATH=""
    497504fi
    498 
     505#CUT_AFP@@
     506#@@CUT_NCP
    499507echo "Checking for NCP (libncp.so / nwcalls.h) ..."
    500508for i in $LIBDIRS ; do
    501509    if [ "X" = "X$NCP_PATH" ]; then
     
    531539    NCP_PATH=""
    532540    NCP_IPATH=""
    533541fi
    534 
     542#CUT_NCP@@
     543#@@CUT_SAP
    535544echo "Checking for SAP/R3 (librfc/saprfc.h) ..."
    536545for i in $LIBDIRS  ; do
    537546    if [ "X" = "X$SAPR3_PATH" ]; then
     
    569578if [ "$SAPR3_IPATH" = "/usr/include" ]; then
    570579    SAPR3_IPATH=""
    571580fi
    572 
     581#CUT_SAP@@
    573582echo "Checking for libssh (libssh/libssh.h) ..."
    574583for i in $LIBDIRS ; do
    575584    if [ "X" = "X$SSH_PATH" ]; then
     
    650659  done
    651660fi
    652661
    653 
     662#@@CUT_ORACLE
    654663echo "Checking for Oracle (libocci.so libclntsh.so / oci.h and libaio.so) ..."
    655664#assume if we find oci.h other headers should also be in that dir
    656665#for libs we will test the 2
     
    743752    ORACLE_PATH=""
    744753    ORACLE_IPATH=""
    745754fi
    746 
     755#CUT_ORACLE@@
    747756
    748757if [ "X" = "X$XHYDRA_SUPPORT" ]; then
    749758    echo "Checking for GUI req's (pkg-config, gtk+-2.0) ..."
     
    938947if [ -n "$RESOLV_PATH" ]; then
    939948    XLIBS="$XLIBS -lresolv"
    940949fi
    941 
     950#@@CUT_KRB
    942951if [ -d /usr/kerberos/include ]; then
    943952  XIPATHS="$XIPATHS -I/usr/kerberos/include"
    944953fi
    945 
     954#CUT_KRB@@
    946955if [ "X" = "X$PREFIX" ]; then
    947956    PREFIX="/usr/local"
    948957fi
    949958
    950 if [ "X" = "X$XHYDRA_SUPPORT" ]; then
     959if [ "X" = "X$XHYDRA_SUPPORT" -o "Xdisable" = "X$XHYDRA_SUPPORT" ]; then
    951960    XHYDRA_SUPPORT=""
    952961else
    953962    XHYDRA_SUPPORT="xhydra"