Revert "Use -lq.1 -lcompat.1 as shared libraries instead of linking with -lingres...

This reverts commit 58bf155b833be0693c7d71afe83d7041b25a1845.

diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4
index 7e75263f0aa595a29ab8ef13ce12c9bd4a0bf245..892447f6b272f3b55d95c7e9f620230a7d0d902b 100644 (file)
--- a/bacula/autoconf/bacula-macros/db.m4
+++ b/bacula/autoconf/bacula-macros/db.m4
@@ -565,7 +565,7 @@ AC_HELP_STRING([--with-ingres@<:@=DIR@:>@], [Include Ingres support. DIR is the
         fi
      fi
      SQL_INCLUDE=-I$INGRES_INCDIR
-     SQL_LFLAGS="-L$INGRES_LIBDIR -lq.1 -lcompat.1"
+     SQL_LFLAGS="-L$INGRES_LIBDIR -lingres"
      SQL_BINDIR=$INGRES_BINDIR
      SQL_LIB=$INGRES_LIBDIR/libingres.a
      AC_DEFINE(HAVE_INGRES, 1, [Set if have Ingres Database])

diff --git a/bacula/configure b/bacula/configure
index 7c469dfe8d8d29273bba16440e9d973fcfc4dd6a..ffb4b3e4f8b98fcb61af7a946ccaadd5ddf9289c 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -28522,7 +28522,7 @@ echo "$as_me: error: Invalid Ingres directory $withval - unable to find Ingres h
         fi
      fi
      SQL_INCLUDE=-I$INGRES_INCDIR
-     SQL_LFLAGS="-L$INGRES_LIBDIR -lq.1 -lcompat.1"
+     SQL_LFLAGS="-L$INGRES_LIBDIR -lingres"
      SQL_BINDIR=$INGRES_BINDIR
      SQL_LIB=$INGRES_LIBDIR/libingres.a
 

diff --git a/bacula/src/cats/myingres.c b/bacula/src/cats/myingres.c
index 24b98ea4e18ded56e0a2853c30f1150138bcdf0a..48a797a66df2de4c4f1679692f75a5308646c713 100644 (file)
--- a/bacula/src/cats/myingres.c
+++ b/bacula/src/cats/myingres.c
@@ -32,21 +32,13 @@
 #include <eqpname.h>
 #include <eqdefcc.h>
 #include <eqsqlca.h>
+IISQLCA *IIsqlca();
+#define sqlca (*(IIsqlca()))
 #include <eqsqlda.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include "myingres.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-IISQLCA *IIsqlca();
-#ifdef __cplusplus
-}
-#endif
-#define sqlca (*(IIsqlca()))
-
 /*
  * ---Implementations---
  */