[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libvir] [PATCH] Fix substitution of QEMUD_PID_FILE




This fixes the bug I raised in my previous email.

Use AC_SUBST instead of AC_DEFINE because we want autoconf to substitute the value into the Makefile, not into config.h. Then add @QEMUD_PID_FILE@ to CFLAGS.

This seems to be the correct thing to do, according to my understanding of http://tinyurl.com/34gtdj .

Rich.

--
Emerging Technologies, Red Hat  http://et.redhat.com/~rjones/
64 Baker Street, London, W1U 7DF     Mobile: +44 7866 314 421

Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod
Street, Windsor, Berkshire, SL4 1TE, United Kingdom.
Registered in England and Wales under Company Registration No. 3798903
Directors: Michael Cunningham (USA), Charlie Peters (USA) and David
Owens (Ireland)
Index: configure.in
===================================================================
RCS file: /data/cvs/libvirt/configure.in,v
retrieving revision 1.68
diff -u -r1.68 configure.in
--- configure.in	27 Mar 2007 14:45:17 -0000	1.68
+++ configure.in	3 Apr 2007 10:34:27 -0000
@@ -105,7 +105,7 @@
 else
    QEMUD_PID_FILE="$with_qemud_pid_file"
 fi
-AC_DEFINE_UNQUOTED(QEMUD_PID_FILE, "$QEMUD_PID_FILE", [PID file path for qemud])
+AC_SUBST(QEMUD_PID_FILE)
 AC_MSG_RESULT($QEMUD_PID_FILE)
 
 dnl
Index: qemud/Makefile.am
===================================================================
RCS file: /data/cvs/libvirt/qemud/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- qemud/Makefile.am	15 Mar 2007 17:24:57 -0000	1.16
+++ qemud/Makefile.am	3 Apr 2007 10:34:27 -0000
@@ -17,7 +17,8 @@
 libvirt_qemud_CFLAGS = \
         -I$(top_srcdir)/include -I$(top_builddir)/include $(LIBXML_CFLAGS) \
         $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \
-        -DSYSCONF_DIR="\"$(sysconfdir)\""
+        -DSYSCONF_DIR="\"$(sysconfdir)\"" \
+	-DQEMUD_PID_FILE="\"@QEMUD_PID_FILE \""
 libvirt_qemud_LDFLAGS = $(LIBXML_LIBS) $(SYSFS_LIBS)
 libvirt_qemud_DEPENDENCIES =
 libvirt_qemud_LDADD =

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]