Attachment 107237 Details for Bug 73689 – config.h autotools cmake diff

config.h autotools cmake diff

config-vars-linux.diff (text/plain), 7.03 KB, created by Ralf Habacker on 2014-10-02 21:20:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2014-10-02 21:20:22 UTC

Size: 7.03 KB

patch

obsolete

>--- cmake-config-vars	2014-10-02 23:12:15.368446439 +0200
>+++ autotools-config-vars	2014-10-02 22:21:54.644551026 +0200
>@@ -1,3 +1,4 @@
>+#define _ALL_SOURCE 1
> #define __amd64 1
> #define __amd64__ 1
> #define __ATOMIC_ACQ_REL 4
>@@ -30,31 +31,36 @@
> #define __DBL_MIN_EXP__ (-1021)
> #define DBUS_BINDIR "/usr/local/bin"
> #define DBUS_BUILD_X11 1
>-#define DBUS_CMAKE 1
>-#define _DBUS_CONFIG_H 
>+#define DBUS_BUILT_R_DYNAMIC 1
>+#define DBUS_BUS_ENABLE_INOTIFY 1
> #define DBUS_CONSOLE_AUTH_DIR "/var/run/console/"
> #define DBUS_CONSOLE_OWNER_FILE ""
> #define DBUS_DAEMONDIR "/usr/local/bin"
> #define DBUS_DAEMON_NAME "dbus-daemon"
>-#define DBUS_DATADIR "share"
>+#define DBUS_DATADIR "/usr/local/share"
> #define DBUS_ENABLE_ASSERT 1
> #define DBUS_ENABLE_CHECKS 1
>-#define DBUS_ENABLE_VERBOSE_MODE 1
>+#define DBUS_ENABLE_EMBEDDED_TESTS 1
>+#define DBUS_ENABLE_MODULAR_TESTS 1
> #define DBUS_ENABLE_X11_AUTOLAUNCH 1
> #define DBUS_EXEEXT ""
>-#define DBUS_HAVE_ATOMIC_INT 1
>-#define DBUS_MACHINE_UUID_FILE "/usr/local/lib/dbus/machine-id"
>-#define DBUS_PATH_OR_ABSTRACT abstract
>+#define DBUS_HAVE_LINUX_EPOLL 1
>+#define DBUS_INT64_PRINTF_MODIFIER "l"
>+#define DBUS_LIBEXECDIR "/usr/local/lib"
>+#define DBUS_PREFIX "NONE"
> #define DBUS_SESSION_BUS_CONNECT_ADDRESS "autolaunch:"
>-#define DBUS_SESSION_CONFIG_FILE "/dbus-1/session.conf"
>+#define DBUS_SESSION_SOCKET_DIR "/tmp"
> #define DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "unix:path=/usr/local/var/run/dbus/system_bus_socket"
>-#define DBUS_SYSTEM_CONFIG_FILE "/dbus-1/system.conf"
>-#define DBUS_TEST_EXEC "/home/ralf/src/dbus-cmake-build/bin"
>-#define DBUS_UNIX 
>-#define DBUS_USE_ATOMIC_INT_486 1
>-#define _DBUS_VA_COPY_ASSIGN(a1,a2) { a1 = a2; }
>+#define DBUS_SYSTEM_SOCKET "/usr/local/var/run/dbus/system_bus_socket"
>+#define DBUS_TEST_EXEC "/home/ralf/src/dbus-autotools-build/test"
>+#define DBUS_TEST_LAUNCH_HELPER_BINARY "/home/ralf/src/dbus-autotools-build/bus/dbus-daemon-launch-helper-test"
>+#define DBUS_TEST_SOCKET_DIR "/tmp"
>+#define DBUS_UNIX 1
>+#define DBUS_USER "messagebus"
>+#define DBUS_USE_SYNC 1
>+#define DBUS_VA_COPY_AS_ARRAY 1
> #define DBUS_VA_COPY va_copy
>-#define _dbus_verbose_C_S _dbus_verbose
>+#define DBUS_WITH_GLIB 1
> #define __DEC128_EPSILON__ 1E-33DL
> #define __DEC128_MANT_DIG__ 34
> #define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL
>@@ -80,6 +86,7 @@
> #define __DECIMAL_BID_FORMAT__ 1
> #define __DECIMAL_DIG__ 21
> #define __ELF__ 1
>+#define __EXTENSIONS__ 1
> #define __FINITE_MATH_ONLY__ 0
> #define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__
> #define __FLT_DECIMAL_DIG__ 9
>@@ -115,35 +122,75 @@
> #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
> #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
> #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
>+#define GETTEXT_PACKAGE "dbus-1"
>+#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_38
>+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_26
> #define __GNUC__ 4
> #define __GNUC_GNU_INLINE__ 1
> #define __GNUC_MINOR__ 8
> #define __GNUC_PATCHLEVEL__ 1
> #define __gnu_linux__ 1
>+#define _GNU_SOURCE 1
> #define __GXX_ABI_VERSION 1002
> #define HAVE_ABSTRACT_SOCKETS 1
>+#define HAVE_ACCEPT4 1
>+#define HAVE_ALLOCA_H 1
> #define HAVE_BACKTRACE 1
>+#define HAVE_BYTESWAP_H 1
> #define HAVE_CLEARENV 1
>+#define HAVE_DECL_LOG_PERROR 1
>+#define HAVE_DECL_MSG_NOSIGNAL 1
> #define HAVE_DIRENT_H 1
>+#define HAVE_DIRFD 1
>+#define HAVE_DLFCN_H 1
> #define HAVE_ERRNO_H 1
>+#define HAVE_EXECINFO_H 1
>+#define HAVE_EXPAT_H 1
>+#define HAVE_FPATHCONF 1
> #define HAVE_GETGROUPLIST 1
>-#define HAVE_GRP_H 1
>+#define HAVE_GETRESUID 1
>+#define HAVE_GETRLIMIT 1
>+#define HAVE_GNUC_VARARGS 1
>+#define HAVE_INOTIFY_INIT1 1
> #define HAVE_INTTYPES_H 1
>+#define HAVE_ISO_VARARGS 1
> #define HAVE_LOCALECONV 1
> #define HAVE_LOCALE_H 1
>+#define HAVE_MEMORY_H 1
>+#define HAVE_MONOTONIC_CLOCK 1
> #define HAVE_NANOSLEEP 1
>+#define HAVE_PIPE2 1
> #define HAVE_POLL 1
>+#define HAVE_POSIX_GETPWNAM_R 1
>+#define HAVE_PRCTL 1
>+#define HAVE_RAISE 1
>+#define HAVE_SELINUX 1
> #define HAVE_SETENV 1
> #define HAVE_SETLOCALE 1
>+#define HAVE_SETRLIMIT 1
> #define HAVE_SIGNAL_H 1
> #define HAVE_SOCKETPAIR 1
>+#define HAVE_SOCKLEN_T 1
> #define HAVE_STDINT_H 1
>-#define HAVE_STDIO_H 1
>+#define HAVE_STDLIB_H 1
>+#define HAVE_STRING_H 1
>+#define HAVE_STRINGS_H 1
> #define HAVE_STRTOLL 1
> #define HAVE_STRTOULL 1
>-#define HAVE_TIME_H 1
>+#define HAVE_SYS_INOTIFY_H 1
>+#define HAVE_SYSLOG_H 1
>+#define HAVE_SYS_PRCTL_H 1
>+#define HAVE_SYS_RESOURCE_H 1
>+#define HAVE_SYS_STAT_H 1
>+#define HAVE_SYSTEMD 1
>+#define HAVE_SYS_TYPES_H 1
>+#define HAVE_SYS_UIO_H 1
> #define HAVE_UNISTD_H 1
>+#define HAVE_UNIX_FD_PASSING 1
> #define HAVE_UNSETENV 1
>+#define HAVE_USLEEP 1
>+#define HAVE_VASPRINTF 1
>+#define HAVE_VSNPRINTF 1
> #define HAVE_WRITEV 1
> #define __INT16_C(c) c
> #define __INT16_MAX__ 32767
>@@ -201,6 +248,7 @@
> #define __LONG_MAX__ 9223372036854775807L
> #define _LP64 1
> #define __LP64__ 1
>+#define LT_OBJDIR ".libs/"
> #define __MMX__ 1
> #define __NO_INLINE__ 1
> #define __ORDER_BIG_ENDIAN__ 4321
>@@ -209,10 +257,11 @@
> #define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=dbus"
> #define PACKAGE "dbus"
> #define PACKAGE_NAME "dbus"
>-#define PACKAGE_STRING "dbus 1.9.0"
>+#define PACKAGE_STRING "dbus 1.8.99"
> #define PACKAGE_TARNAME "dbus"
>-#define PACKAGE_URL "http://dbus.freedesktop.org"
>-#define PACKAGE_VERSION "1.9.0"
>+#define PACKAGE_URL ""
>+#define PACKAGE_VERSION "1.8.99"
>+#define _POSIX_PTHREAD_SEMANTICS 1
> #define __PRAGMA_REDEFINE_EXTNAME 1
> #define __PTRDIFF_MAX__ 9223372036854775807L
> #define __PTRDIFF_TYPE__ long int
>@@ -222,19 +271,25 @@
> #define __SIG_ATOMIC_MAX__ 2147483647
> #define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1)
> #define __SIG_ATOMIC_TYPE__ int
>-#define SIGHUP 1
> #define __SIZE_MAX__ 18446744073709551615UL
>+#define SIZEOF_CHAR 1
> #define __SIZEOF_DOUBLE__ 8
> #define __SIZEOF_FLOAT__ 4
> #define __SIZEOF_INT128__ 16
>+#define SIZEOF_INT 4
> #define __SIZEOF_INT__ 4
>+#define SIZEOF___INT64 0
>+#define SIZEOF_LONG 8
> #define __SIZEOF_LONG__ 8
> #define __SIZEOF_LONG_DOUBLE__ 16
>+#define SIZEOF_LONG_LONG 8
> #define __SIZEOF_LONG_LONG__ 8
> #define __SIZEOF_POINTER__ 8
> #define __SIZEOF_PTRDIFF_T__ 8
>+#define SIZEOF_SHORT 2
> #define __SIZEOF_SHORT__ 2
> #define __SIZEOF_SIZE_T__ 8
>+#define SIZEOF_VOID_P 8
> #define __SIZEOF_WCHAR_T__ 4
> #define __SIZEOF_WINT_T__ 4
> #define __SIZE_TYPE__ long unsigned int
>@@ -243,13 +298,15 @@
> #define __SSE2_MATH__ 1
> #define __SSE_MATH__ 1
> #define __STDC__ 1
>+#define STDC_HEADERS 1
> #define __STDC_HOSTED__ 1
> #define __STDC_IEC_559__ 1
> #define __STDC_IEC_559_COMPLEX__ 1
> #define __STDC_ISO_10646__ 201103L
> #define __STDC_NO_THREADS__ 1
> #define _STDC_PREDEF_H 1
>-#define TEST_BUS_LAUNCH_BINARY "/home/ralf/src/dbus-cmake-build/bin/dbus-launch"
>+#define _TANDEM_SOURCE 1
>+#define TEST_BUS_LAUNCH_BINARY "/home/ralf/src/dbus-autotools-build/tools/dbus-launch"
> #define TEST_LISTEN "unix:tmpdir=/tmp"
> #define __UINT16_C(c) c
> #define __UINT16_MAX__ 65535
>@@ -288,7 +345,7 @@
> #define __unix 1
> #define __unix__ 1
> #define __USER_LABEL_PREFIX__ 
>-#define VERSION "1.9.0"
>+#define VERSION "1.8.99"
> #define __VERSION__ "4.8.1 20130909 [gcc-4_8-branch revision 202388]"
> #define __WCHAR_MAX__ 2147483647
> #define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1)

Actions: View

Attachments on bug 73689: 92216 | 92217 | 92295 | 107237 | 107446 | 107828 | 108323 | 108348 | 108352 | 108353

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.