From 2c3dbe92b5eab4702ced403e4f6c030249a308c2 Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Thu, 31 Mar 2016 08:45:19 +0200 Subject: ulogd: fix indentation in acinclude.m4 Some imbricated tests were not indented. Signed-off-by: Eric Leblond --- acinclude.m4 | 136 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 66 insertions(+), 70 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index bd21255..8388c45 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -45,43 +45,41 @@ do done if test "$PQINCPATH" = ""; then - -if test "$pg_prefix" != ""; then - AC_MSG_CHECKING([for PostgreSQL includes in $pg_prefix/include]) - if test -f "$pg_prefix/include/libpq-fe.h" ; then - PQINCPATH="-I$pg_prefix/include" - AC_MSG_RESULT([yes]) - else - AC_MSG_WARN(libpq-fe.h not found) - fi - AC_MSG_CHECKING([for PostgreSQL libraries in $pg_prefix/lib]) - if test -f "$pg_prefix/lib/libpq.so" ; then - PQLIBPATH="-L$pg_prefix/lib" - AC_MSG_RESULT([yes]) + if test "$pg_prefix" != ""; then + AC_MSG_CHECKING([for PostgreSQL includes in $pg_prefix/include]) + if test -f "$pg_prefix/include/libpq-fe.h" ; then + PQINCPATH="-I$pg_prefix/include" + AC_MSG_RESULT([yes]) + else + AC_MSG_WARN(libpq-fe.h not found) + fi + AC_MSG_CHECKING([for PostgreSQL libraries in $pg_prefix/lib]) + if test -f "$pg_prefix/lib/libpq.so" ; then + PQLIBPATH="-L$pg_prefix/lib" + AC_MSG_RESULT([yes]) + else + AC_MSG_WARN(libpq.so not found) + fi else - AC_MSG_WARN(libpq.so not found) + if test "$pg_inc" != ""; then + AC_MSG_CHECKING([for PostgreSQL includes in $pg_inc]) + if test -f "$pg_inc/libpq-fe.h" ; then + PQINCPATH="-I$pg_inc" + AC_MSG_RESULT([yes]) + else + AC_MSG_WARN(libpq-fe.h not found) + fi + fi + if test "$pg_lib" != ""; then + AC_MSG_CHECKING([for PostgreSQL libraries in $pg_lib]) + if test -f "$pg_lib/libpq.so" ; then + PQLIBPATH="-L$pg_lib" + AC_MSG_RESULT([yes]) + else + AC_MSG_WARN(libpq.so not found) + fi + fi fi -else - if test "$pg_inc" != ""; then - AC_MSG_CHECKING([for PostgreSQL includes in $pg_inc]) - if test -f "$pg_inc/libpq-fe.h" ; then - PQINCPATH="-I$pg_inc" - AC_MSG_RESULT([yes]) - else - AC_MSG_WARN(libpq-fe.h not found) - fi - fi - if test "$pg_lib" != ""; then - AC_MSG_CHECKING([for PostgreSQL libraries in $pg_lib]) - if test -f "$pg_lib/libpq.so" ; then - PQLIBPATH="-L$pg_lib" - AC_MSG_RESULT([yes]) - else - AC_MSG_WARN(libpq.so not found) - fi - fi -fi - fi if test "$PQINCPATH" = "" ; then @@ -140,43 +138,41 @@ do done if test "$MYSQL_INC" = ""; then - -if test "$my_prefix" != ""; then - AC_MSG_CHECKING([for MySQL includes in $my_prefix/include]) - if test -f "$my_prefix/include/mysql.h" ; then - MYSQL_INC="-I$my_prefix/include" - AC_MSG_RESULT([yes]) - else - AC_MSG_WARN(mysql.h not found) - fi - AC_MSG_CHECKING([for MySQL libraries in $my_prefix/lib]) - if test -f "$my_prefix/lib/libmysql.so" ; then - MYSQL_LIB="-L$my_prefix/lib -lmysqlclient" - AC_MSG_RESULT([yes]) + if test "$my_prefix" != ""; then + AC_MSG_CHECKING([for MySQL includes in $my_prefix/include]) + if test -f "$my_prefix/include/mysql.h" ; then + MYSQL_INC="-I$my_prefix/include" + AC_MSG_RESULT([yes]) + else + AC_MSG_WARN(mysql.h not found) + fi + AC_MSG_CHECKING([for MySQL libraries in $my_prefix/lib]) + if test -f "$my_prefix/lib/libmysql.so" ; then + MYSQL_LIB="-L$my_prefix/lib -lmysqlclient" + AC_MSG_RESULT([yes]) + else + AC_MSG_WARN(libmysqlclient.so not found) + fi else - AC_MSG_WARN(libmysqlclient.so not found) + if test "$my_inc" != ""; then + AC_MSG_CHECKING([for MySQL includes in $my_inc]) + if test -f "$my_inc/mysql.h" ; then + MYSQL_INC="-I$my_inc" + AC_MSG_RESULT([yes]) + else + AC_MSG_WARN(mysql.h not found) + fi + fi + if test "$my_lib" != ""; then + AC_MSG_CHECKING([for MySQL libraries in $my_lib]) + if test -f "$my_lib/libmysqlclient.so" ; then + MYSQL_LIB="-L$my_lib -lmysqlclient" + AC_MSG_RESULT([yes]) + else + AC_MSG_WARN(libmysqlclient.so not found) + fi + fi fi -else - if test "$my_inc" != ""; then - AC_MSG_CHECKING([for MySQL includes in $my_inc]) - if test -f "$my_inc/mysql.h" ; then - MYSQL_INC="-I$my_inc" - AC_MSG_RESULT([yes]) - else - AC_MSG_WARN(mysql.h not found) - fi - fi - if test "$my_lib" != ""; then - AC_MSG_CHECKING([for MySQL libraries in $my_lib]) - if test -f "$my_lib/libmysqlclient.so" ; then - MYSQL_LIB="-L$my_lib -lmysqlclient" - AC_MSG_RESULT([yes]) - else - AC_MSG_WARN(libmysqlclient.so not found) - fi - fi -fi - fi if test "$MYSQL_INC" = "" ; then -- cgit v1.2.3