From 341af8bcd0a7683b6c17ca23f1028ae47a9cf4c5 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 11 Oct 2007 12:53:40 +0000
Subject: - changed the build system to use a single source tarball again (but 
    different makefiles for the main project and ommysql) - applied fixes from
 Michael Biebl: 1.) fix failing compilation of ommysql plugin    
 (s/ommysql-config.h/config.h/) 2.) fix mysql configure check (although the
 default is no, we did check for     the mysql devel files) 3.) Create a
 separate Makefile.am for the doc files. This cleans up the     toplevel
 Makefile.am considerably and makes it much more readable and    
 maintainable. 3b) Assign the html doc files to html_DATA. This means, they
 are installed     to $(hmtdir), which by autoconf standards is    
 $(prefix)/share/doc/$packagename/. 4.) Reformat the SOURCES line to make it
 better readable and maintainable.

---
 plugins/ommysql/Makefile.am  |  8 ++++----
 plugins/ommysql/configure.ac | 48 --------------------------------------------
 plugins/ommysql/ommysql.c    |  2 +-
 3 files changed, 5 insertions(+), 53 deletions(-)
 delete mode 100644 plugins/ommysql/configure.ac

(limited to 'plugins/ommysql')

diff --git a/plugins/ommysql/Makefile.am b/plugins/ommysql/Makefile.am
index 48987838..f388d1a9 100644
--- a/plugins/ommysql/Makefile.am
+++ b/plugins/ommysql/Makefile.am
@@ -1,9 +1,9 @@
 pkglibdir = $(libdir)/rsyslog
 pkglib_LTLIBRARIES = ommysql.la
 
-ommysql_la_SOURCES=ommysql.c ommysql.h
-ommysql_la_CPPFLAGS=$(mysql_cflags) -I$(srcdir)/../..
-ommysql_la_LDFLAGS=-module -avoid-version
-ommysql_la_LIBADD=$(mysql_libs)
+ommysql_la_SOURCES = ommysql.c ommysql.h
+ommysql_la_CPPFLAGS = $(mysql_cflags) -I$(srcdir)/../..
+ommysql_la_LDFLAGS = -module -avoid-version
+ommysql_la_LIBADD = $(mysql_libs)
 
 EXTRA_DIST = createDB.sql contrib/delete_mysql 
diff --git a/plugins/ommysql/configure.ac b/plugins/ommysql/configure.ac
deleted file mode 100644
index 57d92e7c..00000000
--- a/plugins/ommysql/configure.ac
+++ /dev/null
@@ -1,48 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.61)
-AC_INIT([rsyslog-ommysql],[1.19.8],[rsyslog@lists.adiscon.com.])
-AM_INIT_AUTOMAKE([foreign])
-AC_CONFIG_SRCDIR([ommysql.c])
-AC_CONFIG_HEADER([ommysql-config.h])
-
-# Checks for programs.
-AC_PROG_CC
-AM_PROG_CC_C_O
-if test "$GCC" = "yes"
-then CFLAGS="$CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -g"
-fi
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-AC_CANONICAL_HOST
-
-# Checks for libraries.
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h string.h syslog.h sys/param.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-
-# Checks for library functions.
-
-# SQL support
-AC_CHECK_HEADERS(
-  [mysql/mysql.h],,
-  [AC_MSG_FAILURE([MySQL headers are missing])]
-)
-AC_SEARCH_LIBS(
-  [mysql_init],
-  [mysqlclient],
-  [mysql_cflags=`mysql_config --cflags`
-   mysql_libs=`mysql_config --libs`
-  ],
-  [AC_MSG_FAILURE([MySQL library is missing])],
-  [`mysql_config --libs`]
-)
-AC_SUBST(mysql_cflags)
-AC_SUBST(mysql_libs)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/plugins/ommysql/ommysql.c b/plugins/ommysql/ommysql.c
index 0f7a9b9c..477da213 100644
--- a/plugins/ommysql/ommysql.c
+++ b/plugins/ommysql/ommysql.c
@@ -24,7 +24,7 @@
  *
  * A copy of the GPL can be found in the file "COPYING" in this distribution.
  */
-#include "ommysql-config.h"
+#include "config.h"
 #include "rsyslog.h"
 #include <stdio.h>
 #include <stdarg.h>
-- 
cgit