GNOME.org
 

[beast: 10/11] BUILD: use only config/config.h for autoconf results

commit e09acb809fdef9eac3c922cae69009ad0707b61e
Author: Tim Janik <timj gnu org>
Date:   Wed Nov 2 23:00:59 2016 +0100

    BUILD: use only config/config.h for autoconf results
    
    Signed-off-by: Tim Janik <timj gnu org>

 .gitignore                    |    2 --
 beast-gtk/bstmain.cc          |    2 +-
 beast-gtk/testgui.cc          |    2 +-
 bse/bsegconfig.cc             |    1 -
 bse/bseloader-mad.cc          |    2 +-
 bse/bseplugin.cc              |    2 +-
 bse/bsescripthelper.cc        |    1 -
 bse/bsestartup.cc             |    2 +-
 bse/gsldatahandle-mad.cc      |    2 +-
 bse/gsldatahandle-vorbis.cc   |    2 +-
 configure.ac                  |    1 -
 drivers/bsemididevice-alsa.cc |    1 -
 drivers/bsepcmdevice-alsa.cc  |    1 -
 launchers/beaststart.c        |    2 +-
 launchers/suidmain.c          |    2 +-
 sfi/glib-extra.cc             |    2 +-
 shell/bsescm.cc               |    2 +-
 tools/bsewavetool.cc          |    1 -
 18 files changed, 11 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ba2d4d..c7c6b5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,5 @@ Makefile
 /config.log
 /config.status
 /configure
-/configure.h
-/configure.h.in
 /libtool
 /stamp-h1
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index 7e075f5..0ff53b3 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -11,8 +11,8 @@
 #include "bstparam.hh"
 #include "bstpreferences.hh"
 #include "data/beast-images.h"
-#include "../configure.h"
 #include "../topbuildid.hh"
+#include "../config/config.h"
 #include <Python.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/beast-gtk/testgui.cc b/beast-gtk/testgui.cc
index d6baa32..be26ebf 100644
--- a/beast-gtk/testgui.cc
+++ b/beast-gtk/testgui.cc
@@ -5,7 +5,7 @@
 #include "bstparam.hh"
 #include "bstgconfig.hh"
 #include "bstskinconfig.hh"
-#include "../configure.h"
+#include "../config/config.h"
 
 /* --- FIXME: --- */
 gboolean            bst_developer_hints = FALSE;
diff --git a/bse/bsegconfig.cc b/bse/bsegconfig.cc
index b3d96cb..6aa24bc 100644
--- a/bse/bsegconfig.cc
+++ b/bse/bsegconfig.cc
@@ -2,7 +2,6 @@
 #include "bsegconfig.hh"
 #include "bseserver.hh"
 #include "bsepcmdevice.hh"     /* for frequency alignment */
-#include "../configure.h"
 #include <sys/types.h>
 #include <regex.h>
 
diff --git a/bse/bseloader-mad.cc b/bse/bseloader-mad.cc
index 8481724..fc5b984 100644
--- a/bse/bseloader-mad.cc
+++ b/bse/bseloader-mad.cc
@@ -1,5 +1,5 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
-#include "../configure.h"
+#include "../config/config.h"
 #include "bse/bseloader.hh"
 #include "gsldatahandle-mad.hh"
 
diff --git a/bse/bseplugin.cc b/bse/bseplugin.cc
index e381c8d..b96ee45 100644
--- a/bse/bseplugin.cc
+++ b/bse/bseplugin.cc
@@ -1,6 +1,6 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #include "bseplugin.hh"
-#include "../configure.h"
+#include "../config/config.h"
 #include "bsecategories.hh"
 #include "bseprocedure.hh"
 #include "bseobject.hh"
diff --git a/bse/bsescripthelper.cc b/bse/bsescripthelper.cc
index 4b758fa..5651f0c 100644
--- a/bse/bsescripthelper.cc
+++ b/bse/bsescripthelper.cc
@@ -1,6 +1,5 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #include "bsescripthelper.hh"
-#include "../configure.h"
 #include "bsecategories.hh"
 #include "bsejanitor.hh"
 #include "bseserver.hh"
diff --git a/bse/bsestartup.cc b/bse/bsestartup.cc
index 6f954be..378ee65 100644
--- a/bse/bsestartup.cc
+++ b/bse/bsestartup.cc
@@ -3,7 +3,7 @@
 #include "bsemain.hh"
 #include <bse/bseclientapi.hh>
 #include <bse/bse.hh>           // init_server_connection
-#include "../configure.h"       // BST_VERSION
+#include "../config/config.h"   // BST_VERSION
 
 namespace Bse {
 
diff --git a/bse/gsldatahandle-mad.cc b/bse/gsldatahandle-mad.cc
index 169a61e..722be3f 100644
--- a/bse/gsldatahandle-mad.cc
+++ b/bse/gsldatahandle-mad.cc
@@ -1,5 +1,5 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
-#include "../configure.h"
+#include "../config/config.h"
 #include <bse/gsldatahandle-mad.hh>
 #include "gslfilehash.hh"
 #include <bse/gsldatautils.hh>
diff --git a/bse/gsldatahandle-vorbis.cc b/bse/gsldatahandle-vorbis.cc
index f2c5af7..3fe9c61 100644
--- a/bse/gsldatahandle-vorbis.cc
+++ b/bse/gsldatahandle-vorbis.cc
@@ -5,7 +5,7 @@
 #include <ogg/ogg.h>
 #include <vorbis/vorbisfile.h>
 #include <errno.h>
-#include "../configure.h"
+#include "../config/config.h"
 
 
 /* --- defines --- */
diff --git a/configure.ac b/configure.ac
index 7184c34..fefc049 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,6 @@ AC_CONFIG_SRCDIR([bse/bseserver.cc])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([config])
 AM_CONFIG_HEADER(config/config.h)
-AM_CONFIG_HEADER(configure.h)
 AC_CANONICAL_TARGET                                     # architecture information
 AM_INIT_AUTOMAKE(1.9 dist-xz tar-pax no-dist-gzip no-define foreign subdir-objects)
 # version handling
diff --git a/drivers/bsemididevice-alsa.cc b/drivers/bsemididevice-alsa.cc
index 662c614..38ccb91 100644
--- a/drivers/bsemididevice-alsa.cc
+++ b/drivers/bsemididevice-alsa.cc
@@ -1,5 +1,4 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
-#include "configure.h"
 #include <bse/bsecxxplugin.hh>
 #include "bsemididevice-alsa.hh"
 #include <bse/bsesequencer.hh>
diff --git a/drivers/bsepcmdevice-alsa.cc b/drivers/bsepcmdevice-alsa.cc
index 9c68dff..d949534 100644
--- a/drivers/bsepcmdevice-alsa.cc
+++ b/drivers/bsepcmdevice-alsa.cc
@@ -1,5 +1,4 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
-#include "configure.h"
 #include <bse/bsecxxplugin.hh>
 #include "bsepcmdevice-alsa.hh"
 #include <bse/gsldatautils.hh>
diff --git a/launchers/beaststart.c b/launchers/beaststart.c
index 43cebd6..ae1dbc3 100644
--- a/launchers/beaststart.c
+++ b/launchers/beaststart.c
@@ -1,6 +1,6 @@
 // CC0 Public Domain: http://creativecommons.org/publicdomain/zero/1.0/
 #include "suidmain.h"
-#include "../configure.h" // BEAST_EXEC_POSTFIX
+#include "../config/config.h"   // BEAST_EXEC_POSTFIX
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/launchers/suidmain.c b/launchers/suidmain.c
index c56f8c1..7b65054 100644
--- a/launchers/suidmain.c
+++ b/launchers/suidmain.c
@@ -1,6 +1,6 @@
 // CC0 Public Domain: http://creativecommons.org/publicdomain/zero/1.0/
 #include "suidmain.h"
-#include "../configure.h"  // HAVE_SETEUID, HAVE_SETREUID
+#include "../config/config.h"   // HAVE_SETEUID, HAVE_SETREUID
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <unistd.h>
diff --git a/sfi/glib-extra.cc b/sfi/glib-extra.cc
index 49c35cd..72e1bc0 100644
--- a/sfi/glib-extra.cc
+++ b/sfi/glib-extra.cc
@@ -1027,7 +1027,7 @@ g_scanner_new64 (const GScannerConfig *config_templ)
 }
 
 
-#include "../configure.h"
+#include "../config/config.h"
 
 namespace Bse {
 
diff --git a/shell/bsescm.cc b/shell/bsescm.cc
index 21c2c05..04762f7 100644
--- a/shell/bsescm.cc
+++ b/shell/bsescm.cc
@@ -1,6 +1,6 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #include "bsescminterp.hh"
-#include "../configure.h"
+#include "../config/config.h"
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/tools/bsewavetool.cc b/tools/bsewavetool.cc
index 3a38a68..66aef6c 100644
--- a/tools/bsewavetool.cc
+++ b/tools/bsewavetool.cc
@@ -1,7 +1,6 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #include "bsewavetool.hh"
 #include "bwtwave.hh"
-#include "../configure.h"
 #include "../topbuildid.hh"
 #include <bse/bsemain.hh>      /* for bse_init_intern() */
 #include <bse/bseloader.hh>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]