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
This commit is contained in:
parent
90c98e5b37
commit
c8511cd513
14 changed files with 25 additions and 14 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ APIS= atk-api.xml
|
|||
|
||||
INCLUDE_APIS = ../pango/pango-api.xml
|
||||
|
||||
RUNTIME=mono
|
||||
RUNTIME=@MONO@
|
||||
MCS=mcs
|
||||
ASSEMBLY=atk-sharp.dll
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
MCS=mcs
|
||||
RUNTIME=mono
|
||||
RUNTIME=@MONO@
|
||||
DESTDIR=
|
||||
|
||||
all: gapi_codegen.exe
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
APIS= gst-api.xml
|
||||
|
||||
RUNTIME=mono
|
||||
RUNTIME=@MONO@
|
||||
MCS=mcs
|
||||
ASSEMBLY=gst-sharp.dll
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
APIS= pango-api.xml
|
||||
|
||||
RUNTIME=mono
|
||||
RUNTIME=@MONO@
|
||||
MCS=mcs
|
||||
ASSEMBLY=pango-sharp.dll
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ INCLUDE_APIS = \
|
|||
../gtk/gtk-api.xml \
|
||||
../atk/atk-api.xml
|
||||
|
||||
RUNTIME=mono
|
||||
RUNTIME=@MONO@
|
||||
MCS=mcs
|
||||
ASSEMBLY=vte-sharp.dll
|
||||
|
||||
|
|
Loading…
Reference in a new issue