diff options
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | configure.ac | 8 |
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 | |||
39 | 39 | ||
40 | ACLOCAL_AMFLAGS = -I m4 | 40 | ACLOCAL_AMFLAGS = -I m4 |
41 | 41 | ||
42 | if HAVE_UNCRUSTIFY | 42 | if HAVE_UNCRUSTIFY_BINARY |
43 | pretty: | 43 | pretty: |
44 | find $(top_srcdir) -type f ! -path '*/.*' ! -path '*/_*' -name '*.c' -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir) --replace --no-backup 2>&1 || true | 44 | 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 |
45 | endif | 45 | 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"], | |||
315 | 315 | ||
316 | 316 | ||
317 | # uncrustify | 317 | # uncrustify |
318 | AC_PATH_TARGET_TOOL(VAR_UNCRUSTIFY_BINARY, uncrustify, false) | 318 | # TODO: maybe add flag to pass location |
319 | 319 | AC_CHECK_PROG(UNCRUSTIFY_BINARY, uncrustify, true) | |
320 | AS_IF([test x"$VAR_UNCRUSTIFY_BINARY" != x"false"], | 320 | AM_CONDITIONAL(HAVE_UNCRUSTIFY_BINARY, $UNCRUSTIFY_BINARY) |
321 | [AC_DEFINE_UNQUOTED([HAVE_UNCRUSTIFY], "$VAR_UNCRUSTIFY_BINARY", [Path to uncrustify binary])], | ||
322 | [AC_MSG_WARN([warning: 'uncrustify' binary not found.])]) | ||
323 | 321 | ||
324 | 322 | ||
325 | AC_CHECK_MEMBER(struct tm.tm_gmtoff, | 323 | AC_CHECK_MEMBER(struct tm.tm_gmtoff, |