[PATCH 2/3] Actually use the config header we generate
David Shea
dshea at redhat.com
Fri Nov 8 18:55:01 UTC 2013
---
pyanaconda/isys/Makefile.am | 2 +-
pyanaconda/isys/auditd.c | 2 ++
pyanaconda/isys/devices.c | 2 ++
pyanaconda/isys/eddsupport.c | 2 ++
pyanaconda/isys/ethtool.c | 2 ++
pyanaconda/isys/iface.c | 2 ++
pyanaconda/isys/isofs.c | 2 ++
pyanaconda/isys/isys.c | 12 +++++++++++-
pyanaconda/isys/lang.c | 2 ++
pyanaconda/isys/linkdetect.c | 2 ++
pyanaconda/isys/log.c | 2 ++
pyanaconda/isys/mem.c | 2 ++
pyanaconda/isys/vio.c | 2 ++
13 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/isys/Makefile.am b/pyanaconda/isys/Makefile.am
index 9ed177e..454e2fc 100644
--- a/pyanaconda/isys/Makefile.am
+++ b/pyanaconda/isys/Makefile.am
@@ -25,7 +25,7 @@ ISYS_SRCS = devices.c lang.c \
dist_noinst_HEADERS = $(srcdir)/*.h
-ISYS_CFLAGS = -DVERSION='"$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)"' \
+ISYS_CFLAGS = -DVERSION_RELEASE='"$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)"' \
$(NETWORKMANAGER_CFLAGS) $(LIBNL_CFLAGS) $(LIBNM_GLIB_CFLAGS) \
$(SELINUX_CFLAGS)
ISYS_LIBS = $(RESOLV_LIBS) $(ZLIB_LIBS) \
diff --git a/pyanaconda/isys/auditd.c b/pyanaconda/isys/auditd.c
index 0d72dd9..f25eecb 100644
--- a/pyanaconda/isys/auditd.c
+++ b/pyanaconda/isys/auditd.c
@@ -21,6 +21,8 @@
#define _GNU_SOURCE 1
+#include "config.h"
+
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/poll.h>
diff --git a/pyanaconda/isys/devices.c b/pyanaconda/isys/devices.c
index f9dc0a5..36c2ece 100644
--- a/pyanaconda/isys/devices.c
+++ b/pyanaconda/isys/devices.c
@@ -20,6 +20,8 @@
* Author(s): Bill Nottingham <notting at redhat.com>
*/
+#include "config.h"
+
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
diff --git a/pyanaconda/isys/eddsupport.c b/pyanaconda/isys/eddsupport.c
index 1585c84..0e0a4b5 100644
--- a/pyanaconda/isys/eddsupport.c
+++ b/pyanaconda/isys/eddsupport.c
@@ -22,6 +22,8 @@
* Jeremy Katz <katzj at redhat.com>
*/
+#include "config.h"
+
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
diff --git a/pyanaconda/isys/ethtool.c b/pyanaconda/isys/ethtool.c
index 871f1d4..fa4838f 100644
--- a/pyanaconda/isys/ethtool.c
+++ b/pyanaconda/isys/ethtool.c
@@ -19,6 +19,8 @@
* Author(s): Jeremy Katz <katzj at redhat.com>
*/
+#include "config.h"
+
#include <errno.h>
#include <stdio.h>
#include <string.h>
diff --git a/pyanaconda/isys/iface.c b/pyanaconda/isys/iface.c
index 299f7ab..a933aec 100644
--- a/pyanaconda/isys/iface.c
+++ b/pyanaconda/isys/iface.c
@@ -19,6 +19,8 @@
* Author(s): David Cantrell <dcantrell at redhat.com>
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/pyanaconda/isys/isofs.c b/pyanaconda/isys/isofs.c
index bb5a44a..f144114 100644
--- a/pyanaconda/isys/isofs.c
+++ b/pyanaconda/isys/isofs.c
@@ -17,6 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
diff --git a/pyanaconda/isys/isys.c b/pyanaconda/isys/isys.c
index 6ed8bd1..6058678 100644
--- a/pyanaconda/isys/isys.c
+++ b/pyanaconda/isys/isys.c
@@ -17,6 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <Python.h>
#include <stdio.h>
@@ -62,6 +64,14 @@
#include <X11/XKBlib.h>
#include <X11/keysym.h>
+#ifdef MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#endif
+
+#ifdef MAJOR_IN_SYSMACROS
+#include <sys/sysmacros.h>
+#endif
+
#include "iface.h"
#include "isys.h"
#include "ethtool.h"
@@ -262,7 +272,7 @@ static PyObject * doIsCapsLockEnabled(PyObject * s, PyObject * args) {
}
static PyObject * doGetAnacondaVersion(PyObject * s, PyObject * args) {
- return Py_BuildValue("s", VERSION);
+ return Py_BuildValue("s", VERSION_RELEASE);
}
static PyObject * doInitLog(PyObject * s) {
diff --git a/pyanaconda/isys/lang.c b/pyanaconda/isys/lang.c
index c38b1bb..9487ddc 100644
--- a/pyanaconda/isys/lang.c
+++ b/pyanaconda/isys/lang.c
@@ -17,6 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <alloca.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/pyanaconda/isys/linkdetect.c b/pyanaconda/isys/linkdetect.c
index f97a291..f8f9b50 100644
--- a/pyanaconda/isys/linkdetect.c
+++ b/pyanaconda/isys/linkdetect.c
@@ -23,6 +23,8 @@
* Author(s): Jeremy Katz <katzj at redhat.com>
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
diff --git a/pyanaconda/isys/log.c b/pyanaconda/isys/log.c
index c0e8ca4..a796ea5 100644
--- a/pyanaconda/isys/log.c
+++ b/pyanaconda/isys/log.c
@@ -23,6 +23,8 @@
* Jeremy Katz <katzj at redhat.com>
*/
+#include "config.h"
+
#include <fcntl.h>
#include <stdarg.h>
#include <stdio.h>
diff --git a/pyanaconda/isys/mem.c b/pyanaconda/isys/mem.c
index 8b32d9f..eb2bc14 100644
--- a/pyanaconda/isys/mem.c
+++ b/pyanaconda/isys/mem.c
@@ -20,6 +20,8 @@
* David Cantrell <dcantrell at redhat.com>
*/
+#include "config.h"
+
#include <errno.h>
#include <glib.h>
#include <stdlib.h>
diff --git a/pyanaconda/isys/vio.c b/pyanaconda/isys/vio.c
index 9b06a3e..c6e72a6 100644
--- a/pyanaconda/isys/vio.c
+++ b/pyanaconda/isys/vio.c
@@ -19,6 +19,8 @@
* Author(s): Jeremy Katz <katzj at redhat.com>
*/
+#include "config.h"
+
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
--
1.8.4.2
More information about the anaconda-patches
mailing list