Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Patch from Brad Taylor:

28-08-2007 Brad Taylor <brad@getcoded.net>

       * configure.in: Fixes for win32 build -- Remove specific Mono checks in
         favour of more cross-platform checks that are found later in the
         file. Add GENERATED_SOURCES fix from gtk-sharp.
       * gtkspell/Makefile.am: Put -out before sources, as csc.exe complains
         otherwise. Use $(GENERATED_SOURCES) so that we can switch the
         directory separator based on platform.



svn path=/trunk/gtkspell-sharp/; revision=84987
  • Loading branch information...
commit 9a0263e414929daf6bb2dbd8c4fb7d313c83920e 1 parent 486f767
@zbowling zbowling authored
Showing with 14 additions and 11 deletions.
  1. +9 −0 ChangeLog
  2. +3 −8 configure.in
  3. +2 −3 gtkspell/Makefile.am
View
9 ChangeLog
@@ -1,3 +1,12 @@
+28-08-2007 Brad Taylor <brad@getcoded.net>
+
+ * configure.in: Fixes for win32 build -- Remove specific Mono checks in
+ favour of more cross-platform checks that are found later in the
+ file. Add GENERATED_SOURCES fix from gtk-sharp.
+ * gtkspell/Makefile.am: Put -out before sources, as csc.exe complains
+ otherwise. Use $(GENERATED_SOURCES) so that we can switch the
+ directory separator based on platform.
+
11-04-2006 Zac Bowling <zac@zacbowling.com>
sample/TestGtkSpell.cs - Cleaned up spacing
View
11 configure.in
@@ -21,14 +21,6 @@ fi
AC_MSG_RESULT($from_cvs)
-AC_PATH_PROG(MONO, mono)
-AC_PATH_PROG(MCS, mcs)
-if test "x$MONO" = "x" ; then
- AC_MSG_ERROR([Can't find "mono" in your PATH])
-fi
-if test "x$MCS" = "x" ; then
- AC_MSG_ERROR([Can't find "mcs" in your PATH])
-fi
AC_SUBST(PATH)
AC_SUBST(LD_LIBRARY_PATH)
@@ -53,6 +45,7 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2
PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
if test "x$has_mono" = "xtrue"; then
+GENERATED_SOURCES=generated/*.cs
AC_PATH_PROG(RUNTIME, mono, no)
AC_PATH_PROG(CSC, mcs, no)
if test `uname -s` = "Darwin"; then
@@ -67,12 +60,14 @@ AC_PATH_PROG(CSC, csc.exe, no)
if test x$CSC = "xno"; then
AC_MSG_ERROR([You need to install either mono or .Net])
else
+GENERATED_SOURCES=generated\\\\*.cs
RUNTIME=
LIB_PREFIX=
LIB_SUFFIX=.dylib
fi
fi
+AC_SUBST(GENERATED_SOURCES)
AC_SUBST(LIB_PREFIX)
AC_SUBST(LIB_SUFFIX)
View
5 gtkspell/Makefile.am
@@ -1,4 +1,3 @@
-MCS=mcs
RAW_API=gtkspell-api.raw
API=gtkspell-api.xml
METADATA=gtkspell.metadata
@@ -40,8 +39,8 @@ gtkspell-sharp.snk: $(top_srcdir)/gtkspell-sharp.snk
cp $(top_srcdir)/gtkspell-sharp.snk .
gtkspell-sharp.dll: $(build_sources) generated-stamp gtkspell-sharp.snk
- $(MCS) -unsafe -target:library $(GTK_SHARP_LIBS) \
- $(build_sources) generated/*.cs -out:gtkspell-sharp.dll
+ $(CSC) -out:gtkspell-sharp.dll -unsafe -target:library $(GTK_SHARP_LIBS) \
+ $(build_sources) $(GENERATED_SOURCES)
install-data-local:
echo "$(GACUTIL) /i $(ASSEMBLY) /f /package gtkspell-sharp-2.0 /root $(DESTDIR)$(libdir)"; \
Please sign in to comment.
Something went wrong with that request. Please try again.