summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-10-14 12:10:35 +0000
committerng0 <ng0@n0.is>2019-10-14 12:10:35 +0000
commit341fd49b42855e5b197ecfd98bafc66e65eccfa8 (patch)
treecd55c41c5ba54603b8fb82c96a8db651487af53f
parent6dce2a314c8823fcf0b619f9f447d9ea7126d958 (diff)
'make pretty' rule using uncrustify, detect uncrustify in configure script.
closes #5904
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac9
2 files changed, 14 insertions, 0 deletions
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.])],