[gnome-common] Revert "Trace AC_CONFIG_SUBDIRS with autoconf"
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-common] Revert "Trace AC_CONFIG_SUBDIRS with autoconf"
- Date: Sun, 19 Aug 2012 17:27:43 +0000 (UTC)
commit e0763e1466d899191ca8bf77441070139ace7e18
Author: Christian Persch <chpe gnome org>
Date: Sun Aug 19 19:25:05 2012 +0200
Revert "Trace AC_CONFIG_SUBDIRS with autoconf"
This reverts commit 646fa962712313aadacaaf58c8fd5dd57edc5882.
The change broke calling autogen from outside the source directory.
macros2/gnome-autogen.sh | 19 +------------------
1 files changed, 1 insertions(+), 18 deletions(-)
---
diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index de36d60..845bbc8 100644
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -265,24 +265,7 @@ want_gtk_doc=false
want_gnome_doc_utils=false
want_maintainer_mode=false
-find_configure_files() {
- configure_ac=
- if test -f "$1/configure.ac"; then
- configure_ac="$1/configure.ac"
- elif test -f "$1/configure.in"; then
- configure_ac="$1/configure.in"
- fi
- if test "x$configure_ac" != x; then
- echo "$configure_ac"
- # TODO We have not detected the right autoconf yet!
- autoconf -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do
- find_configure_files "$1/$dir"
- done
- fi
-}
-
-configure_files="`find_configure_files .`"
-
+configure_files="`find $srcdir -name '{arch}' -prune -o -name '_darcs' -prune -o -name '.??*' -prune -o -name configure.ac -print -o -name configure.in -print`"
for configure_ac in $configure_files; do
dirname=`dirname $configure_ac`
if [ -f $dirname/NO-AUTO-GEN ]; then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]