From 1448e2486e9a2ad6cf6fa6d5ddbef203118b2c9b Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 6 Feb 2009 18:55:05 +0100
Subject: make all cflags and libs variables uppercase

pkg-config uses uppercase for its _CFLAGS and _LIBS variable names.
So we follow suit and convert all _cflags and _libs variables to
uppercase for more consistency.
---
 configure.ac | 72 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 36b1b4f8..03b1c76c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,14 +40,14 @@ AC_DEFINE_UNQUOTED([HOSTENV], "$host", [the host environment, can be queried via
 save_LIBS=$LIBS
 LIBS=
 AC_SEARCH_LIBS(clock_gettime, rt)
-rt_libs=$LIBS
+RT_LIBS=$LIBS
 LIBS=
 AC_SEARCH_LIBS(dlopen, dl)
-dl_libs=$LIBS
+DL_LIBS=$LIBS
 LIBS=$save_LIBS
 
-AC_SUBST(rt_libs)
-AC_SUBST(dl_libs)
+AC_SUBST(RT_LIBS)
+AC_SUBST(DL_LIBS)
 
 # Checks for header files.
 AC_HEADER_RESOLV
@@ -223,8 +223,8 @@ if test "$enable_zlib" = "yes"; then
 	if test "$zlib_header" = "yes"; then
 		AC_CHECK_LIB(z, deflate,
                         [AC_DEFINE(USE_NETZIP, 1, [Define if you want to enable zlib support]) 
-                         zlib_libs="-lz"
-                         AC_SUBST(zlib_libs)], enable_zlib="false")
+                         ZLIB_LIBS="-lz"
+                         AC_SUBST(ZLIB_LIBS)], enable_zlib="false")
 	fi
 fi
 
@@ -243,8 +243,8 @@ if test $want_gssapi_krb5 = yes; then
 		AC_CHECK_HEADER(gssapi/gssapi.h, [
 			AC_DEFINE(USE_GSSAPI,,
 				  Define if you want to use GSSAPI)
-			gss_libs="-lgssapi_krb5"
-			AC_SUBST(gss_libs)
+			GSS_LIBS="-lgssapi_krb5"
+			AC_SUBST(GSS_LIBS)
 		])
 	])
 fi
@@ -274,10 +274,10 @@ if test "x$enable_pthreads" != "xno"; then
         [pthread_create],
         [
           AC_DEFINE([USE_PTHREADS], [1], [Multithreading support enabled.])
-          pthreads_libs="-lpthread"
-          pthreads_cflags="-pthread"
-          AC_SUBST(pthreads_libs)
-          AC_SUBST(pthreads_cflags)
+          PTHREADS_LIBS="-lpthread"
+          PTHREADS_CFLAGS="-pthread"
+          AC_SUBST(PTHREADS_LIBS)
+          AC_SUBST(PTHREADS_CFLAGS)
         ],
         [AC_MSG_FAILURE([pthread is missing])],
         [-lpthread]
@@ -443,16 +443,16 @@ if test "x$enable_mysql" = "xyes"; then
   AC_CHECK_LIB(
     [mysqlclient],
     [mysql_init],
-    [mysql_cflags=`mysql_config --cflags`
-     mysql_libs=`mysql_config --libs`
+    [MYSQL_CFLAGS=`mysql_config --cflags`
+     MYSQL_LIBS=`mysql_config --libs`
     ],
     [AC_MSG_FAILURE([MySQL library is missing])],
     [`mysql_config --libs`]
   )
 fi
 AM_CONDITIONAL(ENABLE_MYSQL, test x$enable_mysql = xyes)
-AC_SUBST(mysql_cflags)
-AC_SUBST(mysql_libs)
+AC_SUBST(MYSQL_CFLAGS)
+AC_SUBST(MYSQL_LIBS)
 
 
 # PostgreSQL support
@@ -477,16 +477,16 @@ if test "x$enable_pgsql" = "xyes"; then
   AC_CHECK_LIB(
     [pq],
     [PQconnectdb],
-    [pgsql_cflags="-I`pg_config --includedir`"
-     pgsql_libs="-L`pg_config --libdir` -lpq"
+    [PGSQL_CFLAGS="-I`pg_config --includedir`"
+     PGSQL_LIBS="-L`pg_config --libdir` -lpq"
     ],
     [AC_MSG_FAILURE([PgSQL library is missing])],
     [-L`pg_config --libdir`]
   )
 fi
 AM_CONDITIONAL(ENABLE_PGSQL, test x$enable_pgsql = xyes)
-AC_SUBST(pgsql_cflags)
-AC_SUBST(pgsql_libs)
+AC_SUBST(PGSQL_CFLAGS)
+AC_SUBST(PGSQL_LIBS)
 
 
 # libdbi support
@@ -507,8 +507,8 @@ if test "x$enable_libdbi" = "xyes"; then
   AC_CHECK_LIB(
     [dbi],
     [dbi_initialize],
-    [libdbi_cflags=""
-     libdbi_libs="-ldbi"
+    [LIBDBI_CFLAGS=""
+     LIBDBI_LIBS="-ldbi"
     ],
     [AC_MSG_FAILURE([libdbi library is missing])]
   )
@@ -519,8 +519,8 @@ if test "x$enable_libdbi" = "xyes"; then
   )
 fi
 AM_CONDITIONAL(ENABLE_OMLIBDBI, test x$enable_libdbi = xyes)
-AC_SUBST(libdbi_cflags)
-AC_SUBST(libdbi_libs)
+AC_SUBST(LIBDBI_CFLAGS)
+AC_SUBST(LIBDBI_LIBS)
 
 
 # SNMP support
@@ -541,15 +541,15 @@ if test "x$enable_snmp" = "xyes"; then
   AC_CHECK_LIB(
     [netsnmp],
     [snmp_timeout],
-    [snmp_cflags=""
-     snmp_libs="-lnetsnmp"
+    [SNMP_CFLAGS=""
+     SNMP_LIBS="-lnetsnmp"
     ],
     [AC_MSG_FAILURE([Net-SNMP library is missing])]
   )
 fi
 AM_CONDITIONAL(ENABLE_SNMP, test x$enable_snmp = xyes)
-AC_SUBST(snmp_cflags)
-AC_SUBST(snmp_libs)
+AC_SUBST(SNMP_CFLAGS)
+AC_SUBST(SNMP_LIBS)
 
 
 # GNUtls support
@@ -578,16 +578,16 @@ if test "x$enable_gnutls" = "xyes"; then
   AC_CHECK_LIB(
     [gnutls],
     [gnutls_check_version],
-    [gnutls_cflags=`libgnutls-config --cflags`
-     gnutls_libs=`libgnutls-config --libs`
+    [GNUTLS_CFLAGS=`libgnutls-config --cflags`
+     GNUTLS_LIBS=`libgnutls-config --libs`
     ],
     [AC_MSG_FAILURE([GNU TLS library is missing])],
     [`libgnutls-config --libs`]
   )
 fi
 AM_CONDITIONAL(ENABLE_GNUTLS, test x$enable_gnutls = xyes)
-AC_SUBST(gnutls_cflags)
-AC_SUBST(gnutls_libs)
+AC_SUBST(GNUTLS_CFLAGS)
+AC_SUBST(GNUTLS_LIBS)
 
 
 # support for building the rsyslogd runtime
@@ -601,12 +601,12 @@ AC_ARG_ENABLE(rsyslogrt,
         [enable_rsyslogrt=yes]
 )
 if test "x$enable_rsyslogrt" = "xyes"; then
-  rsrt_cflags="-I\$(top_srcdir)/runtime -I\$(top_srcdir)"
-  rsrt_libs="\$(top_builddir)/runtime/librsyslog.la"
+  RSRT_CFLAGS="-I\$(top_srcdir)/runtime -I\$(top_srcdir)"
+  RSRT_LIBS="\$(top_builddir)/runtime/librsyslog.la"
 fi
 AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
-AC_SUBST(rsrt_cflags)
-AC_SUBST(rsrt_libs)
+AC_SUBST(RSRT_CFLAGS)
+AC_SUBST(RSRT_LIBS)
 
 
 # support for NOT building rsyslogd (useful for source-based packaging systems)
-- 
cgit