summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--Makefile.cvs6
-rw-r--r--acconfig.h10
-rwxr-xr-xautogen.sh24
-rw-r--r--configure.in10
5 files changed, 43 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 3654d204..6ca594b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,18 @@
+2002-11-21 Havoc Pennington <hp@redhat.com>
+
+ * acconfig.h: get rid of this
+
+ * autogen.sh (run_configure): add --no-configure option
+
+ * configure.in: remove AC_ARG_PROGRAM to make
+ autoconf complain less. add AC_PREREQ.
+ add AC_DEFINE third arg.
+
2002-11-21 Anders Carlsson <andersca@codefactory.se>
* doc/Makefile.am:
Fix references so we can distcheck.
-
+
2002-11-21 Havoc Pennington <hp@redhat.com>
* Initial module creation
diff --git a/Makefile.cvs b/Makefile.cvs
new file mode 100644
index 00000000..fb06305b
--- /dev/null
+++ b/Makefile.cvs
@@ -0,0 +1,6 @@
+## -*- makefile -*-
+
+all: configure
+
+configure: configure.in autogen.sh
+ ./autogen.sh --no-configure
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index e100ec29..00000000
--- a/acconfig.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#undef PACKAGE
-#undef VERSION
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef ENABLE_NLS
-#undef HAVE_PTHREAD_H
-#undef GETTEXT_PACKAGE
-#undef SANE_MALLOC_PROTOS
diff --git a/autogen.sh b/autogen.sh
index 3b74d828..a3923bbc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -56,7 +56,7 @@ libtoolize --copy --force
echo $ACLOCAL $ACLOCAL_FLAGS
$ACLOCAL $ACLOCAL_FLAGS
-# optionally feature autoheader
+## optionally feature autoheader
(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
$AUTOMAKE -a $am_opt
@@ -64,7 +64,23 @@ autoconf || echo "autoconf failed - version 2.5x is probably required"
cd $ORIGDIR
-$srcdir/configure --enable-maintainer-mode "$@"
+run_configure=true
+for arg in $*; do
+ case $arg in
+ --no-configure)
+ run_configure=false
+ ;;
+ *)
+ ;;
+ esac
+done
+
+if $run_configure; then
+ $srcdir/configure --enable-maintainer-mode "$@"
+ echo
+ echo "Now type 'make' to compile $PROJECT."
+else
+ echo
+ echo "Now run 'configure' and 'make' to compile $PROJECT."
+fi
-echo
-echo "Now type 'make' to compile $PROJECT."
diff --git a/configure.in b/configure.in
index 18f8f967..b236dffe 100644
--- a/configure.in
+++ b/configure.in
@@ -1,22 +1,24 @@
-AC_INIT(dbus/dbus.h)
+dnl -*- mode: m4 -*-
+AC_PREREQ(2.52)
-AM_CONFIG_HEADER(config.h)
+AC_INIT(dbus/dbus.h)
AM_INIT_AUTOMAKE(dbus, 0.1)
+AM_CONFIG_HEADER(config.h)
+
# Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
GETTEXT_PACKAGE=dbus-1
AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
AM_MAINTAINER_MODE
AC_PROG_CC
AC_ISC_POSIX
AC_HEADER_STDC
-AC_ARG_PROGRAM
AM_PROG_LIBTOOL
AC_ARG_ENABLE(qt, [ --disable-qt disable Qt-friendly client library],enable_qt=no,enable_qt=yes)