gedit-plugins r390 - in trunk: . plugins/charmap plugins/showtabbar plugins/smartspaces

[pborelli svn gnome org]

Author: pborelli
Date: Sun Nov  2 12:08:25 2008
New Revision: 390
URL: http://svn.gnome.org/viewvc/gedit-plugins?rev=390&view=rev

Log:
2008-11-02  Paolo Borelli  <pborelli katamail com>

	* configure.ac:
	Build fixes for cygwin. Bug #317567.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/charmap/Makefile.am
   trunk/plugins/showtabbar/Makefile.am
   trunk/plugins/smartspaces/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Nov  2 12:08:25 2008
@@ -29,6 +29,19 @@
 # make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
 AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
 
+dnl check for win32 platform
+AC_MSG_CHECKING([for some Win32 platform])
+case "$host" in
+  *-*-mingw*|*-*-cygwin*)
+    platform_win32=yes
+    ;;
+  *)
+    platform_win32=no
+    ;;
+esac
+AC_MSG_RESULT([$platform_win32])
+AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+
 # ================================================================
 # Gettext stuff.
 # ================================================================
@@ -197,7 +210,7 @@
 EOF
 
 	if /bin/sh ../libtool --mode=compile ${CC} $PYTHON_CFLAGS -c testpython.c >/dev/null 2>&1 && \
-		/bin/sh ../libtool --mode=link ${CC} -o testpython.la -rpath `pwd` -module -avoid-version $PYTHON_LIB_LOC testpython.lo $PYTHON_LIBS $PYTHON_EXTRA_LIBS >/dev/null 2>&1 && \
+		/bin/sh ../libtool --mode=link ${CC} -o testpython.la -rpath `pwd` -module -avoid-version -no-undefined $PYTHON_LIB_LOC testpython.lo $PYTHON_LIBS $PYTHON_EXTRA_LIBS >/dev/null 2>&1 && \
 		grep 'dlname.*testpython' testpython.la >/dev/null 2>&1;
 	then
 		result=yes
@@ -414,7 +427,11 @@
 	AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
 fi
 
-PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
+if test "$platform_win32" = yes; then
+	PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined"
+else
+	PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
+fi
 AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
 
 AC_CONFIG_FILES([

Modified: trunk/plugins/charmap/Makefile.am
==============================================================================
--- trunk/plugins/charmap/Makefile.am	(original)
+++ trunk/plugins/charmap/Makefile.am	Sun Nov  2 12:08:25 2008
@@ -17,10 +17,8 @@
 	gedit-charmap-panel.h				\
 	gedit-charmap-panel.c
 
-libcharmap_la_LDFLAGS = \
-	$(PLUGIN_LIBTOOL_FLAGS)				\
-	$(GEDIT_LIBS)					\
-	$(GUCHARMAP_LIBS)
+libcharmap_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libcharmap_la_LIBADD = $(GEDIT_LIBS) $(GUCHARMAP_LIBS)
 
 # Plugin Info
 

Modified: trunk/plugins/showtabbar/Makefile.am
==============================================================================
--- trunk/plugins/showtabbar/Makefile.am	(original)
+++ trunk/plugins/showtabbar/Makefile.am	Sun Nov  2 12:08:25 2008
@@ -15,6 +15,7 @@
 	gedit-show-tabbar-plugin.c
 
 libshowtabbar_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libshowtabbar_la_LIBADD = $(GEDIT_LIBS)
 
 # Plugin Info
 

Modified: trunk/plugins/smartspaces/Makefile.am
==============================================================================
--- trunk/plugins/smartspaces/Makefile.am	(original)
+++ trunk/plugins/smartspaces/Makefile.am	Sun Nov  2 12:08:25 2008
@@ -13,6 +13,6 @@
 
 EXTRA_DIST = $(plugin_in_files)
 
-CLEANFILES = $(plugin_DATA) $(glade_DATA)
+CLEANFILES = $(plugin_DATA)
 
-DISTCLEANFILES = $(plugin_DATA) $(glade_DATA)
+DISTCLEANFILES = $(plugin_DATA)