gnome-vfs r5474 - in trunk: . modules

[fcrozat svn gnome org]

Author: fcrozat
Date: Wed May 21 15:48:03 2008
New Revision: 5474
URL: http://svn.gnome.org/viewvc/gnome-vfs?rev=5474&view=rev

Log:
Fix build failure when checking for undefined linking :

        * acinclude.m4: Fix typo

        * modules/Makefile.am: Fix missing linking with ftp, smb and http
        modules, causing build failure when using "-Wl,--no-undefined".


Modified:
   trunk/ChangeLog
   trunk/acinclude.m4
   trunk/modules/Makefile.am

Modified: trunk/acinclude.m4
==============================================================================
--- trunk/acinclude.m4	(original)
+++ trunk/acinclude.m4	Wed May 21 15:48:03 2008
@@ -324,7 +324,7 @@
 
 if test "x$have_gssapi" = "xyes"; then
 
-	NEON_CFLAGS="$NEON_CFALGS $GSSAPI_CFLAGS"
+	NEON_CFLAGS="$NEON_CFLAGS $GSSAPI_CFLAGS"
 	NEON_LIBS="$NEON_LIBS $GSSAPI_LIBS"
 
 fi

Modified: trunk/modules/Makefile.am
==============================================================================
--- trunk/modules/Makefile.am	(original)
+++ trunk/modules/Makefile.am	Wed May 21 15:48:03 2008
@@ -152,7 +152,7 @@
 
 libsmb_la_SOURCES = smb-method.c
 libsmb_la_LDFLAGS = $(module_flags)
-libsmb_la_LIBADD = $(SAMBA_LIBS) $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la 
+libsmb_la_LIBADD = $(SAMBA_LIBS) $(MODULES_GCONF_LIBS) ../libgnomevfs/libgnomevfs-2.la 
 
 ###  `sftp' method
 
@@ -182,7 +182,7 @@
 
 libftp_la_SOURCES = ftp-method.c
 libftp_la_LDFLAGS = $(module_flags)
-libftp_la_LIBADD = $(MODULES_LIBS) $(GSSAPI_LIBS) ../libgnomevfs/libgnomevfs-2.la
+libftp_la_LIBADD = $(MODULES_GCONF_LIBS) $(GSSAPI_LIBS) ../libgnomevfs/libgnomevfs-2.la
 
 ### `nfs' method
 
@@ -205,6 +205,7 @@
 libhttp_la_LDFLAGS = $(module_flags)
 libhttp_la_LIBADD  = 			\
 	$(MODULES_GCONF_LIBS) 	\
+	$(OPENSSL_LIBS) \
 	../imported/neon/libneon.la   \
 	../libgnomevfs/libgnomevfs-2.la