[dia: 42/105] #19: Code cleanup: s/FIXME/TODO/.

[Zander <zbrown src gnome org>]

commit c89c08c0d95011e03bcae03f53f1dc1f387ef9a6
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Tue Jan 1 18:07:03 2019 +0000

    #19: Code cleanup: s/FIXME/TODO/.
    
      - Also remove old TODO in top meson.build, those dependencies should
        be implicitly required by meson.
      - Also add separate dependency for libc
        (currently '-lc' flag is used; added "TODO").

 app/meson.build                      |  2 +-
 app/pixmaps/meson.build              |  2 +-
 doc/en/meson.build                   |  2 +-
 meson.build                          | 15 +++++----------
 objects/standard/pixmaps/meson.build |  2 +-
 plug-ins/meson.build                 |  2 +-
 shapes/flowchart/meson.build         |  2 +-
 sheets/meson.build                   |  2 +-
 8 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/app/meson.build b/app/meson.build
index 1c2db04f..176b2abf 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -63,7 +63,7 @@ dia_sources = [
     'main.c'
 ]
 
-#FIXME: this is workaround for openbsd where libraries are in /usr/lib/local
+#TODO: this is workaround for openbsd where libraries are in /usr/lib/local
 pkg_config = find_program('pkg-config')
 pkg_config_libdir = run_command(pkg_config, '--libs-only-L', 'libxml-2.0').stdout().strip()
 
diff --git a/app/pixmaps/meson.build b/app/pixmaps/meson.build
index 751577c4..38407aff 100644
--- a/app/pixmaps/meson.build
+++ b/app/pixmaps/meson.build
@@ -23,7 +23,7 @@ icons = [ 'connectable.png',
           'cursor-magnify-minus.png',
           'cursor-magnify-plus.png' ]
 
-#FIXME: this is duplicated from lib/pixmaps.  Any way to remove this duplication?
+#TODO: this is duplicated from lib/pixmaps.  Any way to remove this duplication?
 icon_pairs = []
 foreach icon_file : icons
     icon_pairs += ['dia_' + icon_file.split('.')[0].underscorify() + '_icon', files(icon_file)]
diff --git a/doc/en/meson.build b/doc/en/meson.build
index a385e334..db91a9fd 100644
--- a/doc/en/meson.build
+++ b/doc/en/meson.build
@@ -92,7 +92,7 @@ if xsltproc.found()
         install : true,
         install_dir : join_paths(get_option('mandir'), 'man1')
     )
-    # XXX: this should fixed in meson: https://github.com/mesonbuild/meson/issues/1550
+    # TODO: this should fixed in meson: https://github.com/mesonbuild/meson/issues/1550
     #install_data(dia_man)
 
     html_dir = join_paths(helpdir, 'en')
diff --git a/meson.build b/meson.build
index 66537d42..2bd68dd1 100644
--- a/meson.build
+++ b/meson.build
@@ -6,6 +6,7 @@ project('dia',
         default_options : []
 )
 
+#TODO: use libc_dep defined below.
 add_global_link_arguments('-lc', language: 'c')
 
 cc = meson.get_compiler('c')
@@ -18,18 +19,12 @@ libxml_dep  = dependency('libxml-2.0', version : '>= 2.6.27')
 gmodule_dep = dependency('gmodule-2.0')
 libzlib_dep = dependency('zlib')
 #TODO: this is optional.  Should it be a disabler?
-libcairo_dep = dependency('cairo', required : false)
-
-libm_dep = cc.find_library('m', required : false)
+libcairo_dep = dependency('cairo')
+libm_dep = cc.find_library('m')
+libc_dep = cc.find_library('c')
 
 # Used in pixmap csource generation.
 gdk_pixbuf_csource = find_program('gdk-pixbuf-csource')
-# TODO
-#AC_PROG_INSTALL
-#AC_PROG_LN_S
-#AC_PROG_MAKE_SET
-#AC_ISC_POSIX
-
 
 datadir = join_paths(get_option('prefix'),
                      get_option('datadir'))
@@ -60,7 +55,7 @@ endforeach
 
 configuration_inc = include_directories('.')
 
-# FIXME: I don't think this should be defined.
+# TODO: I don't think this should be defined.
 # To fix we should remove #ifdef HAVE_CONFIG_H checks from all source files.
 add_project_arguments('-DHAVE_CONFIG_H', language : 'c')
 
diff --git a/objects/standard/pixmaps/meson.build b/objects/standard/pixmaps/meson.build
index bdf01f24..55b65598 100644
--- a/objects/standard/pixmaps/meson.build
+++ b/objects/standard/pixmaps/meson.build
@@ -11,7 +11,7 @@ icons = [ 'arc.png',
           'text.png',
           'zigzagline.png' ]
 
-#FIXME: this is duplicated from lib/pixmaps.  Any way to remove this duplication?
+#TODO: this is duplicated from lib/pixmaps.  Any way to remove this duplication?
 icon_pairs = []
 foreach icon_file : icons
     icon_pairs += [icon_file.split('.')[0].underscorify() + '_icon', files(icon_file)]
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index de45b6d4..57130f99 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -26,7 +26,7 @@ subdir('pstricks')
 #subdir('stress')
 
 subdir('svg')
-# FIXME: requires visio-types.h
+# TODO: requires visio-types.h
 #subdir('vdx')
 
 #subdir('wmf')
diff --git a/shapes/flowchart/meson.build b/shapes/flowchart/meson.build
index e58a99fa..891da4fb 100644
--- a/shapes/flowchart/meson.build
+++ b/shapes/flowchart/meson.build
@@ -51,5 +51,5 @@ shape_sources = files(
     'datasource.png'
 )
 
-#FIXME: the folder should be capitalised as well.
+#TODO: the folder should be capitalised as well.
 shapes += [[shape_sources, 'Flowchart']]
diff --git a/sheets/meson.build b/sheets/meson.build
index ddbb7103..c322cd31 100644
--- a/sheets/meson.build
+++ b/sheets/meson.build
@@ -97,7 +97,7 @@ if false
 endif
 
 sheet_files_targets = []
-# FIXME: use gettext:
+# TODO: use gettext:
 # https://github.com/mesonbuild/meson/issues/1565
 # https://github.com/systemd/systemd/commit/c81217920effddc93fb780cf8f9eb699d6fe1319
 # https://wiki.gnome.org/MigratingFromIntltoolToGettext