diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-11-11 10:52:16 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-11-11 10:52:16 +0100 |
| commit | c85543f88df7268f63bcfd64220ba6c21797f27b (patch) | |
| tree | 6a3311a969d068d2d05fc3d4f2544aff2cacf4a5 /gnuwin32/bin/data/c++-skel.m4 | |
| parent | 4e5a86d2bbe6cd30e46a364f96a861b37bbf7f96 (diff) | |
| parent | ae27f21d2697edf0b513b2c52bb1ecbbe658053b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtdeclarative.yaml
coin/platform_configs/qtsaferenderer.yaml
coin/platform_configs/qtsdk.yaml
coin/provisioning/common/linux/cmake_linux.sh
coin/provisioning/common/windows/cmake.ps1
Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
Diffstat (limited to 'gnuwin32/bin/data/c++-skel.m4')
| -rw-r--r-- | gnuwin32/bin/data/c++-skel.m4 | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/gnuwin32/bin/data/c++-skel.m4 b/gnuwin32/bin/data/c++-skel.m4 deleted file mode 100644 index 06597a8b..00000000 --- a/gnuwin32/bin/data/c++-skel.m4 +++ /dev/null @@ -1,26 +0,0 @@ - -*- Autoconf -*- - -# C++ skeleton dispatching for Bison. - -# Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc. - -# 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. -# -# 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 -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -b4_glr_if( [m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])]) -b4_nondeterministic_if([m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])]) - -m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.cc]]) -m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"]) - -m4_include(b4_used_skeleton) |