summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-10-14 14:06:58 +0000
committerng0 <ng0@n0.is>2019-10-14 14:06:58 +0000
commitdc57bfc9ab69749453269c9bfce354a6c63a4648 (patch)
tree565258d6c196166c5db78b4fa93addd36ae8450d
parent9747dddefba25dc3f3c3c39bfb55a5f4082ed856 (diff)
fix the previous uncrustify commit.
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac8
2 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index f2b48b358..e8bd98da1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ doc_DATA = COPYING README
ACLOCAL_AMFLAGS = -I m4
-if HAVE_UNCRUSTIFY
+if HAVE_UNCRUSTIFY_BINARY
pretty:
- find $(top_srcdir) -type f ! -path '*/.*' ! -path '*/_*' -name '*.c' -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir) --replace --no-backup 2>&1 || true
+ find $(top_srcdir) -type f -name '*.c' -or -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir)/contrib/uncrustify.cfg --replace --no-backup 2>&1 || true
endif
diff --git a/configure.ac b/configure.ac
index e486a893d..5ca5f55d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -315,11 +315,9 @@ AS_IF([test x"$VAR_UPNPC_BINARY" != x"false"],
# uncrustify
-AC_PATH_TARGET_TOOL(VAR_UNCRUSTIFY_BINARY, uncrustify, false)
-
-AS_IF([test x"$VAR_UNCRUSTIFY_BINARY" != x"false"],
- [AC_DEFINE_UNQUOTED([HAVE_UNCRUSTIFY], "$VAR_UNCRUSTIFY_BINARY", [Path to uncrustify binary])],
- [AC_MSG_WARN([warning: 'uncrustify' binary not found.])])
+# TODO: maybe add flag to pass location
+AC_CHECK_PROG(UNCRUSTIFY_BINARY, uncrustify, true)
+AM_CONDITIONAL(HAVE_UNCRUSTIFY_BINARY, $UNCRUSTIFY_BINARY)
AC_CHECK_MEMBER(struct tm.tm_gmtoff,