[Monodevelop-patches-list] r851 - in trunk/MonoDevelop: . src/Libraries/ICSharpCode.TextEditor

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-02-09 19:41:10 -0500 (Mon, 09 Feb 2004)
New Revision: 851

Modified:
   trunk/MonoDevelop/autogen.sh
   trunk/MonoDevelop/src/Libraries/ICSharpCode.TextEditor/Makefile.am
Log:
ripped from mono debugger, seems to work


Modified: trunk/MonoDevelop/autogen.sh
===================================================================
--- trunk/MonoDevelop/autogen.sh	2004-02-10 00:00:03 UTC (rev 850)
+++ trunk/MonoDevelop/autogen.sh	2004-02-10 00:41:10 UTC (rev 851)
@@ -1,7 +1,103 @@
-#! /bin/sh
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+# Ripped off from GNOME macros version
 
-aclocal
-automake --add-missing --gnu
-autoconf
-./configure --enable-maintainer-mode $@
+DIE=0
 
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have \`autoconf' installed to compile MonoDevelop."
+  echo "Download the appropriate package for your distribution,"
+  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+}
+
+(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+    echo
+    echo "**Error**: You must have \`libtool' installed to compile MonoDevelop."
+    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
+    echo "(or a newer version if it is available)"
+    DIE=1
+  }
+}
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have \`automake' installed to compile MonoDevelop."
+  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+  echo "(or a newer version if it is available)"
+  DIE=1
+  NO_AUTOMAKE=yes
+}
+
+
+# if no automake, don't bother testing for aclocal
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
+  echo "installed doesn't appear recent enough."
+  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+  echo "(or a newer version if it is available)"
+  DIE=1
+}
+
+if test "$DIE" -eq 1; then
+  exit 1
+fi
+
+if test -z "$*"; then
+  echo "**Warning**: I am going to run \`configure' with no arguments."
+  echo "If you wish to pass any to it, please specify them on the"
+  echo \`$0\'" command line."
+  echo
+fi
+
+case $CC in
+xlc )
+  am_opt=--include-deps;;
+esac
+
+
+if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+  if test -z "$NO_LIBTOOLIZE" ; then 
+    echo "Running libtoolize..."
+    libtoolize --force --copy
+  fi
+fi
+
+echo "Running aclocal $ACLOCAL_FLAGS ..."
+aclocal $ACLOCAL_FLAGS || {
+  echo
+  echo "**Error**: aclocal failed. This may mean that you have not"
+  echo "installed all of the packages you need, or you may need to"
+  echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
+  echo "for the prefix where you installed the packages whose"
+  echo "macros were not found"
+  exit 1
+}
+
+if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+  echo "Running autoheader..."
+  autoheader || { echo "**Error**: autoheader failed."; exit 1; }
+fi
+
+echo "Running automake --gnu $am_opt ..."
+automake --add-missing --gnu $am_opt ||
+  { echo "**Error**: automake failed."; exit 1; }
+echo "Running autoconf ..."
+autoconf || { echo "**Error**: autoconf failed."; exit 1; }
+
+
+conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+
+if test x$NOCONFIGURE = x; then
+  echo Running $srcdir/configure $conf_flags "$@" ...
+  $srcdir/configure $conf_flags "$@" \
+  && echo Now type \`make\' to compile $PKG_NAME || exit 1
+else
+  echo Skipping configure process.
+fi

Modified: trunk/MonoDevelop/src/Libraries/ICSharpCode.TextEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/ICSharpCode.TextEditor/Makefile.am	2004-02-10 00:00:03 UTC (rev 850)
+++ trunk/MonoDevelop/src/Libraries/ICSharpCode.TextEditor/Makefile.am	2004-02-10 00:41:10 UTC (rev 851)
@@ -94,7 +94,7 @@
 ./src/Document/FoldingStrategy/IFoldingStrategy.cs \
 ./src/Document/FoldingStrategy/FoldMarker.cs \
 ./src/Document/FoldingStrategy/IndentFoldingStrategy.cs \
-./src/Document/DocumentFactory.cs \
+./src/Document/DocumentFactory.cs
 
 DLL=../../../build/bin/MonoDevelop.TextEditor.dll
 REFS= \