Commit 368e150a authored by Havoc Pennington's avatar Havoc Pennington

2003-01-18 Havoc Pennington <hp@pobox.com>

	* configure.in: default --enable-tests to $USE_MAINTAINER_MODE

	* dbus/Makefile.am: fix it up so dubs-test-main.c is included in
	the distribution

	* test/Makefile.am: don't use special variable "TESTS" for echo-*
	since we don't want to use those in make check
parent 59d131e4
2003-01-18 Havoc Pennington <hp@pobox.com>
* configure.in: default --enable-tests to $USE_MAINTAINER_MODE
* dbus/Makefile.am: fix it up so dubs-test-main.c is included in
the distribution
* test/Makefile.am: don't use special variable "TESTS" for echo-*
since we don't want to use those in make check
2003-01-15 Havoc Pennington <hp@redhat.com>
Release 0.2
......
......@@ -14,6 +14,7 @@ GETTEXT_PACKAGE=dbus-1
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
## must come before we use the $USE_MAINTAINER_MODE variable later
AM_MAINTAINER_MODE
AC_PROG_CC
......@@ -24,7 +25,7 @@ AM_PROG_LIBTOOL
AC_ARG_ENABLE(qt, [ --enable-qt enable Qt-friendly client library],enable_qt=$enableval,enable_qt=auto)
AC_ARG_ENABLE(glib, [ --enable-glib enable GLib-friendly client library],enable_glib=$enableval,enable_glib=auto)
AC_ARG_ENABLE(tests, [ --enable-tests enable unit test code],enable_tests=$enableval,enable_tests=no)
AC_ARG_ENABLE(tests, [ --enable-tests enable unit test code],enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE)
AC_ARG_ENABLE(ansi, [ --enable-ansi enable -ansi -pedantic gcc flags],enable_ansi=$enableval,enable_ansi=no)
dnl DBUS_BUILD_TESTS controls unit tests built in to .c files
......@@ -202,6 +203,7 @@ echo "
source code location: ${srcdir}
compiler: ${CC}
Maintainer mode: ${USE_MAINTAINER_MODE}
Building unit tests: ${enable_tests}
Building Qt bindings: ${have_qt}
Building GLib bindings: ${have_glib}
......
......@@ -73,14 +73,20 @@ libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS) libdbus-convenience.la
## convention for internal symbols)
libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*"
## note that TESTS has special meaning (stuff to use in make check)
## so if adding tests not to be run in make check, don't add them to
## TESTS
if DBUS_BUILD_TESTS
noinst_PROGRAMS=dbus-test
TESTS=dbus-test
else
TESTS=
endif
## we use noinst_PROGRAMS not check_PROGRAMS so that we build
## even when not doing "make check"
noinst_PROGRAMS=$(TESTS)
dbus_test_SOURCES= \
dbus-test-main.c
dbus_test_LDADD= $(DBUS_CLIENT_LIBS) libdbus-convenience.la libdbus-1.la
## so that "make check" works
TESTS=dbus-test
endif
......@@ -2,12 +2,12 @@
INCLUDES=-I$(top_srcdir) $(DBUS_TEST_CFLAGS)
if DBUS_BUILD_TESTS
TESTS=echo-client echo-server
TEST_BINARIES=echo-client echo-server
else
TESTS=
TEST_BINARIES=
endif
noinst_PROGRAMS= $(TESTS)
noinst_PROGRAMS= $(TEST_BINARIES)
echo_client_SOURCES= \
echo-client.c \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment