From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 27 Mar 2010 16:23:58 +0000 (+0100)
Subject: Tweak Ingres ./configure
X-Git-Tag: Release-7.0.0~2031
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a71e51142e391f2e6d252e6fe8839fd5f7379ecb;p=bacula%2Fbacula

Tweak Ingres ./configure
---

diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4
index f0cae93a90..892447f6b2 100644
--- a/bacula/autoconf/bacula-macros/db.m4
+++ b/bacula/autoconf/bacula-macros/db.m4
@@ -422,7 +422,7 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the My
     SQL_BINDIR=$MYSQL_BINDIR
     SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a
 
-    AC_DEFINE(HAVE_MYSQL, 1, [Set if you have an Ingres Database])
+    AC_DEFINE(HAVE_MYSQL, 1, [Set if you have an MySQL Database])
     AC_MSG_RESULT(yes)
     db_found=yes
     support_mysql=yes
@@ -549,7 +549,7 @@ AC_HELP_STRING([--with-ingres@<:@=DIR@:>@], [Include Ingres support. DIR is the
         elif test -f ${II_SYSTEM}/ingres/files/eqdefc.h; then
            INGRES_INCDIR=${II_SYSTEM}/ingres/files
            INGRES_LIBDIR=${II_SYSTEM}/ingres/lib
-           INGRES_BINDIR=${II_SYSTEM}/bin      
+           INGRES_BINDIR=${II_SYSTEM}/ingres/bin      
         else
            AC_MSG_RESULT(no)
            AC_MSG_ERROR(Unable to find eqdefc.h in standard locations)
@@ -561,7 +561,7 @@ AC_HELP_STRING([--with-ingres@<:@=DIR@:>@], [Include Ingres support. DIR is the
            INGRES_BINDIR=$withval/bin
         else
            AC_MSG_RESULT(no)
-           AC_MSG_ERROR(Invalid Ingres directory $withval - unable to find sqlite3.h under $withval)
+           AC_MSG_ERROR(Invalid Ingres directory $withval - unable to find Ingres headers under $withval)
         fi
      fi
      SQL_INCLUDE=-I$INGRES_INCDIR