Attachment 4747 Details for Bug 6042 – Allow build outside the source directory: the release extra patch

[patch] Allow build outside the source directory: the release extra patch

dbus.release.extra.source.patch (text/plain), 9.72 KB, created by Bernard Leak on 2006-02-26 00:14:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Leak

Created: 2006-02-26 00:14:33 UTC

Size: 9.72 KB

patch

obsolete

>#Output of diff -Nru dbus-0.60/configure{-old,}
>--- dbus-0.60/configure-old	2005-11-30 21:02:26.000000000 +0000
>+++ dbus-0.60/configure	2006-02-24 23:01:53.000000000 +0000
>@@ -465,7 +465,7 @@
> # include <unistd.h>
> #endif"
> 
>-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE DBUS_USE_GCJ_TRUE DBUS_USE_GCJ_FALSE LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MONO_REQUIRED_VERSION PKG_CONFIG MONO_DEPENDENCY_CFLAGS MONO_DEPENDENCY_LIBS RUNTIME CSC GACUTIL LIB_PREFIX LIB_SUFFIX DBUS_USE_CSC_TRUE DBUS_USE_CSC_FALSE MONODOC_REQUIRED_VERSION MONODOC_DEPENDENCY_CFLAGS MONODOC_DEPENDENCY_LIBS MONODOC ENABLE_MONODOC_TRUE ENABLE_MONODOC_FALSE DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS DBUS_GLIB_THREADS_CFLAGS DBUS_GLIB_THREADS_LIBS HAVE_GLIB_TRUE HAVE_GLIB_FALSE HAVE_GLIB_THREADS_TRUE HAVE_GLIB_THREADS_FALSE GLIB_GENMARSHAL DBUS_GLIB_TOOL_CFLAGS DBUS_GLIB_TOOL_LIBS DBUS_GTK_CFLAGS DBUS_GTK_LIBS DBUS_GTK_THREADS_CFLAGS DBUS_GTK_THREADS_LIBS HAVE_GTK_TRUE HAVE_GTK_FALSE QT3_MOC HAVE_QT3_TRUE HAVE_QT3_FALSE DBUS_QT3_CXXFLAGS DBUS_QT3_LIBS DBUS_QT_CFLAGS DBUS_QT_LIBS HAVE_QT_TRUE HAVE_QT_FALSE QT_MOC DBUS_QTESTLIB_CFLAGS DBUS_QTESTLIB_LIBS HAVE_QTESTLIB_TRUE HAVE_QTESTLIB_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_USER TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_GLIB_SERVICE_BINARY TEST_PYTHON_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY ABSOLUTE_TOP_BUILDDIR TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYREX PYTHON_INCLUDES HAVE_PYTHON_TRUE HAVE_PYTHON_FALSE LIBOBJS LTLIBOBJS'
>+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE DBUS_USE_GCJ_TRUE DBUS_USE_GCJ_FALSE LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MONO_REQUIRED_VERSION PKG_CONFIG MONO_DEPENDENCY_CFLAGS MONO_DEPENDENCY_LIBS RUNTIME CSC GACUTIL LIB_PREFIX LIB_SUFFIX DBUS_USE_CSC_TRUE DBUS_USE_CSC_FALSE MONODOC_REQUIRED_VERSION MONODOC_DEPENDENCY_CFLAGS MONODOC_DEPENDENCY_LIBS MONODOC ENABLE_MONODOC_TRUE ENABLE_MONODOC_FALSE DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS DBUS_GLIB_THREADS_CFLAGS DBUS_GLIB_THREADS_LIBS HAVE_GLIB_TRUE HAVE_GLIB_FALSE HAVE_GLIB_THREADS_TRUE HAVE_GLIB_THREADS_FALSE GLIB_GENMARSHAL DBUS_GLIB_TOOL_CFLAGS DBUS_GLIB_TOOL_LIBS DBUS_GTK_CFLAGS DBUS_GTK_LIBS DBUS_GTK_THREADS_CFLAGS DBUS_GTK_THREADS_LIBS HAVE_GTK_TRUE HAVE_GTK_FALSE QT3_MOC HAVE_QT3_TRUE HAVE_QT3_FALSE DBUS_QT3_CXXFLAGS DBUS_QT3_LIBS DBUS_QT_CFLAGS DBUS_QT_LIBS HAVE_QT_TRUE HAVE_QT_FALSE QT_MOC DBUS_QTESTLIB_CFLAGS DBUS_QTESTLIB_LIBS HAVE_QTESTLIB_TRUE HAVE_QTESTLIB_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_USER TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_GLIB_SERVICE_BINARY TEST_PYTHON_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYREX PYTHON_INCLUDES HAVE_PYTHON_TRUE HAVE_PYTHON_FALSE LIBOBJS LTLIBOBJS'
> ac_subst_files=''
> 
> # Initialize some variables set by options.
>@@ -30826,13 +30826,8 @@
> _ACEOF
> 
> 
>-#### Tell tests where to find certain stuff in builddir
>-ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd`
>-
>-
>-
>-
>+DBUS_PWD=`pwd`
>-TEST_SERVICE_DIR=${ABSOLUTE_TOP_BUILDDIR}/test/data/valid-service-files
>+TEST_SERVICE_DIR=${DBUS_PWD}/test/data/valid-service-files
> 
> cat >>confdefs.h <<_ACEOF
> #define TEST_SERVICE_DIR "$TEST_SERVICE_DIR"
>@@ -30841,7 +30835,7 @@
> 
> 
> 
>-TEST_SERVICE_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-service
>+TEST_SERVICE_BINARY=${DBUS_PWD}/test/test-service
> 
> cat >>confdefs.h <<_ACEOF
> #define TEST_SERVICE_BINARY "$TEST_SERVICE_BINARY"
>@@ -30850,7 +30844,7 @@
> 
> 
> 
>-TEST_SHELL_SERVICE_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-shell-service
>+TEST_SHELL_SERVICE_BINARY=${DBUS_PWD}/test/test-shell-service
> 
> cat >>confdefs.h <<_ACEOF
> #define TEST_SHELL_SERVICE_BINARY "$TEST_SHELL_SERVICE_BINARY"
>@@ -30859,7 +30853,7 @@
> 
> 
> 
>-TEST_GLIB_SERVICE_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/glib/test-service-glib
>+TEST_GLIB_SERVICE_BINARY=${DBUS_PWD}/test/glib/test-service-glib
> 
> cat >>confdefs.h <<_ACEOF
> #define TEST_GLIB_SERVICE_BINARY "$TEST_GLIB_SERVICE_BINARY"
>@@ -30868,7 +30862,7 @@
> 
> 
> 
>-TEST_PYTHON_SERVICE_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/python/test-service.py
>+TEST_PYTHON_SERVICE_BINARY=${DBUS_PWD}/test/python/test-service.py
> 
> cat >>confdefs.h <<_ACEOF
> #define TEST_PYTHON_SERVICE_BINARY "$TEST_PYTHON_SERVICE_BINARY"
>@@ -30877,7 +30871,7 @@
> 
> 
> 
>-TEST_EXIT_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-exit
>+TEST_EXIT_BINARY=${DBUS_PWD}/test/test-exit
> 
> cat >>confdefs.h <<_ACEOF
> #define TEST_EXIT_BINARY "$TEST_EXIT_BINARY"
>@@ -30886,7 +30880,7 @@
> 
> 
> 
>-TEST_SEGFAULT_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-segfault
>+TEST_SEGFAULT_BINARY=${DBUS_PWD}/test/test-segfault
> 
> cat >>confdefs.h <<_ACEOF
> #define TEST_SEGFAULT_BINARY "$TEST_SEGFAULT_BINARY"
>@@ -30895,7 +30889,7 @@
> 
> 
> 
>-TEST_SLEEP_FOREVER_BINARY=${ABSOLUTE_TOP_BUILDDIR}/test/test-sleep-forever
>+TEST_SLEEP_FOREVER_BINARY=${DBUS_PWD}/test/test-sleep-forever
> 
> cat >>confdefs.h <<_ACEOF
> #define TEST_SLEEP_FOREVER_BINARY "$TEST_SLEEP_FOREVER_BINARY"
>@@ -32279,7 +32273,6 @@
> s,@TEST_EXIT_BINARY@,$TEST_EXIT_BINARY,;t t
> s,@TEST_SEGFAULT_BINARY@,$TEST_SEGFAULT_BINARY,;t t
> s,@TEST_SLEEP_FOREVER_BINARY@,$TEST_SLEEP_FOREVER_BINARY,;t t
>-s,@ABSOLUTE_TOP_BUILDDIR@,$ABSOLUTE_TOP_BUILDDIR,;t t
> s,@TEST_SOCKET_DIR@,$TEST_SOCKET_DIR,;t t
> s,@DBUS_SESSION_SOCKET_DIR@,$DBUS_SESSION_SOCKET_DIR,;t t
> s,@PYTHON@,$PYTHON,;t t
>

Actions: View | Splinter Review

Attachments on bug 6042: 4746 | 4747 | 4749 | 4814

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.