meson: remove unneeded definitions in meson builds

2 files changed, 2 insertions, 151 deletions

diff --git a/config.h.meson b/config.h.meson
index 8937326..8a2e1ed 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -1,40 +1,12 @@
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#mesondefine ENABLE_NLS
-
 /* Package name */
 #mesondefine GETTEXT_PACKAGE
 
 /* Define if building against cairo-xlib-xrender */
 #mesondefine HAVE_CAIRO_XLIB_XRENDER
 
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#mesondefine HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-#mesondefine HAVE_CFPREFERENCESCOPYAPPVALUE
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-#mesondefine HAVE_DCGETTEXT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#mesondefine HAVE_DLFCN_H
-
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #mesondefine HAVE_GETTEXT
 
-/* Define if you have the iconv() function and it works. */
-#mesondefine HAVE_ICONV
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#mesondefine HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#mesondefine HAVE_MEMORY_H
-
 /* Define if you have libstartup-notification */
 #mesondefine HAVE_LIBSTARTUP_NOTIFICATION_1_0
 
@@ -42,59 +14,20 @@
 #define HAVE_STARTUP_NOTIFICATION 1
 #endif
 
-/* Define to 1 if you have the <stdint.h> header file. */
-#mesondefine HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#mesondefine HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#mesondefine HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#mesondefine HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#mesondefine HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#mesondefine HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#mesondefine HAVE_UNISTD_H
-
 /* Define if you have the XRes library */
 #mesondefine HAVE_XRES
 
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#mesondefine LT_OBJDIR
-
-/* Define if debugging is disabled */
-#mesondefine NDEBUG
-
 /* Name of package */
 #mesondefine PACKAGE
 
-/* Define to the address where bug reports for this package should be sent. */
-#mesondefine PACKAGE_BUGREPORT
-
 /* Define to the full name of this package. */
 #mesondefine PACKAGE_NAME
 
 /* Define to the full name and version of this package. */
 #mesondefine PACKAGE_STRING
 
-/* Define to the one symbol short name of this package. */
-#mesondefine PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#mesondefine PACKAGE_URL
-
 /* Define to the version of this package. */
 #mesondefine PACKAGE_VERSION
 
-/* Define to 1 if you have the ANSI C header files. */
-#mesondefine STDC_HEADERS
-
 /* Version number of package */
 #mesondefine VERSION
diff --git a/meson.build b/meson.build
index ea0fad8..473c4d9 100644
--- a/meson.build
+++ b/meson.build
@@ -29,91 +29,9 @@ libdir = join_paths(prefix, get_option('libdir'))
 includedir = join_paths(prefix, get_option('includedir'))
 localedir = join_paths(prefix, get_option('localedir'))
 
-cc = meson.get_compiler('c')
 default_includes = include_directories('.')
-
-#####
-# CFLAGS
-# The same as the AX_COMPILER_FLAGS Autotools macro.
-
-warning_cflags = [
-  '-fno-strict-aliasing',
-  '-Wall',
-  '-Wextra',
-  '-Wundef',
-  '-Wnested-externs',
-  '-Wwrite-strings',
-  '-Wpointer-arith',
-  '-Wmissing-declarations',
-  '-Wmissing-prototypes',
-  '-Wstrict-prototypes',
-  '-Wredundant-decls',
-  '-Wno-unused-parameter',
-  '-Wno-missing-field-initializers',
-  '-Wdeclaration-after-statement',
-  '-Wformat=2',
-  '-Wold-style-definition',
-  '-Wcast-align',
-  '-Wformat-nonliteral',
-  '-Wformat-security',
-  '-Wsign-compare',
-  '-Wstrict-aliasing',
-  '-Wshadow',
-  '-Winline',
-  '-Wpacked',
-  '-Wmissing-format-attribute',
-  '-Wmissing-noreturn',
-  '-Winit-self',
-  '-Wredundant-decls',
-  '-Wmissing-include-dirs',
-  '-Wunused-but-set-variable',
-  '-Warray-bounds',
-  '-Wimplicit-function-declaration',
-  '-Wreturn-type',
-  '-Wswitch-enum',
-  '-Wswitch-default',
-  '-Wduplicated-cond',
-  '-Wduplicated-branches',
-  '-Wlogical-op',
-  '-Wrestrict',
-  '-Wnull-dereference',
-  '-Wjump-misses-init',
-  '-Wdouble-promotion'
-]
-
-supported_warning_cflags = cc.get_supported_arguments(warning_cflags)
-add_global_arguments(supported_warning_cflags, language : 'c')
-##### end CFLAGS
-
 conf = configuration_data()
-check_headers = [
-  ['HAVE_DLFCN_H', 'dlfcn.h'],
-  ['HAVE_INTTYPES_H', 'inttypes.h'],
-  ['HAVE_MEMORY_H', 'memory.h'],
-  ['HAVE_STDINT_H', 'stdint.h'],
-  ['HAVE_STDLIB_H', 'stdlib.h'],
-  ['HAVE_STRINGS_H', 'strings.h'],
-  ['HAVE_STRING_H', 'string.h'],
-  ['HAVE_SYS_STAT_H', 'sys/stat.h'],
-  ['HAVE_SYS_TYPES_H', 'sys/types.h'],
-  ['HAVE_UNISTD_H', 'unistd.h'],
-]
-
-foreach h: check_headers
-  if cc.has_header(h.get(1))
-    conf.set(h.get(0), 1)
-  endif
-endforeach
-
-check_functions = [
-  ['HAVE_DCGETTEXT', 'dcgettext', '#include<libintl.h>'],
-]
-
-foreach f: check_functions
-  if cc.has_function(f.get(1), prefix : f.get(2))
-    conf.set(f.get(0), 1)
-  endif
-endforeach
+cc = meson.get_compiler('c')
 
 LIBWNCK_DEPS = [cc.find_library('m', required: true)]
 STARTUP_NOTIFICATION_PACKAGE = 'libstartup-notification-1.0'
@@ -143,9 +61,9 @@ endforeach
 
 conf.set_quoted('PACKAGE_NAME', meson.project_name())
 conf.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
-conf.set_quoted('VERSION', meson.project_version())
 conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 conf.set_quoted('GETTEXT_PACKAGE', PACKAGE_NAME)
+conf.set_quoted('VERSION', meson.project_version())
 
 configure_file(input: 'config.h.meson',
   output : 'config.h',