From c8511cd513be2a92fdbe2fc15b9ea39459e18654 Mon Sep 17 00:00:00 2001 From: "Urs C. Muff" Date: Wed, 10 Mar 2004 15:57:33 +0000 Subject: [PATCH] Using configurable runtime during build process --> RUNTIME=@MONO@ in Makefile.in files. MONO is defined in configure.in. For Mac OS X == Darwin it is 'mint' for now, for the others it remains 'mono'. Also use the more generic code from mono/autogen.sh to detect libtool. svn path=/trunk/gtk-sharp/; revision=23880 --- art/Makefile.in | 2 +- atk/Makefile.in | 2 +- autogen.sh | 9 ++++++++- configure.in | 6 +++++- generator/Makefile.in | 2 +- glade/Makefile.in | 2 +- gnome/Makefile.in | 2 +- gnomedb/Makefile.in | 2 +- gst/Makefile.in | 2 +- gtk/Makefile.in | 2 +- gtkhtml/Makefile.in | 2 +- pango/Makefile.in | 2 +- rsvg/Makefile.in | 2 +- vte/Makefile.in | 2 +- 14 files changed, 25 insertions(+), 14 deletions(-) diff --git a/art/Makefile.in b/art/Makefile.in index 09d516e34..5995bb054 100755 --- a/art/Makefile.in +++ b/art/Makefile.in @@ -5,7 +5,7 @@ INCLUDE_APIS = ../atk/atk-api.xml \ ../gdk/gdk-api.xml \ ../gdk/gdk-symbols.xml -RUNTIME=mono +RUNTIME=@MONO@ MCS=mcs ASSEMBLY=art-sharp.dll diff --git a/atk/Makefile.in b/atk/Makefile.in index 9381d919a..0b2c3112b 100644 --- a/atk/Makefile.in +++ b/atk/Makefile.in @@ -2,7 +2,7 @@ APIS= atk-api.xml INCLUDE_APIS = ../pango/pango-api.xml -RUNTIME=mono +RUNTIME=@MONO@ MCS=mcs ASSEMBLY=atk-sharp.dll diff --git a/autogen.sh b/autogen.sh index 7e1340d52..463552de7 100755 --- a/autogen.sh +++ b/autogen.sh @@ -15,8 +15,15 @@ test -z "$srcdir" && srcdir=. DIE=1 } +if [ -z "$LIBTOOL" ]; then + LIBTOOL=`which glibtool 2>/dev/null` + if [ ! -x "$LIBTOOL" ]; then + LIBTOOL=`which libtool` + fi +fi + (grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { - (libtool --version) < /dev/null > /dev/null 2>&1 || { + ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`libtool' installed to compile Gtk#." echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" diff --git a/configure.in b/configure.in index c93d55371..0a7557340 100644 --- a/configure.in +++ b/configure.in @@ -59,7 +59,11 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir], PKG_CHECK_MODULES(MONO_DEPENDENCY, mono) -MONO=`which mono` +if test `uname -s` = "Darwin"; then + MONO=`which mint` +else + MONO=`which mono` +fi AC_SUBST(MONO) ## Versions of dependencies diff --git a/generator/Makefile.in b/generator/Makefile.in index 3a0eaf861..4175829ba 100644 --- a/generator/Makefile.in +++ b/generator/Makefile.in @@ -1,5 +1,5 @@ MCS=mcs -RUNTIME=mono +RUNTIME=@MONO@ DESTDIR= all: gapi_codegen.exe diff --git a/glade/Makefile.in b/glade/Makefile.in index 4a50e0805..ab3521399 100755 --- a/glade/Makefile.in +++ b/glade/Makefile.in @@ -7,7 +7,7 @@ INCLUDE_APIS = ../atk/atk-api.xml \ ../gtk/gtk-api.xml \ ../gtk/gtk-symbols.xml -RUNTIME=mono +RUNTIME=@MONO@ MCS=mcs ASSEMBLY=glade-sharp.dll diff --git a/gnome/Makefile.in b/gnome/Makefile.in index 681a31bfd..1ff76178f 100755 --- a/gnome/Makefile.in +++ b/gnome/Makefile.in @@ -8,7 +8,7 @@ INCLUDE_APIS = ../atk/atk-api.xml \ ../gtk/gtk-api.xml \ ../gtk/gtk-symbols.xml -RUNTIME=mono +RUNTIME=@MONO@ MCS=mcs ASSEMBLY=gnome-sharp.dll diff --git a/gnomedb/Makefile.in b/gnomedb/Makefile.in index 0d049b9d1..0f8943bee 100755 --- a/gnomedb/Makefile.in +++ b/gnomedb/Makefile.in @@ -10,7 +10,7 @@ INCLUDE_APIS = ../atk/atk-api.xml \ ../gnome/gnome-api.xml \ ../gda/gda-api.xml -RUNTIME=mono +RUNTIME=@MONO@ MCS=mcs ASSEMBLY=gnomedb-sharp.dll diff --git a/gst/Makefile.in b/gst/Makefile.in index 81d5a55d1..ced7165d9 100755 --- a/gst/Makefile.in +++ b/gst/Makefile.in @@ -1,6 +1,6 @@ APIS= gst-api.xml -RUNTIME=mono +RUNTIME=@MONO@ MCS=mcs ASSEMBLY=gst-sharp.dll diff --git a/gtk/Makefile.in b/gtk/Makefile.in index 7d950b5d2..ab4133370 100755 --- a/gtk/Makefile.in +++ b/gtk/Makefile.in @@ -5,7 +5,7 @@ INCLUDE_APIS = ../atk/atk-api.xml \ ../gdk/gdk-api.xml \ ../gdk/gdk-symbols.xml -RUNTIME=mono +RUNTIME=@MONO@ MCS=mcs ASSEMBLY=gtk-sharp.dll diff --git a/gtkhtml/Makefile.in b/gtkhtml/Makefile.in index d5205990a..2f9be5dbb 100755 --- a/gtkhtml/Makefile.in +++ b/gtkhtml/Makefile.in @@ -8,7 +8,7 @@ INCLUDE_APIS = ../atk/atk-api.xml \ ../gtk/gtk-api.xml \ ../gnome/gnome-api.xml -RUNTIME=mono +RUNTIME=@MONO@ MCS=mcs ASSEMBLY=gtkhtml-sharp.dll diff --git a/pango/Makefile.in b/pango/Makefile.in index f597315e5..20e54527a 100644 --- a/pango/Makefile.in +++ b/pango/Makefile.in @@ -1,6 +1,6 @@ APIS= pango-api.xml -RUNTIME=mono +RUNTIME=@MONO@ MCS=mcs ASSEMBLY=pango-sharp.dll diff --git a/rsvg/Makefile.in b/rsvg/Makefile.in index ca662f912..0cb684b5c 100644 --- a/rsvg/Makefile.in +++ b/rsvg/Makefile.in @@ -8,7 +8,7 @@ INCLUDE_APIS = ../atk/atk-api.xml \ ../gtk/gtk-symbols.xml \ ../art/art-api.xml -RUNTIME=mono +RUNTIME=@MONO@ MCS=mcs ASSEMBLY=rsvg-sharp.dll diff --git a/vte/Makefile.in b/vte/Makefile.in index 8800bb521..6e0c5b2b7 100644 --- a/vte/Makefile.in +++ b/vte/Makefile.in @@ -5,7 +5,7 @@ INCLUDE_APIS = \ ../gtk/gtk-api.xml \ ../atk/atk-api.xml -RUNTIME=mono +RUNTIME=@MONO@ MCS=mcs ASSEMBLY=vte-sharp.dll