projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Honour aclocal flags in Makefile.am, rather than gluing them onto ACLOCAL
[platform/upstream/dbus.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
7f5b38a
..
42ec552
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-6,19
+6,14
@@
m4_define([dbus_minor_version], [4])
m4_define([dbus_micro_version], [7])
m4_define([dbus_version],
[dbus_major_version.dbus_minor_version.dbus_micro_version])
m4_define([dbus_micro_version], [7])
m4_define([dbus_version],
[dbus_major_version.dbus_minor_version.dbus_micro_version])
-AC_INIT(
dbus, [dbus_version
])
+AC_INIT(
[dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus
])
AC_CANONICAL_HOST
AC_CANONICAL_HOST
-AC_LIBTOOL_WIN32_DLL
-AC_LIBTOOL_RC
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability])
-AM_CONFIG_HEADER(config.h)
-
-# Honor aclocal flags
-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
GETTEXT_PACKAGE=dbus-1
AC_SUBST(GETTEXT_PACKAGE)
GETTEXT_PACKAGE=dbus-1
AC_SUBST(GETTEXT_PACKAGE)
@@
-74,6
+69,10
@@
AC_PROG_MKDIR_P
COMPILER_COVERAGE
COMPILER_OPTIMISATIONS
COMPILER_COVERAGE
COMPILER_OPTIMISATIONS
+# Initialize libtool
+LT_INIT([win32-dll])
+LT_LANG([Windows Resource])
+
# Set some internal variables depending on the platform for later use.
dbus_win=no
dbus_cygwin=no
# Set some internal variables depending on the platform for later use.
dbus_win=no
dbus_cygwin=no