X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=m4%2Fsigrok.m4;h=2d0d70fc0af83da629ec5f21e3dc7a9a85e6dee6;hb=64bc73f5282ec0e7da6e00a8d078191e5375dc5c;hp=30d87800577494e9476c581efa47437e2dcc5cf4;hpb=bc8ff24de6948efee1313c7884e56090d8424c8e;p=libsigrok.git diff --git a/m4/sigrok.m4 b/m4/sigrok.m4 index 30d87800..2d0d70fc 100644 --- a/m4/sigrok.m4 +++ b/m4/sigrok.m4 @@ -1,22 +1,24 @@ -## Copyright (c) 2009 Openismus GmbH -## Copyright (c) 2015 Daniel Elstner ## ## This file is part of the sigrok project. ## -## sigrok is free software: you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by +## Copyright (C) 2009 Openismus GmbH +## Copyright (C) 2015 Daniel Elstner +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## -## sigrok is distributed in the hope that it will be useful, +## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with sigrok. If not, see . +## along with this program. If not, see . +## -#serial 20150824 +#serial 20150825 ## SR_APPEND(var-name, [list-sep,] element) ## @@ -288,7 +290,8 @@ do test "x$sr_ccf_result" = xno || break done CPPFLAGS=$sr_ccf_save_CPPFLAGS -SR_APPEND([$1], [$sr_ccf_result]) +AS_IF([test "x$sr_ccf_result" != xno], + [SR_APPEND([$1], [$sr_ccf_result])]) AC_MSG_RESULT([$sr_ccf_result]) AC_SUBST([$1]) ])