From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Tue, 1 Aug 2023 11:58:01 +0000 (+0200)
Subject: Meson: Move flex and bison to prog-flex and prog-bison
X-Git-Tag: rec-5.1.0-alpha1~80^2~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02429dcfd83a4a054cdf1d305c4ee957ecd4b68f;p=thirdparty%2Fpdns.git

Meson: Move flex and bison to prog-flex and prog-bison
---

diff --git a/meson.build b/meson.build
index 08be33a51b..00bf83f249 100644
--- a/meson.build
+++ b/meson.build
@@ -25,7 +25,8 @@ subdir('meson/compiler-setup')           # Common compiler setup (cxx is the C++
 subdir('meson/summary')                  # Print a system/project summary
 subdir('meson/timet-size')               # Check the size of time_t
 subdir('meson/timet-sign')               # Check the sign of time_t
-subdir('meson/flex-bison')               # Find flex and bison
+subdir('meson/prog-flex')                # Find flex
+subdir('meson/prog-bison')               # Find bison
 subdir('meson/platform')                 # Platform detection
 subdir('meson/atomics')                  # Check atomics support
 subdir('meson/pthread-headers')          # Check pthread headers
diff --git a/meson/flex-bison/meson.build b/meson/flex-bison/meson.build
deleted file mode 100644
index 93db10419d..0000000000
--- a/meson/flex-bison/meson.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# Find flex and bison
-# Outputs: flex bison
-
-flex = find_program('flex', required: true)
-summary('flex', flex.found(), bool_yn: true, section: 'Programs')
-# summary('Flex', flex.full_path(), section: 'System')       # TODO Meson 0.55
-# summary('Flex Version', flex.version(), section: 'System') # TODO Meson 0.62
-
-bison = find_program('bison', required: true)
-summary('bison', bison.found(), bool_yn: true, section: 'Programs')
-# summary('Bison', bison.full_path(), section: 'System')       # TODO Meson 0.55
-# summary('Bison Version', bison.version(), section: 'System') # TODO Meson 0.62
diff --git a/meson/prog-bison/meson.build b/meson/prog-bison/meson.build
new file mode 100644
index 0000000000..e9c7186552
--- /dev/null
+++ b/meson/prog-bison/meson.build
@@ -0,0 +1,7 @@
+# Find bison
+# Outputs: bison
+
+bison = find_program('bison', required: true)
+summary('bison', bison.found(), bool_yn: true, section: 'Programs')
+# summary('Bison', bison.full_path(), section: 'System')       # TODO Meson 0.55
+# summary('Bison Version', bison.version(), section: 'System') # TODO Meson 0.62
diff --git a/meson/prog-flex/meson.build b/meson/prog-flex/meson.build
new file mode 100644
index 0000000000..562c21ef53
--- /dev/null
+++ b/meson/prog-flex/meson.build
@@ -0,0 +1,7 @@
+# Find flex
+# Outputs: flex
+
+flex = find_program('flex', required: true)
+summary('flex', flex.found(), bool_yn: true, section: 'Programs')
+# summary('Flex', flex.full_path(), section: 'System')       # TODO Meson 0.55
+# summary('Flex Version', flex.version(), section: 'System') # TODO Meson 0.62