Author: benny
Date: 2006-10-28 09:31:20 +0000 (Sat, 28 Oct 2006)
New Revision: 23536

Modified:
   libexo/trunk/ChangeLog
   libexo/trunk/configure.in.in
   libexo/trunk/exo-helper/Makefile.am
Log:
2006-09-28      Benedikt Meurer <[EMAIL PROTECTED]>

        * configure.in.in, exo-helper/Makefile.am: Fix installation on Win32
          variants. Bug #2463.




Modified: libexo/trunk/ChangeLog
===================================================================
--- libexo/trunk/ChangeLog      2006-10-28 09:26:54 UTC (rev 23535)
+++ libexo/trunk/ChangeLog      2006-10-28 09:31:20 UTC (rev 23536)
@@ -1,3 +1,8 @@
+2006-09-28     Benedikt Meurer <[EMAIL PROTECTED]>
+
+       * configure.in.in, exo-helper/Makefile.am: Fix installation on Win32
+         variants. Bug #2463.
+
 2006-09-14     Benedikt Meurer <[EMAIL PROTECTED]>
 
        * exo/exo-icon-view.c(exo_icon_view_button_press_event): Fix double

Modified: libexo/trunk/configure.in.in
===================================================================
--- libexo/trunk/configure.in.in        2006-10-28 09:26:54 UTC (rev 23535)
+++ libexo/trunk/configure.in.in        2006-10-28 09:31:20 UTC (rev 23536)
@@ -68,6 +68,21 @@
 AC_MINIX()
 
 dnl ********************************
+dnl *** Check for Win32 variants ***
+dnl ********************************
+AC_MSG_CHECKING([if building for some Win32 platform])
+case "$host" in
+*-*-mingw*|*-*-cygwin*)
+  ac_bm_platform_win32=yes
+  ;;
+*)
+  ac_bm_platform_win32=no
+  ;;
+esac
+AC_MSG_RESULT([$ac_bm_platform_win32])
+AM_CONDITIONAL([PLATFORM_WIN32], [test x"$ac_bm_platform_win32" = x"yes"])
+
+dnl ********************************
 dnl *** Check for basic programs ***
 dnl ********************************
 AM_PROG_AS()

Modified: libexo/trunk/exo-helper/Makefile.am
===================================================================
--- libexo/trunk/exo-helper/Makefile.am 2006-10-28 09:26:54 UTC (rev 23535)
+++ libexo/trunk/exo-helper/Makefile.am 2006-10-28 09:31:20 UTC (rev 23536)
@@ -82,14 +82,19 @@
        -module                                                         \
        -no-undefined
 
+if PLATFORM_WIN32
+exo_preferred_applications_settings_la_LDFLAGS +=                      \
+       -export-symbols $(datadir)/xfce4/devel/mcs-manager.def
+endif
+
 exo_preferred_applications_settings_la_SOURCES =                       \
        exo-preferred-applications-settings.c
 
 exo_preferred_applications_settings_la_CFLAGS =                                
\
-       @XFCE_MCS_MANAGER_CFLAGS@
+       $(XFCE_MCS_MANAGER_CFLAGS)
 
 exo_preferred_applications_settings_la_LIBADD =                                
\
-       @XFCE_MCS_MANAGER_LIBS@
+       $(XFCE_MCS_MANAGER_LIBS)
 endif
 
 ##

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to