mitchellh/gist:7d8c32849e4d72be5368 Secret

## gistfile1.txt

*** Makefile.grep	2010-10-14 11:48:06.000000000 -0700
--- Makefile.second	2010-10-14 12:01:40.000000000 -0700
***************
*** 1,8 ****
! # Makefile.in generated by automake 1.9.6 from Makefile.am.
  # Makefile.  Generated from Makefile.in by configure.

  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005  Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
--- 1,9 ----
! # Makefile.in generated by automake 1.11.1 from Makefile.am.
  # Makefile.  Generated from Makefile.in by configure.

  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
! # Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
***************
*** 14,28 ****


- srcdir = .
- top_srcdir = .

  pkgdatadir = $(datadir)/libvirt
- pkglibdir = $(libdir)/libvirt
  pkgincludedir = $(includedir)/libvirt
! top_builddir = .
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = /usr/bin/install -c
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
--- 15,26 ----


  pkgdatadir = $(datadir)/libvirt
  pkgincludedir = $(includedir)/libvirt
! pkglibdir = $(libdir)/libvirt
! pkglibexecdir = $(libexecdir)/libvirt
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
***************
*** 34,41 ****
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
! build_triplet = i686-apple-darwin10.4.0
! host_triplet = i686-apple-darwin10.4.0
  DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
  	$(srcdir)/libvirt.pc.in $(srcdir)/libvirt.spec.in \
--- 32,40 ----
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
! build_triplet = x86_64-apple-darwin10.4.0
! host_triplet = x86_64-apple-darwin10.4.0
! subdir = .
  DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
  	$(srcdir)/libvirt.pc.in $(srcdir)/libvirt.spec.in \
***************
*** 46,52 ****
  	build-aux/install-sh build-aux/ltmain.sh build-aux/mdate-sh \
  	build-aux/missing build-aux/mkinstalldirs \
  	build-aux/texinfo.tex
- subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \
  	$(top_srcdir)/gnulib/m4/alloca.m4 \
--- 45,50 ----
***************
*** 164,198 ****
  	$(top_srcdir)/m4/compiler-flags.m4 $(top_srcdir)/m4/gettext.m4 \
  	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
  	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
! 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
! 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
! 	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
! 	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
! 	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
!  configure.lineno configure.status.lineno
  mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
  CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES = libvirt.pc libvirt.spec mingw32-libvirt.spec
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
  	html-recursive info-recursive install-data-recursive \
! 	install-exec-recursive install-info-recursive \
! 	install-recursive installcheck-recursive installdirs-recursive \
! 	pdf-recursive ps-recursive uninstall-info-recursive \
! 	uninstall-recursive
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
! am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
  am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
- pkgconfigDATA_INSTALL = $(INSTALL_DATA)
  DATA = $(pkgconfig_DATA)
  ETAGS = etags
  CTAGS = ctags
  DIST_SUBDIRS = $(SUBDIRS)
--- 162,225 ----
  	$(top_srcdir)/m4/compiler-flags.m4 $(top_srcdir)/m4/gettext.m4 \
  	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
  	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
! 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
! 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
! 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
! 	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
! 	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/wchar_t.m4 \
! 	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
! 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
!  configure.lineno config.status.lineno
  mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
  CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES = libvirt.pc libvirt.spec mingw32-libvirt.spec
+ CONFIG_CLEAN_VPATH_FILES =
+ AM_V_GEN = $(am__v_GEN_$(V))
+ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+ am__v_GEN_0 = @echo "  GEN   " $@;
+ AM_V_at = $(am__v_at_$(V))
+ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+ am__v_at_0 = @
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
  	html-recursive info-recursive install-data-recursive \
! 	install-dvi-recursive install-exec-recursive \
! 	install-html-recursive install-info-recursive \
! 	install-pdf-recursive install-ps-recursive install-recursive \
! 	installcheck-recursive installdirs-recursive pdf-recursive \
! 	ps-recursive uninstall-recursive
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
! am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
! am__install_max = 40
! am__nobase_strip_setup = \
!   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
! am__nobase_strip = \
!   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
! am__nobase_list = $(am__nobase_strip_setup); \
!   for p in $$list; do echo "$$p $$p"; done | \
!   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
!   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
!     if (++n[$$2] == $(am__install_max)) \
!       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
!     END { for (dir in files) print dir, files[dir] }'
! am__base_list = \
!   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
!   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
  am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
  DATA = $(pkgconfig_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ 	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ 	distdir dist dist-all distcheck
  ETAGS = etags
  CTAGS = ctags
  DIST_SUBDIRS = $(SUBDIRS)
***************
*** 200,218 ****
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
  am__remove_distdir = \
!   { test ! -d $(distdir) \
!     || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
!          && rm -fr $(distdir); }; }
  DIST_ARCHIVES = $(distdir).tar.gz
  GZIP_ENV = --best
  distuninstallcheck_listfiles = find . -type f -print
  distcleancheck_listfiles = find . -type f -print
! ACLOCAL = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/missing --run aclocal-1.9
  ALLOCA =
  ALLOCA_H = alloca.h
- AMDEP_FALSE = #
- AMDEP_TRUE =
  AMTAR = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/missing --run tar
  APPARMOR_CFLAGS =
  APPARMOR_LIBS =
  APPLE_UNIVERSAL_BUILD = 0
--- 227,269 ----
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
  am__remove_distdir = \
!   { test ! -d "$(distdir)" \
!     || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
!          && rm -fr "$(distdir)"; }; }
! am__relativize = \
!   dir0=`pwd`; \
!   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
!   sed_rest='s,^[^/]*/*,,'; \
!   sed_last='s,^.*/\([^/]*\)$$,\1,'; \
!   sed_butlast='s,/*[^/]*$$,,'; \
!   while test -n "$$dir1"; do \
!     first=`echo "$$dir1" | sed -e "$$sed_first"`; \
!     if test "$$first" != "."; then \
!       if test "$$first" = ".."; then \
!         dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
!         dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
!       else \
!         first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
!         if test "$$first2" = "$$first"; then \
!           dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
!         else \
!           dir2="../$$dir2"; \
!         fi; \
!         dir0="$$dir0"/"$$first"; \
!       fi; \
!     fi; \
!     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
!   done; \
!   reldir="$$dir2"
  DIST_ARCHIVES = $(distdir).tar.gz
  GZIP_ENV = --best
  distuninstallcheck_listfiles = find . -type f -print
  distcleancheck_listfiles = find . -type f -print
! ACLOCAL = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/missing --run aclocal-1.11
  ALLOCA =
  ALLOCA_H = alloca.h
  AMTAR = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/missing --run tar
+ AM_DEFAULT_VERBOSITY = 0
  APPARMOR_CFLAGS =
  APPARMOR_LIBS =
  APPLE_UNIVERSAL_BUILD = 0
***************
*** 222,228 ****
  AUGPARSE = /usr/bin/augparse
  AUTOCONF = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/missing --run autoconf
  AUTOHEADER = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/missing --run autoheader
! AUTOMAKE = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/missing --run automake-1.9
  AVAHI_CFLAGS =
  AVAHI_LIBS =
  AWK = gawk
--- 273,279 ----
  AUGPARSE = /usr/bin/augparse
  AUTOCONF = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/missing --run autoconf
  AUTOHEADER = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/missing --run autoheader
! AUTOMAKE = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/missing --run automake-1.11
  AVAHI_CFLAGS =
  AVAHI_LIBS =
  AWK = gawk
***************
*** 237,250 ****
  CC = gcc
  CCDEPMODE = depmode=gcc3
  CFLAGS = -g -O2
  COVERAGE_CFLAGS =
  COVERAGE_LDFLAGS =
  CPP = gcc -E
  CPPFLAGS =
- CXX = g++
- CXXCPP = g++ -E
- CXXDEPMODE = depmode=gcc3
- CXXFLAGS = -g -O2
  CYGPATH_W = echo
  CYGWIN_EXTRA_LDFLAGS =
  CYGWIN_EXTRA_LIBADD =
--- 288,298 ----
  CC = gcc
  CCDEPMODE = depmode=gcc3
  CFLAGS = -g -O2
+ CONFIG_INCLUDE = config.h
  COVERAGE_CFLAGS =
  COVERAGE_LDFLAGS =
  CPP = gcc -E
  CPPFLAGS =
  CYGPATH_W = echo
  CYGWIN_EXTRA_LDFLAGS =
  CYGWIN_EXTRA_LIBADD =
***************
*** 258,288 ****
  DNSMASQ = dnsmasq
  DRIVER_MODULE_CFLAGS =
  DRIVER_MODULE_LIBS =
  EBTABLES_PATH = /sbin/ebtables
- ECHO = /bin/echo
  ECHO_C = \c
  ECHO_N =
  ECHO_T =
! EGREP = grep -E
  EMULTIHOP_HIDDEN =
  EMULTIHOP_VALUE =
- ENABLE_DEBUG_FALSE = #
- ENABLE_DEBUG_TRUE =
- ENABLE_XEN_TESTS_FALSE =
- ENABLE_XEN_TESTS_TRUE = #
  ENOLINK_HIDDEN =
  ENOLINK_VALUE =
  EOVERFLOW_HIDDEN =
  EOVERFLOW_VALUE =
  ERRNO_H =
  EXEEXT =
! F77 =
! FFLAGS =
  FLOAT_H =
  GETADDRINFO_LIB =
  GETHOSTNAME_LIB =
- GL_COND_LIBTOOL_FALSE = #
- GL_COND_LIBTOOL_TRUE =
  GMSGFMT = /opt/local/bin/msgfmt
  GNULIB_ACCEPT = IN_LIBVIRT_GNULIB_TESTS
  GNULIB_ACCEPT4 = 0
--- 306,330 ----
  DNSMASQ = dnsmasq
  DRIVER_MODULE_CFLAGS =
  DRIVER_MODULE_LIBS =
+ DSYMUTIL = dsymutil
+ DUMPBIN =
  EBTABLES_PATH = /sbin/ebtables
  ECHO_C = \c
  ECHO_N =
  ECHO_T =
! EGREP = /usr/bin/grep -E
  EMULTIHOP_HIDDEN =
  EMULTIHOP_VALUE =
  ENOLINK_HIDDEN =
  ENOLINK_VALUE =
  EOVERFLOW_HIDDEN =
  EOVERFLOW_VALUE =
  ERRNO_H =
  EXEEXT =
! FGREP = /usr/bin/grep -F
  FLOAT_H =
  GETADDRINFO_LIB =
  GETHOSTNAME_LIB =
  GMSGFMT = /opt/local/bin/msgfmt
  GNULIB_ACCEPT = IN_LIBVIRT_GNULIB_TESTS
  GNULIB_ACCEPT4 = 0
***************
*** 483,501 ****
  GNULIB__EXIT = 0
  GNUTLS_CFLAGS =
  GNUTLS_LIBS = -lgnutls  -lgcrypt
  HAL_CFLAGS =
  HAL_LIBS =
  HAVE_ACCEPT4 = 1
- HAVE_APPARMOR_FALSE =
- HAVE_APPARMOR_TRUE = #
  HAVE_ARPA_INET_H = 1
  HAVE_ATOLL = 1
- HAVE_AVAHI_FALSE =
- HAVE_AVAHI_TRUE = #
  HAVE_BTOWC = 1
  HAVE_CANONICALIZE_FILE_NAME = 0
- HAVE_CAPNG_FALSE = #
- HAVE_CAPNG_TRUE =
  HAVE_CHOWN = 1
  HAVE_DECL_ENVIRON = 1
  HAVE_DECL_FPURGE = 1
--- 525,538 ----
  GNULIB__EXIT = 0
  GNUTLS_CFLAGS =
  GNUTLS_LIBS = -lgnutls  -lgcrypt
+ GREP = /usr/bin/grep
  HAL_CFLAGS =
  HAL_LIBS =
  HAVE_ACCEPT4 = 1
  HAVE_ARPA_INET_H = 1
  HAVE_ATOLL = 1
  HAVE_BTOWC = 1
  HAVE_CANONICALIZE_FILE_NAME = 0
  HAVE_CHOWN = 1
  HAVE_DECL_ENVIRON = 1
  HAVE_DECL_FPURGE = 1
***************
*** 547,557 ****
  HAVE_GETPAGESIZE = 1
  HAVE_GETSUBOPT = 1
  HAVE_GETTIMEOFDAY = 1
- HAVE_GLIBC_RPCGEN_FALSE = #
- HAVE_GLIBC_RPCGEN_TRUE =
  HAVE_GRANTPT = 1
- HAVE_HAL_FALSE =
- HAVE_HAL_TRUE = #
  HAVE_INTTYPES_H = 1
  HAVE_LCHMOD = 1
  HAVE_LCHOWN = 1
--- 584,590 ----
***************
*** 581,597 ****
  HAVE_NANOSLEEP = 1
  HAVE_NETDB_H = 1
  HAVE_NETINET_IN_H =
- HAVE_NUMACTL_FALSE = #
- HAVE_NUMACTL_TRUE =
  HAVE_OPENAT = 1
  HAVE_OS_H = 0
  HAVE_PIPE2 = 1
- HAVE_POLKIT0_FALSE =
- HAVE_POLKIT0_TRUE = #
- HAVE_POLKIT1_FALSE =
- HAVE_POLKIT1_TRUE = #
- HAVE_POLKIT_FALSE =
- HAVE_POLKIT_TRUE = #
  HAVE_POLL = 1
  HAVE_POLL_H = 1
  HAVE_PREAD = 1
--- 614,622 ----
***************
*** 607,621 ****
  HAVE_READLINKAT = 1
  HAVE_REALPATH = 1
  HAVE_RENAMEAT = 1
- HAVE_RPCGEN_FALSE = #
- HAVE_RPCGEN_TRUE =
  HAVE_RPMATCH = 1
- HAVE_SASL_FALSE = #
- HAVE_SASL_TRUE =
  HAVE_SA_FAMILY_T = 1
  HAVE_SCHED_H =
- HAVE_SELINUX_FALSE =
- HAVE_SELINUX_TRUE = #
  HAVE_SETENV = 1
  HAVE_SIGNED_SIG_ATOMIC_T = 1
  HAVE_SIGNED_WCHAR_T = 1
--- 632,640 ----
***************
*** 656,663 ****
  HAVE_TERMIOS_H = 1
  HAVE_TIMEGM = 1
  HAVE_TTYNAME_R = 1
- HAVE_UDEV_FALSE =
- HAVE_UDEV_TRUE = #
  HAVE_UNAME = 1
  HAVE_UNISTD_H = 1
  HAVE_UNLINKAT = 1
--- 675,680 ----
***************
*** 676,685 ****
  HAVE_WINSOCK2_H = 0
  HAVE_WINT_T = 1
  HAVE_WS2TCPIP_H = 0
- HAVE_XMLRPC_FALSE =
- HAVE_XMLRPC_TRUE = #
- HAVE_YAJL_FALSE =
- HAVE_YAJL_TRUE = #
  HAVE__BOOL = 1
  HAVE__EXIT = 1
  HOSTENT_LIB =
--- 693,698 ----
***************
*** 688,700 ****
  INCLUDE_NEXT_AS_FIRST_DIRECTIVE = include_next
  INET_NTOP_LIB =
  INET_PTON_LIB =
  INSTALL_DATA = ${INSTALL} -m 644
  INSTALL_PROGRAM = ${INSTALL}
  INSTALL_SCRIPT = ${INSTALL}
! INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
  INTLLIBS =
  IPTABLES_PATH = /sbin/iptables
  ISCSIADM =
  LDFLAGS =
  LIBCURL_CFLAGS = -DCURL_DISABLE_TYPECHECK -I/opt/local/include
  LIBCURL_LIBS = -L/opt/local/lib -lcurl -lidn -lssl -lcrypto -lz
--- 701,715 ----
  INCLUDE_NEXT_AS_FIRST_DIRECTIVE = include_next
  INET_NTOP_LIB =
  INET_PTON_LIB =
+ INSTALL = /usr/bin/install -c
  INSTALL_DATA = ${INSTALL} -m 644
  INSTALL_PROGRAM = ${INSTALL}
  INSTALL_SCRIPT = ${INSTALL}
! INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
  INTLLIBS =
  IPTABLES_PATH = /sbin/iptables
  ISCSIADM =
+ LD = /usr/libexec/gcc/i686-apple-darwin10/4.2.1/ld
  LDFLAGS =
  LIBCURL_CFLAGS = -DCURL_DISABLE_TYPECHECK -I/opt/local/include
  LIBCURL_LIBS = -L/opt/local/lib -lcurl -lidn -lssl -lcrypto -lz
***************
*** 713,720 ****
  LIBSSH2_LIBS =
  LIBTESTS_LIBDEPS =
  LIBTOOL = $(SHELL) $(top_builddir)/libtool
- LIBVIRT_INIT_SCRIPT_RED_HAT_FALSE =
- LIBVIRT_INIT_SCRIPT_RED_HAT_TRUE = #
  LIBVIRT_MAJOR_VERSION = 0
  LIBVIRT_MICRO_VERSION = 4
  LIBVIRT_MINOR_VERSION = 8
--- 728,733 ----
***************
*** 728,733 ****
--- 741,747 ----
  LIBXML_CFLAGS = -I/opt/local/include/libxml2
  LIBXML_LIBS = -L/opt/local/lib -lxml2 -lpthread -lz -liconv -lm
  LIB_PTHREAD =
+ LIPO = lipo
  LN_S = ln -s
  LOCK_CHECKING_CFLAGS =
  LTALLOCA =
***************
*** 739,746 ****
  LVS =
  LV_LIBTOOL_OBJDIR = .libs
  MAKEINFO = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/missing --run makeinfo
  MINGW_EXTRA_LDFLAGS =
! MKDIR_P = $(mkdir_p)
  MKINSTALLDIRS = $(top_builddir)/build-aux/mkinstalldirs
  MODPROBE =
  MOUNT =
--- 753,761 ----
  LVS =
  LV_LIBTOOL_OBJDIR = .libs
  MAKEINFO = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/missing --run makeinfo
+ MANIFEST_TOOL = :
  MINGW_EXTRA_LDFLAGS =
! MKDIR_P = build-aux/install-sh -c -d
  MKINSTALLDIRS = $(top_builddir)/build-aux/mkinstalldirs
  MODPROBE =
  MOUNT =
***************
*** 801,815 ****
--- 816,835 ----
  NEXT_TIME_H = <time.h>
  NEXT_UNISTD_H = <unistd.h>
  NEXT_WCHAR_H = <wchar.h>
+ NM = /usr/bin/nm
+ NMEDIT = nmedit
  NUMACTL_CFLAGS =
  NUMACTL_LIBS =
  OBJDUMP = objdump
  OBJEXT = o
+ OTOOL = otool
+ OTOOL64 = :
  PACKAGE = libvirt
  PACKAGE_BUGREPORT = libvir-list@redhat.com
  PACKAGE_NAME = libvirt
  PACKAGE_STRING = libvirt 0.8.4
  PACKAGE_TARNAME = libvirt
+ PACKAGE_URL = http://libvirt.org
  PACKAGE_VERSION = 0.8.4
  PARTED =
  PATH_SEPARATOR = :
***************
*** 817,822 ****
--- 837,844 ----
  PCIACCESS_LIBS =
  PKCHECK_PATH =
  PKG_CONFIG = /opt/local/bin/pkg-config
+ PKG_CONFIG_LIBDIR =
+ PKG_CONFIG_PATH =
  POLKIT_AUTH =
  POLKIT_CFLAGS =
  POLKIT_LIBS =
***************
*** 995,1074 ****
  WIN32_EXTRA_CFLAGS =
  WINDRES =
  WINT_T_SUFFIX =
- WITH_BRIDGE_FALSE =
- WITH_BRIDGE_TRUE = #
- WITH_CIL_FALSE =
- WITH_CIL_TRUE = #
- WITH_DRIVER_MODULES_FALSE =
- WITH_DRIVER_MODULES_TRUE = #
- WITH_ESX_FALSE = #
- WITH_ESX_TRUE =
- WITH_LIBVIRTD_FALSE = #
- WITH_LIBVIRTD_TRUE =
- WITH_LINUX_FALSE =
- WITH_LINUX_TRUE = #
- WITH_LXC_FALSE =
- WITH_LXC_TRUE = #
- WITH_MACVTAP_FALSE =
- WITH_MACVTAP_TRUE = #
- WITH_NETCF_FALSE =
- WITH_NETCF_TRUE = #
- WITH_NETWORK_FALSE =
- WITH_NETWORK_TRUE = #
- WITH_NODE_DEVICES_FALSE =
- WITH_NODE_DEVICES_TRUE = #
- WITH_NWFILTER_FALSE =
- WITH_NWFILTER_TRUE = #
- WITH_ONE_FALSE =
- WITH_ONE_TRUE = #
- WITH_OPENVZ_FALSE = #
- WITH_OPENVZ_TRUE =
- WITH_PHYP_FALSE =
- WITH_PHYP_TRUE = #
- WITH_PROXY_FALSE =
- WITH_PROXY_TRUE = #
- WITH_PYTHON_FALSE = #
- WITH_PYTHON_TRUE =
- WITH_QEMU_FALSE =
- WITH_QEMU_TRUE = #
- WITH_REMOTE_FALSE = #
- WITH_REMOTE_TRUE =
- WITH_SECDRIVER_APPARMOR_FALSE =
- WITH_SECDRIVER_APPARMOR_TRUE = #
- WITH_SECDRIVER_SELINUX_FALSE =
- WITH_SECDRIVER_SELINUX_TRUE = #
- WITH_SECRETS_FALSE = #
- WITH_SECRETS_TRUE =
- WITH_STORAGE_DIR_FALSE = #
- WITH_STORAGE_DIR_TRUE =
- WITH_STORAGE_DISK_FALSE =
- WITH_STORAGE_DISK_TRUE = #
- WITH_STORAGE_FS_FALSE =
- WITH_STORAGE_FS_TRUE = #
- WITH_STORAGE_ISCSI_FALSE =
- WITH_STORAGE_ISCSI_TRUE = #
- WITH_STORAGE_LVM_FALSE =
- WITH_STORAGE_LVM_TRUE = #
- WITH_STORAGE_MPATH_FALSE =
- WITH_STORAGE_MPATH_TRUE = #
- WITH_STORAGE_SCSI_FALSE = #
- WITH_STORAGE_SCSI_TRUE =
- WITH_TEST_FALSE = #
- WITH_TEST_TRUE =
- WITH_UML_FALSE =
- WITH_UML_TRUE = #
- WITH_VBOX_FALSE = #
- WITH_VBOX_TRUE =
- WITH_VIRTUALPORT_FALSE =
- WITH_VIRTUALPORT_TRUE = #
- WITH_WIN_ICON_FALSE =
- WITH_WIN_ICON_TRUE = #
- WITH_XENAPI_FALSE =
- WITH_XENAPI_TRUE = #
- WITH_XEN_FALSE =
- WITH_XEN_INOTIFY_FALSE =
- WITH_XEN_INOTIFY_TRUE = #
- WITH_XEN_TRUE = #
  XEN_CFLAGS =
  XEN_LIBS =
  XGETTEXT = /opt/local/bin/xgettext
--- 1017,1022 ----
***************
*** 1080,1142 ****
  YAJL_CFLAGS =
  YAJL_LIBS =
  abs_aux_dir = /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux
  ac_ct_AR = ar
- ac_ct_AS =
  ac_ct_CC = gcc
! ac_ct_CXX = g++
! ac_ct_DLLTOOL =
! ac_ct_F77 =
! ac_ct_OBJDUMP =
! ac_ct_RANLIB = ranlib
! ac_ct_STRIP = strip
! ac_ct_WINDRES =
! ac_pt_PKG_CONFIG = /opt/local/bin/pkg-config
! am__fastdepCC_FALSE = #
! am__fastdepCC_TRUE =
! am__fastdepCXX_FALSE = #
! am__fastdepCXX_TRUE =
  am__include = include
  am__leading_dot = .
  am__quote =
  am__tar = ${AMTAR} chof - "$$tardir"
  am__untar = ${AMTAR} xf -
  bindir = ${exec_prefix}/bin
! build = i686-apple-darwin10.4.0
  build_alias =
! build_cpu = i686
  build_os = darwin10.4.0
  build_vendor = apple
! datadir = ${prefix}/share
  exec_prefix = ${prefix}
  gl_LIBOBJS =  asnprintf.o basename-lgpl.o canonicalize-lgpl.o dirname-lgpl.o getdelim.o getline.o ioctl.o lstat.o md5.o mktime.o physmem.o poll.o printf-args.o printf-parse.o random_r.o rawmemchr.o readlink.o stat.o strchrnul.o stripslash.o strndup.o strnlen.o tempname.o timegm.o vasnprintf.o
  gl_LTLIBOBJS =  asnprintf.lo basename-lgpl.lo canonicalize-lgpl.lo dirname-lgpl.lo getdelim.lo getline.lo ioctl.lo lstat.lo md5.lo mktime.lo physmem.lo poll.lo printf-args.lo printf-parse.lo random_r.lo rawmemchr.lo readlink.lo stat.lo strchrnul.lo stripslash.lo strndup.lo strnlen.lo tempname.lo timegm.lo vasnprintf.lo
  gltests_LIBOBJS =  symlink.o
  gltests_LTLIBOBJS =  symlink.lo
  gltests_WITNESS = IN_LIBVIRT_GNULIB_TESTS
! host = i686-apple-darwin10.4.0
  host_alias =
! host_cpu = i686
  host_os = darwin10.4.0
  host_vendor = apple
  includedir = ${prefix}/include
! infodir = ${prefix}/info
! install_sh = /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/install-sh
  libdir = ${exec_prefix}/lib
  libexecdir = ${exec_prefix}/libexec
  localstatedir = ${prefix}/var
! mandir = ${prefix}/man
! mkdir_p = $(mkinstalldirs)
  oldincludedir = /usr/include
  pkgpyexecdir = ${pyexecdir}/libvirt
  pkgpythondir = ${pythondir}/libvirt
! prefix = /usr/local
  program_transform_name = s,x,x,
  pyexecdir = ${exec_prefix}/lib/python2.6/site-packages
  pythondir = ${prefix}/lib/python2.6/site-packages
  sbindir = ${exec_prefix}/sbin
  sharedstatedir = ${prefix}/com
  sysconfdir = ${prefix}/etc
  target_alias =
  LCOV = lcov
  GENHTML = genhtml
  SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \
--- 1028,1094 ----
  YAJL_CFLAGS =
  YAJL_LIBS =
  abs_aux_dir = /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux
+ abs_builddir = /Users/mitchellh/Desktop/libvirt-0.8.4
+ abs_srcdir = /Users/mitchellh/Desktop/libvirt-0.8.4
+ abs_top_builddir = /Users/mitchellh/Desktop/libvirt-0.8.4
+ abs_top_srcdir = /Users/mitchellh/Desktop/libvirt-0.8.4
  ac_ct_AR = ar
  ac_ct_CC = gcc
! ac_ct_DUMPBIN =
  am__include = include
  am__leading_dot = .
  am__quote =
  am__tar = ${AMTAR} chof - "$$tardir"
  am__untar = ${AMTAR} xf -
  bindir = ${exec_prefix}/bin
! build = x86_64-apple-darwin10.4.0
  build_alias =
! build_cpu = x86_64
  build_os = darwin10.4.0
  build_vendor = apple
! builddir = .
! datadir = ${datarootdir}
! datarootdir = ${prefix}/share
! docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
! dvidir = ${docdir}
  exec_prefix = ${prefix}
  gl_LIBOBJS =  asnprintf.o basename-lgpl.o canonicalize-lgpl.o dirname-lgpl.o getdelim.o getline.o ioctl.o lstat.o md5.o mktime.o physmem.o poll.o printf-args.o printf-parse.o random_r.o rawmemchr.o readlink.o stat.o strchrnul.o stripslash.o strndup.o strnlen.o tempname.o timegm.o vasnprintf.o
  gl_LTLIBOBJS =  asnprintf.lo basename-lgpl.lo canonicalize-lgpl.lo dirname-lgpl.lo getdelim.lo getline.lo ioctl.lo lstat.lo md5.lo mktime.lo physmem.lo poll.lo printf-args.lo printf-parse.lo random_r.lo rawmemchr.lo readlink.lo stat.lo strchrnul.lo stripslash.lo strndup.lo strnlen.lo tempname.lo timegm.lo vasnprintf.lo
  gltests_LIBOBJS =  symlink.o
  gltests_LTLIBOBJS =  symlink.lo
  gltests_WITNESS = IN_LIBVIRT_GNULIB_TESTS
! host = x86_64-apple-darwin10.4.0
  host_alias =
! host_cpu = x86_64
  host_os = darwin10.4.0
  host_vendor = apple
+ htmldir = ${docdir}
  includedir = ${prefix}/include
! infodir = ${datarootdir}/info
! install_sh = ${SHELL} /Users/mitchellh/Desktop/libvirt-0.8.4/build-aux/install-sh
  libdir = ${exec_prefix}/lib
  libexecdir = ${exec_prefix}/libexec
+ localedir = ${datarootdir}/locale
  localstatedir = ${prefix}/var
! mandir = ${datarootdir}/man
! mkdir_p = $(top_builddir)/build-aux/install-sh -c -d
  oldincludedir = /usr/include
+ pdfdir = ${docdir}
  pkgpyexecdir = ${pyexecdir}/libvirt
  pkgpythondir = ${pythondir}/libvirt
! prefix = /Users/mitchellh/Desktop/libvirt-install-two
  program_transform_name = s,x,x,
+ psdir = ${docdir}
  pyexecdir = ${exec_prefix}/lib/python2.6/site-packages
  pythondir = ${prefix}/lib/python2.6/site-packages
  sbindir = ${exec_prefix}/sbin
  sharedstatedir = ${prefix}/com
+ srcdir = .
  sysconfdir = ${prefix}/etc
  target_alias =
+ top_build_prefix =
+ top_builddir = .
+ top_srcdir = .
  LCOV = lcov
  GENHTML = genhtml
  SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \
***************
*** 1196,1210 ****
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
! 	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
! 	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
  		&& exit 0; \
  	      exit 1;; \
  	  esac; \
  	done; \
! 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
! 	cd $(top_srcdir) && \
! 	  $(AUTOMAKE) --gnu  Makefile
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
--- 1148,1162 ----
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
! 	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
! 	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
  		&& exit 0; \
  	      exit 1;; \
  	  esac; \
  	done; \
! 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
! 	$(am__cd) $(top_srcdir) && \
! 	  $(AUTOMAKE) --gnu Makefile
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
***************
*** 1220,1240 ****
  	$(SHELL) ./config.status --recheck

  $(top_srcdir)/configure:  $(am__configure_deps)
! 	cd $(srcdir) && $(AUTOCONF)
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
! 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

  config.h: stamp-h1
  	@if test ! -f $@; then \
  	  rm -f stamp-h1; \
! 	  $(MAKE) stamp-h1; \
  	else :; fi

  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
  $(srcdir)/config.h.in:  $(am__configure_deps)
! 	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h1
  	touch $@

--- 1172,1193 ----
  	$(SHELL) ./config.status --recheck

  $(top_srcdir)/configure:  $(am__configure_deps)
! 	$(am__cd) $(srcdir) && $(AUTOCONF)
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
! 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
! $(am__aclocal_m4_deps):

  config.h: stamp-h1
  	@if test ! -f $@; then \
  	  rm -f stamp-h1; \
! 	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
  	else :; fi

  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
  $(srcdir)/config.h.in:  $(am__configure_deps)
! 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
  	rm -f stamp-h1
  	touch $@

***************
*** 1254,1278 ****
  	-rm -rf .libs _libs

  distclean-libtool:
! 	-rm -f libtool
! uninstall-info-am:
  install-pkgconfigDATA: $(pkgconfig_DATA)
  	@$(NORMAL_INSTALL)
! 	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
! 	@list='$(pkgconfig_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
! 	  f=$(am__strip_dir) \
! 	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
! 	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
  	done

  uninstall-pkgconfigDATA:
  	@$(NORMAL_UNINSTALL)
! 	@list='$(pkgconfig_DATA)'; for p in $$list; do \
! 	  f=$(am__strip_dir) \
! 	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
! 	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
! 	done

  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
--- 1207,1233 ----
  	-rm -rf .libs _libs

  distclean-libtool:
! 	-rm -f libtool config.lt
  install-pkgconfigDATA: $(pkgconfig_DATA)
  	@$(NORMAL_INSTALL)
! 	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
! 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
! 	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
! 	  echo "$$d$$p"; \
! 	done | $(am__base_list) | \
! 	while read files; do \
! 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
! 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
  	done

  uninstall-pkgconfigDATA:
  	@$(NORMAL_UNINSTALL)
! 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
! 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
! 	test -n "$$files" || exit 0; \
! 	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
! 	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files

  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
***************
*** 1281,1287 ****
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
! 	@failcom='exit 1'; \
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
--- 1236,1242 ----
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
! 	@fail= failcom='exit 1'; \
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
***************
*** 1298,1313 ****
  	  else \
  	    local_target="$$target"; \
  	  fi; \
! 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
  	fi; test -z "$$fail"

! mostlyclean-recursive clean-recursive distclean-recursive \
! maintainer-clean-recursive:
! 	@failcom='exit 1'; \
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
--- 1253,1267 ----
  	  else \
  	    local_target="$$target"; \
  	  fi; \
! 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
  	fi; test -z "$$fail"

! $(RECURSIVE_CLEAN_TARGETS):
! 	@fail= failcom='exit 1'; \
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
***************
*** 1333,1348 ****
  	  else \
  	    local_target="$$target"; \
  	  fi; \
! 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
  	  || eval $$failcom; \
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
  	done
  ctags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done

  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
--- 1287,1302 ----
  	  else \
  	    local_target="$$target"; \
  	  fi; \
! 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
  	  || eval $$failcom; \
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
  	done
  ctags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done

  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
***************
*** 1350,1363 ****
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
  tags: TAGS

  TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
! 	tags=; \
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
--- 1304,1317 ----
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
! 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  	mkid -fID $$unique
  tags: TAGS

  TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
! 	set x; \
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
***************
*** 1369,1452 ****
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
! 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
! 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
! 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	    $$tags $$unique; \
  	fi
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
! 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! 	     $$tags $$unique

  GTAGS:
  	here=`$(am__cd) $(top_builddir) && pwd` \
! 	  && cd $(top_srcdir) \
! 	  && gtags -i $(GTAGS_ARGS) $$here

  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

  distdir: $(DISTFILES)
  	$(am__remove_distdir)
! 	mkdir $(distdir)
! 	$(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(srcdir)/examples/xml $(distdir)/. $(distdir)/build-aux $(distdir)/examples/domain-events $(distdir)/gnulib/m4 $(distdir)/include/libvirt $(distdir)/m4 $(distdir)/po $(distdir)/storage $(distdir)/test
! 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! 	list='$(DISTFILES)'; for file in $$list; do \
! 	  case $$file in \
! 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! 	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! 	  esac; \
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
- 	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
  	  if test -d $$d/$$file; then \
  	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  	    fi; \
! 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  	  else \
! 	    test -f $(distdir)/$$file \
! 	    || cp -p $$d/$$file $(distdir)/$$file \
  	    || exit 1; \
  	  fi; \
  	done
! 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
! 	    || $(mkdir_p) "$(distdir)/$$subdir" \
  	    || exit 1; \
! 	    distdir=`$(am__cd) $(distdir) && pwd`; \
! 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
! 	    (cd $$subdir && \
  	      $(MAKE) $(AM_MAKEFLAGS) \
! 	        top_distdir="$$top_distdir" \
! 	        distdir="$$distdir/$$subdir" \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
--- 1323,1425 ----
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
! 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
! 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
! 	shift; \
! 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
! 	  if test $$# -gt 0; then \
! 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	      "$$@" $$unique; \
! 	  else \
! 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	      $$unique; \
! 	  fi; \
  	fi
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
  	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
! 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
! 	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! 	     $$unique

  GTAGS:
  	here=`$(am__cd) $(top_builddir) && pwd` \
! 	  && $(am__cd) $(top_srcdir) \
! 	  && gtags -i $(GTAGS_ARGS) "$$here"

  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

  distdir: $(DISTFILES)
  	$(am__remove_distdir)
! 	test -d "$(distdir)" || mkdir "$(distdir)"
! 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
! 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
! 	list='$(DISTFILES)'; \
! 	  dist_files=`for file in $$list; do echo $$file; done | \
! 	  sed -e "s|^$$srcdirstrip/||;t" \
! 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
! 	case $$dist_files in \
! 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
! 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
! 			   sort -u` ;; \
! 	esac; \
! 	for file in $$dist_files; do \
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d "$(distdir)/$$file"; then \
+ 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ 	    fi; \
  	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
! 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  	    fi; \
! 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
  	  else \
! 	    test -f "$(distdir)/$$file" \
! 	    || cp -p $$d/$$file "$(distdir)/$$file" \
  	    || exit 1; \
  	  fi; \
  	done
! 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
! 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
! 	  fi; \
! 	done
! 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
! 	  if test "$$subdir" = .; then :; else \
! 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
! 	    $(am__relativize); \
! 	    new_distdir=$$reldir; \
! 	    dir1=$$subdir; dir2="$(top_distdir)"; \
! 	    $(am__relativize); \
! 	    new_top_distdir=$$reldir; \
! 	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
! 	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
! 	    ($(am__cd) $$subdir && \
  	      $(MAKE) $(AM_MAKEFLAGS) \
! 	        top_distdir="$$new_top_distdir" \
! 	        distdir="$$new_distdir" \
! 		am__remove_distdir=: \
! 		am__skip_length_check=: \
! 		am__skip_mode_fix=: \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
***************
*** 1454,1464 ****
  	$(MAKE) $(AM_MAKEFLAGS) \
  	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
  	  dist-hook
! 	-find $(distdir) -type d ! -perm -755 -exec chmod a+rwx,go+rx {} \; -o \
  	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
  	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! 	|| chmod -R a+r $(distdir)
  dist-gzip: distdir
  	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
  	$(am__remove_distdir)
--- 1427,1439 ----
  	$(MAKE) $(AM_MAKEFLAGS) \
  	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
  	  dist-hook
! 	-test -n "$(am__skip_mode_fix)" \
! 	|| find "$(distdir)" -type d ! -perm -755 \
! 		-exec chmod u+rwx,go+rx {} \; -o \
  	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
  	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
! 	|| chmod -R a+r "$(distdir)"
  dist-gzip: distdir
  	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
  	$(am__remove_distdir)
***************
*** 1467,1472 ****
--- 1442,1455 ----
  	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
  	$(am__remove_distdir)

+ dist-lzma: distdir
+ 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ 	$(am__remove_distdir)
+
+ dist-xz: distdir
+ 	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ 	$(am__remove_distdir)
+
  dist-tarZ: distdir
  	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
  	$(am__remove_distdir)
***************
*** 1490,1502 ****
  distcheck: dist
  	case '$(DIST_ARCHIVES)' in \
  	*.tar.gz*) \
! 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
  	*.tar.bz2*) \
! 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
  	*.tar.Z*) \
  	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
  	*.shar.gz*) \
! 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
  	*.zip*) \
  	  unzip $(distdir).zip ;;\
  	esac
--- 1473,1489 ----
  distcheck: dist
  	case '$(DIST_ARCHIVES)' in \
  	*.tar.gz*) \
! 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
  	*.tar.bz2*) \
! 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
! 	*.tar.lzma*) \
! 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
! 	*.tar.xz*) \
! 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
  	*.tar.Z*) \
  	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
  	*.shar.gz*) \
! 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
  	*.zip*) \
  	  unzip $(distdir).zip ;;\
  	esac
***************
*** 1504,1512 ****
  	mkdir $(distdir)/_build
  	mkdir $(distdir)/_inst
  	chmod a-w $(distdir)
  	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
  	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
! 	  && cd $(distdir)/_build \
  	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
  	    $(DISTCHECK_CONFIGURE_FLAGS) \
  	  && $(MAKE) $(AM_MAKEFLAGS) \
--- 1491,1501 ----
  	mkdir $(distdir)/_build
  	mkdir $(distdir)/_inst
  	chmod a-w $(distdir)
+ 	test -d $(distdir)/_build || exit 0; \
  	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
  	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
! 	  && am__cwd=`pwd` \
! 	  && $(am__cd) $(distdir)/_build \
  	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
  	    $(DISTCHECK_CONFIGURE_FLAGS) \
  	  && $(MAKE) $(AM_MAKEFLAGS) \
***************
*** 1528,1538 ****
  	  && rm -rf "$$dc_destdir" \
  	  && $(MAKE) $(AM_MAKEFLAGS) dist \
  	  && rm -rf $(DIST_ARCHIVES) \
! 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
  	$(am__remove_distdir)
  	@(echo "$(distdir) archives ready for distribution: "; \
  	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
! 	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
  distcleancheck: distclean
  	@if test '$(srcdir)' = . ; then \
  	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
--- 1517,1529 ----
  	  && rm -rf "$$dc_destdir" \
  	  && $(MAKE) $(AM_MAKEFLAGS) dist \
  	  && rm -rf $(DIST_ARCHIVES) \
! 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
! 	  && cd "$$am__cwd" \
! 	  || exit 1
  	$(am__remove_distdir)
  	@(echo "$(distdir) archives ready for distribution: "; \
  	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
! 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
  distcleancheck: distclean
  	@if test '$(srcdir)' = . ; then \
  	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
***************
*** 1549,1555 ****
  installdirs: installdirs-recursive
  installdirs-am:
  	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
! 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  	done
  install: install-recursive
  install-exec: install-exec-recursive
--- 1540,1546 ----
  installdirs: installdirs-recursive
  installdirs-am:
  	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
! 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-recursive
  install-exec: install-exec-recursive
***************
*** 1571,1576 ****
--- 1562,1568 ----

  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
***************
*** 1592,1609 ****
--- 1584,1621 ----

  html: html-recursive

+ html-am:
+
  info: info-recursive

  info-am:

  install-data-am: install-pkgconfigDATA

+ install-dvi: install-dvi-recursive
+
+ install-dvi-am:
+
  install-exec-am:

+ install-html: install-html-recursive
+
+ install-html-am:
+
  install-info: install-info-recursive

+ install-info-am:
+
  install-man:

+ install-pdf: install-pdf-recursive
+
+ install-pdf-am:
+
+ install-ps: install-ps-recursive
+
+ install-ps-am:
+
  installcheck-am:

  maintainer-clean: maintainer-clean-recursive
***************
*** 1624,1648 ****

  ps-am:

! uninstall-am: uninstall-info-am uninstall-pkgconfigDATA

! uninstall-info: uninstall-info-recursive

! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
! 	check-am check-local clean clean-generic clean-libtool \
! 	clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
! 	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
! 	distclean distclean-generic distclean-hdr distclean-libtool \
! 	distclean-recursive distclean-tags distcleancheck distdir \
! 	distuninstallcheck dvi dvi-am html html-am info info-am \
! 	install install-am install-data install-data-am install-exec \
! 	install-exec-am install-info install-info-am install-man \
! 	install-pkgconfigDATA install-strip installcheck \
! 	installcheck-am installdirs installdirs-am maintainer-clean \
! 	maintainer-clean-generic maintainer-clean-recursive \
! 	mostlyclean mostlyclean-generic mostlyclean-libtool \
! 	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
! 	uninstall uninstall-am uninstall-info-am \
  	uninstall-pkgconfigDATA


--- 1636,1662 ----

  ps-am:

! uninstall-am: uninstall-pkgconfigDATA

! .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
! 	ctags-recursive install-am install-strip tags-recursive

! .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
! 	all all-am am--refresh check check-am check-local clean \
! 	clean-generic clean-libtool ctags ctags-recursive dist \
! 	dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
! 	dist-tarZ dist-xz dist-zip distcheck distclean \
! 	distclean-generic distclean-hdr distclean-libtool \
! 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
! 	dvi-am html html-am info info-am install install-am \
! 	install-data install-data-am install-dvi install-dvi-am \
! 	install-exec install-exec-am install-html install-html-am \
! 	install-info install-info-am install-man install-pdf \
! 	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
! 	install-strip installcheck installcheck-am installdirs \
! 	installdirs-am maintainer-clean maintainer-clean-generic \
! 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
! 	ps ps-am tags tags-recursive uninstall uninstall-am \
  	uninstall-pkgconfigDATA


***************
*** 1690,1695 ****
--- 1704,1710 ----
  	  rm -f $(distdir)/ChangeLog;				\
  	  mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
  	fi
+
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT: