Author: zbowling
Date: 2005-03-07 06:05:41 -0500 (Mon, 07 Mar 2005)
New Revision: 41516
Modified:
trunk/gtkmozembed-sharp/ChangeLog
trunk/gtkmozembed-sharp/configure.in
trunk/gtkmozembed-sharp/gtkmozembed/Makefile.am
trunk/gtkmozembed-sharp/gtkmozembed/gecko-sharp.dll.config.in
Log:
2005-03-07 Zac Bowling <[EMAIL PROTECTED]>
* configure.in: conditional fix for WIN32
* gtkmozembed/gecko-sharp.dll.config.in: libgtkmozembed.so again
(not versioned)
* gtkmozembed/Makefile.am: changed *.config to *.config.in (thanks
Chris)
Modified: trunk/gtkmozembed-sharp/ChangeLog
===================================================================
--- trunk/gtkmozembed-sharp/ChangeLog 2005-03-07 10:21:36 UTC (rev 41515)
+++ trunk/gtkmozembed-sharp/ChangeLog 2005-03-07 11:05:41 UTC (rev 41516)
@@ -1,3 +1,10 @@
+2005-03-07 Zac Bowling <[EMAIL PROTECTED]>
+
+ * configure.in: conditional fix for WIN32
+ * gtkmozembed/gecko-sharp.dll.config.in: libgtkmozembed.so again
+ (not versioned)
+ * gtkmozembed/Makefile.am: changed *.config to *.config.in (thanks
Chris)
+
2005-03-07 Christian Hergert <[EMAIL PROTECTED]>
* configure.in: Add AM_CONDITIONAL for WINBUILD. Still needs to have
Modified: trunk/gtkmozembed-sharp/configure.in
===================================================================
--- trunk/gtkmozembed-sharp/configure.in 2005-03-07 10:21:36 UTC (rev
41515)
+++ trunk/gtkmozembed-sharp/configure.in 2005-03-07 11:05:41 UTC (rev
41516)
@@ -107,11 +107,14 @@
AC_MSG_ERROR([No gacutil tool found])
fi
+winbuild=no
+case "$host" in
+ *-*-mingw*|*-*-cygwin*)
+ winbuild=yes
+ ;;
+esac
+AM_CONDITIONAL(WINBUILD, test x$winbuild = xyes)
-dnl WINBUILD
-dnl Need to set $enable_winbuild with compile option or some other way
-AM_CONDITIONAL(WINBUILD, test x$enable_winbuild = xyes)
-
AC_SUBST(GACUTIL)
AC_OUTPUT([
Modified: trunk/gtkmozembed-sharp/gtkmozembed/Makefile.am
===================================================================
--- trunk/gtkmozembed-sharp/gtkmozembed/Makefile.am 2005-03-07 10:21:36 UTC
(rev 41515)
+++ trunk/gtkmozembed-sharp/gtkmozembed/Makefile.am 2005-03-07 11:05:41 UTC
(rev 41516)
@@ -53,4 +53,4 @@
echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package gecko-sharp-2.0 /root
$(DESTDIR)$(libdir)"; \
$(GACUTIL) /u $(ASSEMBLY_NAME) /package gecko-sharp-2.0 /root
$(DESTDIR)$(libdir) || exit 1;
-EXTRA_DIST = $(RAW_API) $(sources) $(customs) $(METADATA) AssemblyInfo.cs.in
gecko-sharp.dll.config
+EXTRA_DIST = $(RAW_API) $(sources) $(customs) $(METADATA) AssemblyInfo.cs.in
gecko-sharp.dll.config.in
Modified: trunk/gtkmozembed-sharp/gtkmozembed/gecko-sharp.dll.config.in
===================================================================
--- trunk/gtkmozembed-sharp/gtkmozembed/gecko-sharp.dll.config.in
2005-03-07 10:21:36 UTC (rev 41515)
+++ trunk/gtkmozembed-sharp/gtkmozembed/gecko-sharp.dll.config.in
2005-03-07 11:05:41 UTC (rev 41516)
@@ -3,5 +3,5 @@
<dllmap dll="libgobject-2.0-0.dll" target="[EMAIL PROTECTED]@[EMAIL
PROTECTED]@"/>
<dllmap dll="libatk-1.0-0.dll" target="[EMAIL PROTECTED]@[EMAIL
PROTECTED]@"/>
<dllmap dll="libgtk-win32-2.0-0.dll" target="[EMAIL PROTECTED]@[EMAIL
PROTECTED]@"/>
- <dllmap dll="gtkembedmoz.dll" target="[EMAIL PROTECTED]@[EMAIL PROTECTED]@"/>
+ <dllmap dll="gtkembedmoz.dll" target="[EMAIL PROTECTED]@@LIB_SUFFIX@"/>
</configuration>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
