[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 03/06: fix the previous uncrustify commit.
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 03/06: fix the previous uncrustify commit. |
Date: |
Mon, 14 Oct 2019 16:12:20 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnunet.
commit dc57bfc9ab69749453269c9bfce354a6c63a4648
Author: ng0 <address@hidden>
AuthorDate: Mon Oct 14 14:06:58 2019 +0000
fix the previous uncrustify commit.
---
Makefile.am | 4 ++--
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
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,
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [GNUnet-SVN] [gnunet] branch master updated (0bd7e2106 -> 0169bf2da), gnunet, 2019/10/14
- [GNUnet-SVN] [gnunet] 05/06: Merge branch 'master' of gnunet.org:gnunet, gnunet, 2019/10/14
- [GNUnet-SVN] [gnunet] 04/06: Changelog, gnunet, 2019/10/14
- [GNUnet-SVN] [gnunet] 02/06: gitignore yapf, gnunet, 2019/10/14
- [GNUnet-SVN] [gnunet] 06/06: po/POTFILES.in, gnunet, 2019/10/14
- [GNUnet-SVN] [gnunet] 03/06: fix the previous uncrustify commit.,
gnunet <=
- [GNUnet-SVN] [gnunet] 01/06: 'make pretty' rule using uncrustify, detect uncrustify in configure script., gnunet, 2019/10/14