Stop using gnome-autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 207b1dd16735c960a5551cd411bed7959719ac3a..77900f60cd5fe5b035e5f8ee3f83e2e21b252291 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,21 +1,11 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="lightdm"
-REQUIRED_AUTOMAKE_VERSION=1.7
-
-(test -f $srcdir/configure.ac \
-  && test -d $srcdir/src) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level lightdm directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
-}
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+libtoolize --force --copy
+intltoolize --force
+gtkdocize --copy
+aclocal
+autoconf
+autoheader
+automake --add-missing --copy --foreign
+./configure $@

diff --git a/configure.ac b/configure.ac
index b1a20d2fcc0fc83eedce98f30e41dd8ab9d32e1e..407f5321e04e2c0845a62d119393764731257213 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,17 +4,15 @@ AC_INIT(lightdm, 1.4.0)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
+AM_SILENT_RULES(yes)
 LT_INIT
 AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_LIBTOOL
 AM_MAINTAINER_MODE
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
 
 GOBJECT_INTROSPECTION_CHECK(0.9.5)
 
-GNOME_COMPILE_WARNINGS(maximum)
-
 dnl ###########################################################################
 dnl Dependencies
 dnl ###########################################################################