meson.build: drop HAVE_CONFIG_H

This is an autotools leftover, with meson we're always guaranteed to have
the config.h file.

pipewire-alsa/alsa-plugins/meson.build

@@ -6,7 +6,6 @@ pipewire_alsa_plugin_ctl_sources = [
 ]
 
 pipewire_alsa_plugin_c_args = [
-  '-DHAVE_CONFIG_H',
   '-DPIC',
 ]
 

pipewire-jack/src/control.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <unistd.h>

pipewire-jack/src/dummy.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <unistd.h>

pipewire-jack/src/meson.build

@@ -15,7 +15,6 @@ pipewire_dummy_sources = [
 ]
 
 pipewire_jack_c_args = [
-  '-DHAVE_CONFIG_H',
   '-DPIC',
 ]
 

pipewire-jack/src/metadata.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <unistd.h>

pipewire-jack/src/pipewire-jack.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <unistd.h>

pipewire-jack/src/ringbuffer.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

pipewire-jack/src/uuid.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <unistd.h>

spa/plugins/alsa/acp/alsa-mixer.c

@@ -18,9 +18,7 @@
   along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <sys/types.h>
 #include <alsa/asoundlib.h>

spa/plugins/alsa/acp/alsa-ucm.c

@@ -20,9 +20,7 @@
 
 ***/
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <ctype.h>
 #include <sys/types.h>

spa/plugins/alsa/acp/alsa-util.c

@@ -18,9 +18,7 @@
   along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <sys/types.h>
 #include <alsa/asoundlib.h>

spa/plugins/alsa/acp/conf-parser.c

@@ -17,9 +17,7 @@
   along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <dirent.h>
 #include <string.h>

spa/plugins/alsa/acp/meson.build

@@ -9,7 +9,6 @@ acp_sources = [
 
 acp_c_args = [
   '-DHAVE_ALSA_UCM',
-  '-DHAVE_CONFIG_H',
   '-DHAVE_READLINK',
 ]
 

spa/plugins/audioconvert/biquad.c

@@ -9,9 +9,7 @@
  */
 
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <spa/utils/defs.h>
 

spa/plugins/audioconvert/crossover.c

@@ -3,9 +3,7 @@
  * found in the LICENSE file.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "crossover.h"
 

src/daemon/meson.build

@@ -3,7 +3,6 @@ pipewire_daemon_sources = [
 ]
 
 pipewire_c_args = [
-  '-DHAVE_CONFIG_H',
   '-DG_LOG_DOMAIN=g_log_domain_pipewire',
 ]
 

src/gst/gstpipewire.c

@@ -33,9 +33,7 @@
  * </refsect2>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "gstpipewiresrc.h"
 #include "gstpipewiresink.h"

src/gst/gstpipewireclock.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <gst/gst.h>
 

src/gst/gstpipewirecore.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <unistd.h>
 #include <fcntl.h>
 

src/gst/gstpipewiredeviceprovider.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 

src/gst/gstpipewiredeviceprovider.h

@@ -26,9 +26,7 @@
 #ifndef __GST_PIPEWIRE_DEVICE_PROVIDER_H__
 #define __GST_PIPEWIRE_DEVICE_PROVIDER_H__
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <pipewire/pipewire.h>
 

src/gst/gstpipewirepool.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <unistd.h>
 

src/gst/gstpipewiresink.c

@@ -33,9 +33,7 @@
  * </refsect2>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "gstpipewiresink.h"
 
 #include <string.h>

src/gst/gstpipewiresrc.c

@@ -33,9 +33,7 @@
  * </refsect2>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "gstpipewiresrc.h"
 #include "gstpipewireformat.h"
 

src/gst/meson.build

@@ -22,13 +22,8 @@ pipewire_gst_headers = [
   'gstpipewiresrc.h',
 ]
 
-pipewire_gst_c_args = [
-  '-DHAVE_CONFIG_H',
-]
-
 pipewire_gst = shared_library('gstpipewire',
     pipewire_gst_sources,
-    c_args : pipewire_gst_c_args,
     include_directories : [configinc, spa_inc],
     dependencies : [gst_dep, pipewire_dep],
     install : true,

src/modules/meson.build

@@ -1,11 +1,6 @@
 subdir('spa')
 
-pipewire_module_c_args = [
-  '-DHAVE_CONFIG_H',
-]
-
 pipewire_module_access = shared_library('pipewire-module-access', [ 'module-access.c' ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -15,7 +10,6 @@ pipewire_module_access = shared_library('pipewire-module-access', [ 'module-acce
 
 pipewire_module_loopback = shared_library('pipewire-module-loopback',
   [ 'module-loopback.c' ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -26,7 +20,6 @@ pipewire_module_loopback = shared_library('pipewire-module-loopback',
 pipewire_module_filter_chain = shared_library('pipewire-module-filter-chain',
   [ 'module-filter-chain.c',
     'module-filter-chain/biquad.c' ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -47,7 +40,6 @@ endif
 
 pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel',
   pipewire_module_echo_cancel_sources,
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -58,7 +50,6 @@ pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel',
 pipewire_module_profiler = shared_library('pipewire-module-profiler',
   [ 'module-profiler.c',
     'module-profiler/protocol-native.c', ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -68,7 +59,6 @@ pipewire_module_profiler = shared_library('pipewire-module-profiler',
 
 if build_machine.system() == 'linux'
 pipewire_module_rt = shared_library('pipewire-module-rt', [ 'module-rt.c' ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -79,7 +69,6 @@ endif
 
 if dbus_dep.found()
 pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rtkit.c' ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -87,7 +76,6 @@ pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rtkit.
   dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep],
 )
 pipewire_module_portal = shared_library('pipewire-module-portal', [ 'module-portal.c' ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -101,7 +89,6 @@ pipewire_module_client_node = shared_library('pipewire-module-client-device',
     'module-client-device/resource-device.c',
     'module-client-device/proxy-device.c',
     'module-client-device/protocol-native.c', ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -111,7 +98,6 @@ pipewire_module_client_node = shared_library('pipewire-module-client-device',
 
 pipewire_module_link_factory = shared_library('pipewire-module-link-factory',
   [ 'module-link-factory.c' ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -132,7 +118,6 @@ pipewire_module_protocol_native = shared_library('pipewire-module-protocol-nativ
     'module-protocol-native/protocol-native.c',
     'module-protocol-native/v0/protocol-native.c',
     'module-protocol-native/connection.c' ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -165,7 +150,6 @@ pipewire_module_protocol_pulse = shared_library('pipewire-module-protocol-pulse'
     'module-protocol-pulse/modules/module-tunnel-source.c',
     'module-protocol-pulse/modules/module-zeroconf-discover.c',
   ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -176,7 +160,6 @@ pipewire_module_protocol_pulse = shared_library('pipewire-module-protocol-pulse'
 if pulseaudio_dep.found()
   pipewire_module_pulse_tunnel = shared_library('pipewire-module-pulse-tunnel',
   [ 'module-pulse-tunnel.c' ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -187,7 +170,6 @@ endif
 
 pipewire_module_protocol_simple = shared_library('pipewire-module-protocol-simple',
   [ 'module-protocol-simple.c' ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -204,7 +186,6 @@ pipewire_module_client_node = shared_library('pipewire-module-client-node',
     'module-client-node/v0/transport.c',
     'module-client-node/v0/protocol-native.c',
     'spa/spa-node.c', ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   link_with : pipewire_module_protocol_native,
   install : true,
@@ -218,7 +199,6 @@ pipewire_module_metadata = shared_library('pipewire-module-metadata',
     'module-metadata/proxy-metadata.c',
     'module-metadata/metadata.c',
     'module-metadata/protocol-native.c'],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   link_with : pipewire_module_protocol_native,
   install : true,
@@ -257,7 +237,6 @@ pipewire_module_adapter = shared_library('pipewire-module-adapter',
   [ 'module-adapter.c',
     'module-adapter/adapter.c',
     'spa/spa-node.c' ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -280,7 +259,6 @@ pipewire_module_session_manager = shared_library('pipewire-module-session-manage
     'module-session-manager/proxy-session-manager.c',
     'module-session-manager/session.c',
   ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -292,7 +270,6 @@ if avahi_dep.found()
 pipewire_module_zeroconf_discover = shared_library('pipewire-module-zeroconf-discover',
   [ 'module-zeroconf-discover.c',
     'module-zeroconf-discover/avahi-poll.c' ],
-  c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,

src/modules/module-rtkit.c

@@ -109,9 +109,7 @@ struct impl {
 
 #include <dbus/dbus.h>
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <sys/syscall.h>
 

src/modules/spa/meson.build

@@ -1,10 +1,5 @@
-pipewire_module_spa_c_args = [
-  '-DHAVE_CONFIG_H',
-]
-
 pipewire_module_spa_node = shared_library('pipewire-module-spa-node',
   [ 'module-node.c', 'spa-node.c' ],
-  c_args : pipewire_module_spa_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -13,7 +8,6 @@ pipewire_module_spa_node = shared_library('pipewire-module-spa-node',
 
 pipewire_module_spa_device = shared_library('pipewire-module-spa-device',
   [ 'module-device.c', 'spa-device.c' ],
-  c_args : pipewire_module_spa_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -22,7 +16,6 @@ pipewire_module_spa_device = shared_library('pipewire-module-spa-device',
 
 pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-factory',
   [ 'module-node-factory.c', 'spa-node.c' ],
-  c_args : pipewire_module_spa_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,
@@ -31,7 +24,6 @@ pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-fact
 
 pipewire_module_spa_device_factory = shared_library('pipewire-module-spa-device-factory',
   [ 'module-device-factory.c', 'spa-device.c' ],
-  c_args : pipewire_module_spa_c_args,
   include_directories : [configinc, spa_inc],
   install : true,
   install_dir : modules_install_dir,

src/modules/spa/module-device.c

@@ -21,9 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <errno.h>
 #include <getopt.h>

src/modules/spa/module-node.c

@@ -23,9 +23,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <errno.h>
 #include <getopt.h>

src/modules/spa/spa-device.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 #include <stdio.h>

src/modules/spa/spa-node.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 #include <stdio.h>

src/pipewire/impl-module.c

@@ -23,9 +23,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <dlfcn.h>

src/pipewire/meson.build

@@ -86,7 +86,6 @@ configure_file(input : 'version.h.in',
 install_headers(pipewire_headers, subdir : pipewire_headers_dir)
 
 libpipewire_c_args = [
-  '-DHAVE_CONFIG_H',
 ]
 
 if build_machine.system() != 'freebsd'

src/pipewire/pipewire.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <unistd.h>
 #include <limits.h>

test/meson.build

@@ -11,7 +11,6 @@ pwtest_deps = [
 ]
 
 pwtest_c_args = [
-  '-DHAVE_CONFIG_H',
   '-DBUILD_ROOT="@0@"'.format(meson.build_root()),
   '-DSOURCE_ROOT="@0@"'.format(meson.source_root()),
 ]

test/pwtest.c

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <assert.h>
 #include <dlfcn.h>

test/pwtest.h

@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifndef PWTEST_H
 #define PWTEST_H

test/test-array.c

@@ -23,9 +23,7 @@
  */
 
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "pwtest.h"
 #include "pipewire/array.h"

test/test-example.c

@@ -24,9 +24,7 @@
 
 
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <signal.h>
 #include <unistd.h>

test/test-lib.c

@@ -23,9 +23,7 @@
  */
 
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "pwtest.h"
 

test/test-properties.c

@@ -23,9 +23,7 @@
  */
 
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "pwtest.h"