[libgda] M4 macros corrections



commit 96eaa1fab3af574e8b9e6c082947d74dd75b4a98
Author: Vivien Malerba <malerba gnome-db org>
Date:   Wed Oct 6 15:06:44 2010 +0200

    M4 macros corrections

 m4/bdb.m4        |    2 +-
 m4/mdbtools.m4   |    2 +-
 m4/mysql.m4      |    2 +-
 m4/oracle.m4     |    6 ++----
 m4/postgresql.m4 |    4 ++--
 5 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/m4/bdb.m4 b/m4/bdb.m4
index 7cdf663..f481dad 100644
--- a/m4/bdb.m4
+++ b/m4/bdb.m4
@@ -12,7 +12,7 @@ dnl
 dnl   This macro tries to find the Bdb libraries and header files. If the BDB setup is found
 dnl   then it also tries to find the SQL extension to BDB (starting from version 5.0)
 dnl
-dnl   It defined two options:
+dnl   It defines two options:
 dnl   --with-bdb=yes/no/<directory>
 dnl   --with-bdb-libdir-name=<dir. name>
 dnl
diff --git a/m4/mdbtools.m4 b/m4/mdbtools.m4
index e64f053..7931fc7 100644
--- a/m4/mdbtools.m4
+++ b/m4/mdbtools.m4
@@ -15,7 +15,7 @@ dnl DESCRIPTION
 dnl
 dnl   This macro tries to find the MDBTools libraries and header files
 dnl
-dnl   It defined two options:
+dnl   It defines two options:
 dnl   --with-mdb=yes/no/<directory>
 dnl   --with-mdb-libdir-name=<dir. name>
 dnl
diff --git a/m4/mysql.m4 b/m4/mysql.m4
index 2b677cb..f14c9c5 100644
--- a/m4/mysql.m4
+++ b/m4/mysql.m4
@@ -11,7 +11,7 @@ dnl DESCRIPTION
 dnl
 dnl   This macro tries to find the Mysql libraries and header files
 dnl
-dnl   It defined two options:
+dnl   It defines two options:
 dnl   --with-mysql=yes/no/<directory>
 dnl   --with-mysql-libdir-name=<dir. name>
 dnl
diff --git a/m4/oracle.m4 b/m4/oracle.m4
index fd0d99a..2d4c094 100644
--- a/m4/oracle.m4
+++ b/m4/oracle.m4
@@ -9,10 +9,9 @@ dnl   [libdirname]: defaults to "lib". Can be overridden by the --with-oracle-li
 dnl
 dnl DESCRIPTION
 dnl
-dnl   This macro tries to find the Oracle libraries and header files. If the ORACLE setup is found
-dnl   then it also tries to find the SQL extension to ORACLE (starting from version 5.0)
+dnl   This macro tries to find the Oracle libraries and header files.
 dnl
-dnl   It defined two options:
+dnl   It defines two options:
 dnl   --with-oracle=yes/no/<directory>
 dnl   --with-oracle-libdir-name=<dir. name>
 dnl
@@ -73,7 +72,6 @@ m4_define([_ORACLE_CHECK_INTERNAL],
     fi
 
     # determine if Oracle should be searched for
-    # and use pkg-config if the "yes" option is used
     oracle_found=no
     try_oracle=true
     ORACLE_LIBS=""
diff --git a/m4/postgresql.m4 b/m4/postgresql.m4
index a21c1f6..9492122 100644
--- a/m4/postgresql.m4
+++ b/m4/postgresql.m4
@@ -11,7 +11,7 @@ dnl DESCRIPTION
 dnl
 dnl   This macro tries to find the PostgreSQL libraries and header files
 dnl
-dnl   It defined two options:
+dnl   It defines two options:
 dnl   --with-postgres=yes/no/<directory>
 dnl   --with-postgres-libdir-name=<dir. name>
 dnl
@@ -157,7 +157,7 @@ int main() {
 	        for d in $postgres_test_dir
 	        do
 	            AC_MSG_NOTICE([checking for pg_config tool in $d])
-                    AC_PATH_PROGS(PG_CONFIG, pg_config,,[$d])
+                    AC_PATH_PROGS(PG_CONFIG, pg_config,,[$d/bin])
 		    if test "x$PG_CONFIG" != x
 		    then
 	    	        pkgpostgres=yes



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]