From 341fd49b42855e5b197ecfd98bafc66e65eccfa8 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 14 Oct 2019 12:10:35 +0000 Subject: 'make pretty' rule using uncrustify, detect uncrustify in configure script. closes #5904 --- Makefile.am | 5 +++++ configure.ac | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/Makefile.am b/Makefile.am index d69dd3a82..f2b48b358 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,3 +38,8 @@ docdir = $(datadir)/doc/gnunet/ doc_DATA = COPYING README ACLOCAL_AMFLAGS = -I m4 + +if HAVE_UNCRUSTIFY +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 +endif diff --git a/configure.ac b/configure.ac index 7af7e83df..e486a893d 100644 --- a/configure.ac +++ b/configure.ac @@ -313,6 +313,15 @@ AS_IF([test x"$VAR_UPNPC_BINARY" != x"false"], [AC_DEFINE_UNQUOTED([UPNPC], "$VAR_UPNPC_BINARY", [Path to upnpc binary])], [AC_MSG_WARN([warning: 'upnpc' binary not found.])]) + +# 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.])]) + + AC_CHECK_MEMBER(struct tm.tm_gmtoff, [AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if struct tm has the tm_gmtoff member.])], -- cgit v1.2.3