Generate config.h

This allows us to remove a lot of #ifdef's. Either we want to use
a config.h or we don't. Since we'll want it for e.g. optional gsound
support later on let's have it.
This commit is contained in:
Guido Günther
2019-07-17 19:40:52 +02:00
parent c65583b911
commit dbc8cc14bc
30 changed files with 19 additions and 52 deletions

4
src/config.h.in Normal file
View File

@ -0,0 +1,4 @@
/*
* Autogenerated by the Meson build system.
* Do not edit, your changes will be lost.
*/

View File

@ -4,7 +4,10 @@ dbus_src = gnome.gdbus_codegen(
join_paths(meson.source_root() / 'data' / 'dbus', 'sm.puri.OSK0.xml')
)
config_h = configure_file(input: 'config.h.in', output: 'config.h',configuration: conf_data)
sources = [
config_h,
'imservice.c',
'server-context-service.c',
'server-main.c',

View File

@ -15,9 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif /* HAVE_CONFIG_H */
#include <gtk/gtk.h>
#include <glib/gi18n.h>

View File

@ -23,9 +23,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif /* HAVE_CONFIG_H */
#if HAVE_CLUTTER_GTK
#include <clutter-gtk/clutter-gtk.h>