libgda3-configure.patch

   1 --- libgda-3.0.1/configure.in.orig      2007-04-24 23:13:22.000000000 +0200
   2 +++ libgda-3.0.1/configure.in   2007-05-13 22:19:38.395428965 +0200
   3 @@ -197,7 +197,7 @@
   4                 else
   5                         AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
   6                         BDB_CFLAGS="-I${bdbdir}/include"
   7 -                       BDB_LIBS="-L${bdbdir}/lib ${bdblib}"
   8 +                       BDB_LIBS="-L${libdir} ${bdblib}"
   9                 fi
  10         fi
  11  fi
  12 @@ -252,7 +252,7 @@
  13         else
  14                 AC_DEFINE(HAVE_ODBC, 1, [Have ODBC])
  15                 ODBC_CFLAGS="-I${odbcdir}/include"
  16 -               ODBC_LIBS="-L${odbcdir}/lib ${odbclib}"
  17 +               ODBC_LIBS="-L${libdir} ${odbclib}"
  18         fi
  19  fi
  20
  21 @@ -308,7 +308,7 @@
  22                 else
  23                         AC_DEFINE(HAVE_MYSQL, 1, [Have MySQL])
  24                         MYSQL_CFLAGS="-I${mysqldir}/include${mysqldir_suffix}"
  25 -                       MYSQL_LIBS="-L${mysqldir}/lib${mysqllibdir_suffix} -lmysqlclient"
  26 +                       MYSQL_LIBS="-L${libdir}${mysqllibdir_suffix} -lmysqlclient"
  27                 fi
  28         else
  29                 mysqldir=yes
  30 @@ -367,7 +367,7 @@
  31         else
  32                 AC_DEFINE(HAVE_MSQL, 1, [Have mSQL])
  33                 MSQL_CFLAGS="-I${msqldir}/include${msqldir_suffix}"
  34 -               MSQL_LIBS="-L${msqldir}/lib${msqllibdir_suffix} -lmsql"
  35 +               MSQL_LIBS="-L${libdir}${msqllibdir_suffix} -lmsql"
  36                  AC_MSG_CHECKING(for mSQL 3.x API)
  37                  AC_TRY_RUN([
  38                    #include "${msqldir}/include${msqldir_suffix}/msql.h"
  39 @@ -433,7 +433,7 @@
  40                         AC_MSG_WARN(Postgres include files not found, backend not used)
  41                         postgresdir=""
  42                 fi
  43 -               POSTGRES_LIBS="-L${postgresdir}/lib -lpq"
  44 +               POSTGRES_LIBS="-L${libdir} -lpq"
  45                 AC_DEFINE(HAVE_POSTGRES, 1, [Have PostgreSQL])
  46         fi
  47  fi
  48 @@ -482,7 +482,7 @@
  49                 AC_MSG_WARN(tds backend not used)
  50         else
  51                 AC_MSG_CHECKING(for freetds version)
  52 -               freetdsvercheck="`grep \"^#define \(VERSION_NO \|TDS_VERSION_NO \)\" $freetds_incdir/tdsver.h|sed 's|^.*".*v\(.*\)"|\1|'`"
  53 +               freetdsvercheck=$(grep "^#define \(VERSION_NO \|TDS_VERSION_NO \)" $freetds_incdir/tdsver.h|sed 's|^.*".*v\(.*\)"|\1|')
  54                 if test "x$freetdsvercheck" = "x"
  55                 then
  56                         AC_MSG_WARN(freetds version check failed - backend not used)
  57 @@ -491,7 +491,7 @@
  58                 else
  59                         AC_MSG_RESULT($freetdsvercheck)
  60                         FREETDS_CFLAGS="-I${freetds_incdir}"
  61 -                       FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
  62 +                       FREETDS_LIBS="-L${libdir} -ltds"
  63                         AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
  64
  65                         freetds_version_major="`echo $freetdsvercheck|sed 's:^\([[^.]]*\).*:\1:'`"
  66 @@ -568,7 +568,7 @@
  67                 AC_MSG_RESULT(found IBM DB2 in $ibmdb2dir)
  68                 AC_DEFINE(HAVE_IBMDB2, 1, [Have IBM DB2])
  69                 IBMDB2_CFLAGS="-DIBMDB2_DIR=\\\"${ibmdb2dir}\\\" -I${ibmdb2dir}/include"
  70 -               IBMDB2_LIBS="-L${ibmdb2dir}/${ibmdb2libdir} -Wl,-rpath,${ibmdb2dir}/${ibmdb2libdir} -ldb2"
  71 +               IBMDB2_LIBS="-L${ibmdb2dir}/${ibmdb2libdir} -Wl,-rpath,${libdir} -ldb2"
  72         fi
  73  fi
  74
  75 @@ -627,8 +627,8 @@
  76                 AC_MSG_CHECKING(for Sybase host system type)
  77                 AC_MSG_RESULT($host)
  78                 case "$host" in
  79 -               *linux*) sybase_ctlibs="-L${sybasedir}/lib -lct -lcs -lsybtcl -lcomn -lintl"
  80 -                       sybase_blklibs="-L${sybasedir}/lib -lblk ${sybase_ctlibs}"
  81 +               *linux*) sybase_ctlibs="-L${libdir} -lct -lcs -lsybtcl -lcomn -lintl"
  82 +                       sybase_blklibs="-L${libdir} -lblk ${sybase_ctlibs}"
  83                         SYBASE_LIBS="${SYBASE_LIBS} ${sybase_blklibs}"
  84                         AC_CHECK_LIB(ct,tdsdump_on,[
  85                         AC_MSG_WARN(linking against freetds libct)
  86 @@ -713,7 +713,7 @@
  87         else
  88                 AC_DEFINE(HAVE_ORACLE, 1, [Have ORACLE])
  89                 ORACLE_CFLAGS=" -I$oracledir/include/oracle/client -I$oracledir/rdbms/demo -I${ORACLE_HOME}/rdbms/public -I${ORACLE_HOME}/plsql/public -I$oracledir/network/public"
  90 -               ORACLE_LIBS="-L$oracledir/lib -lm -ldl -lclntsh"
  91 +               ORACLE_LIBS="-L${libdir} -lm -ldl -lclntsh"
  92         fi
  93  fi
  94
  95 @@ -823,13 +823,13 @@
  96                 FIREBIRD_CFLAGS="-I${firebirddir}/include"
  97                 if test -f $firebirddir/lib/libfbembed.so
  98                 then
  99 -                       FIREBIRD_LIBS="-L${firebirddir}/lib -lfbembed"
 100 +                       FIREBIRD_LIBS="-L${libdir} -lfbembed"
 101                 else
 102                         if test -f $firebirddir/lib/libfbclient.so
 103                         then
 104 -                               FIREBIRD_LIBS="-L${firebirddir}/lib -lfbclient"
 105 +                               FIREBIRD_LIBS="-L${libdir} -lfbclient"
 106                         else
 107 -                               FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
 108 +                               FIREBIRD_LIBS="-L${libdir} -lgds -ldl -lcrypt"
 109                         fi
 110                 fi
 111         fi
 112 @@ -789,7 +789,7 @@
 113                 AC_MSG_WARN(Xbase backend not used)
 114         else
 115                 XBASE_CFLAGS=-I${xbasedir}/include
 116 -               XBASE_LIBS="-L${xbasedir}/lib -lxbase"
 117 +               XBASE_LIBS="-L${libdir} -lxbase"
 118                 AC_DEFINE(HAVE_XBASE, 1, [Have Xbase])
 119         fi
 120  fi
 121 @@ -819,7 +819,7 @@
 122         mdbdir=""
 123         for d in $dir /usr /usr/local /opt/gnome
 124         do
 125 -               if test -f $d/include/mdbtools.h -a -f $d/$lib/libmdb$libext -o -f $d/include/mdbtools.h -a -f $d/$lib/libmdb.a
 126 +               if test -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdb$libext -o -f $d/include/mdb/mdbtools.h -a -f $d/$lib/libmdb.a
 127                 then
 128                         AC_MSG_RESULT(found MDB Tools in $d)
 129                         mdbdir=$d
 130 @@ -830,8 +830,8 @@
 131         then
 132                 AC_MSG_WARN(MDB backend not used)
 133         else
 134 -               MDB_CFLAGS=-I${mdbdir}/include
 135 +               MDB_CFLAGS=-I${mdbdir}/include/mdb
 136 -               MDB_LIBS="-L${mdbdir}/lib -lmdb"
 137 +               MDB_LIBS="-L${libdir} -lmdb"
 138                 AC_DEFINE(HAVE_MDB, 1, [Have MDB])
 139
 140                 save_CFLAGS="$CFLAGS"
 141 @@ -910,7 +910,7 @@
 142                 AC_MSG_WARN(LDAP backend not used)
 143         else
 144                 LDAP_CFLAGS="-I${ldapdir}/include"
 145 -               LDAP_LIBS="-L${ldapdir}/lib -lldap -llber"
 146 +               LDAP_LIBS="-L${libdir} -lldap -llber"
 147                 AC_DEFINE(HAVE_LDAP, 1, [Have LDAP])
 148         fi
 149  fi