Backport changes for Windows compiling

[bacula/bacula] / bacula / src / win32 / compat / winconfig.h

diff --git a/bacula/src/win32/compat/winconfig.h b/bacula/src/win32/compat/winconfig.h
index 9433159add39d58bd2d0784fcb267b81f0067a17..be02604bf1c35c7045680e6e995521cba3ee4332 100644 (file)
--- a/bacula/src/win32/compat/winconfig.h
+++ b/bacula/src/win32/compat/winconfig.h
@@ -41,8 +41,8 @@
 /* Define if you want to use embedded MySQL */
 /* #undef HAVE_EMBEDDED_MYSQL */
 
-/* Define if you want to use SQLite */
-/* #undef HAVE_SQLITE */
+/* Define if you want to use SQLite3 */
+/* #undef HAVE_SQLITE3 */
 
 /* Define if you want to use Berkeley DB */
 /* #undef HAVE_BERKELEY_DB */
@@ -51,34 +51,6 @@
 /* Define if you want to use PostgreSQL */
 /* #undef HAVE_PGSQL */
 
-/* Define if you want to use mSQL */
-/* #undef HAVE_MSQL */
-
-/* Define if you want to use iODBC */
-/* #undef HAVE_IODBC */
-
-/* Define if you want to use unixODBC */
-/* #undef HAVE_UNIXODBC */
-
-/* Define if you want to use Solid SQL Server */
-/* #undef HAVE_SOLID */
-
-/* Define if you want to use OpenLink ODBC (Virtuoso) */
-/* #undef HAVE_VIRT */
-
-/* Define if you want to use EasySoft ODBC */
-/* #undef HAVE_EASYSOFT */
-
-/* Define if you want to use Interbase SQL Server */
-/* #undef HAVE_IBASE */
-
-/* Define if you want to use Oracle 8 SQL Server */
-/* #undef HAVE_ORACLE8 */
-
-/* Define if you want to use Oracle 7 SQL Server */
-/* #undef HAVE_ORACLE7 */
-
-
 /* ------------------------------------------------------------------------- */
 /* --                     CONFIGURE DETECTED FEATURES                     -- */
 /* ------------------------------------------------------------------------- */
@@ -134,10 +106,6 @@
 #define HAVE_UTIME_H 1
 #endif
 
-#if (HAVE_MYSQL||HAVE_PGSQL||HAVE_MSQL||HAVE_IODBC||HAVE_UNIXODBC||HAVE_SOLID||HAVE_VIRT||HAVE_IBASE||HAVE_ORACLE8||HAVE_ORACLE7||HAVE_EASYSOFT)
-#define HAVE_SQL
-#endif
-
 /* Data types */
 #define HAVE_U_INT 1
 #define HAVE_INTXX_T 1