Commit 2dbe9bfa authored by Masahiro Sakai's avatar Masahiro Sakai Committed by Masahiro Sakai

Call AC_LIBTOOL_WIN32_DLL which is necessary for building shared library


2003-05-03  Masahiro Sakai  <sakai@tom.sfc.keio.ac.jp>

	* configure.in: Call AC_LIBTOOL_WIN32_DLL which is necessary for
	building shared library on win32 platform. Check fstab.h.

	* components/emblem/Makefile.am (libnautilus_emblem_view_la_LDFLAGS):
	* components/history/Makefile.am (libnautilus_history_view_la_LDFLAGS):
	* components/image_properties/Makefile.am (libnautilus_image_properties_view_la_LDFLAGS):
	* components/notes/Makefile.am (libnautilus_notes_view_la_LDFLAGS):
	* components/tree/Makefile.am (libnautilus_tree_view_la_LDFLAGS):
	* libnautilus/Makefile.am (libnautilus_la_LDFLAGS):
	* libnautilus-adapter/Makefile.am (libnautilus_adapter_la_LDFLAGS):
	* libnautilus-private/Makefile.am (libnautilus_private_la_LDFLAGS):
	Add -no-undefined which is necessary for building shared library
	on some platforms (e.g. Win32, BeOS, etc).

	* libnautilus-adapter/Makefile.am (libnautilus_adapter_la_LIBADD):
	Fix library order. libnautilus.la should be ahead of other libraries
	that libnautilus.la depends on.

	* libnautilus-private/nautilus-volume-monitor.c:
	Include fstab.h conditionaly.
	Define MOUNT_TABLE_PATH as MOUNTED on cygwin.
	(get_removable_volumes, volume_is_removable, get_mount_list) Use
	endmntent() to close a file opened by setmntent(). Because using
	fclose() causes a crash on cygwin.
parent e67b1023
2003-05-03 Masahiro Sakai <sakai@tom.sfc.keio.ac.jp>
* configure.in: Call AC_LIBTOOL_WIN32_DLL which is necessary for
building shared library on win32 platform. Check fstab.h.
* components/emblem/Makefile.am (libnautilus_emblem_view_la_LDFLAGS):
* components/history/Makefile.am (libnautilus_history_view_la_LDFLAGS):
* components/image_properties/Makefile.am (libnautilus_image_properties_view_la_LDFLAGS):
* components/notes/Makefile.am (libnautilus_notes_view_la_LDFLAGS):
* components/tree/Makefile.am (libnautilus_tree_view_la_LDFLAGS):
* libnautilus/Makefile.am (libnautilus_la_LDFLAGS):
* libnautilus-adapter/Makefile.am (libnautilus_adapter_la_LDFLAGS):
* libnautilus-private/Makefile.am (libnautilus_private_la_LDFLAGS):
Add -no-undefined which is necessary for building shared library
on some platforms (e.g. Win32, BeOS, etc).
* libnautilus-adapter/Makefile.am (libnautilus_adapter_la_LIBADD):
Fix library order. libnautilus.la should be ahead of other libraries
that libnautilus.la depends on.
* libnautilus-private/nautilus-volume-monitor.c:
Include fstab.h conditionaly.
Define MOUNT_TABLE_PATH as MOUNTED on cygwin.
(get_removable_volumes, volume_is_removable, get_mount_list) Use
endmntent() to close a file opened by setmntent(). Because using
fclose() causes a crash on cygwin.
2003-04-30 Alexander Larsson <alexl@redhat.com>
* docs/style-guide.html:
......
......@@ -21,7 +21,7 @@ bonobo_LTLIBRARIES = libnautilus-emblem-view.la
libnautilus_emblem_view_la_SOURCES = $(EMBLEM_VIEW_COMMON_SOURCES) \
libmain.c
libnautilus_emblem_view_la_LDFLAGS = -module -avoid-version
libnautilus_emblem_view_la_LDFLAGS = -module -avoid-version -no-undefined
libnautilus_emblem_view_la_LIBADD = \
$(top_builddir)/libnautilus/libnautilus.la \
......
......@@ -15,7 +15,7 @@ libnautilus_history_view_la_SOURCES = \
nautilus-history-view.h \
$(NULL)
libnautilus_history_view_la_LDFLAGS = -module -avoid-version
libnautilus_history_view_la_LDFLAGS = -module -avoid-version -no-undefined
libnautilus_history_view_la_LIBADD = \
$(top_builddir)/libnautilus/libnautilus.la \
......
......@@ -25,7 +25,7 @@ libnautilus_image_properties_view_la_LIBADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(COMPONENT_LIBS)
libnautilus_image_properties_view_la_LDFLAGS = -module -avoid-version
libnautilus_image_properties_view_la_LDFLAGS = -module -avoid-version -no-undefined
server_in_files = Nautilus_View_image_properties.server.in.in
......
......@@ -19,7 +19,7 @@ libnautilus_notes_view_la_LIBADD = \
$(COMPONENT_LIBS) \
$(NULL)
libnautilus_notes_view_la_LDFLAGS = -module -avoid-version
libnautilus_notes_view_la_LDFLAGS = -module -avoid-version -no-undefined
server_in_files = Nautilus_View_notes.server.in.in
......
......@@ -21,7 +21,7 @@ bonobo_LTLIBRARIES = libnautilus-tree-view.la
libnautilus_tree_view_la_SOURCES = $(TREE_VIEW_COMMON_SOURCES) libmain.c
libnautilus_tree_view_la_LDFLAGS = -module -avoid-version
libnautilus_tree_view_la_LDFLAGS = -module -avoid-version -no-undefined
libnautilus_tree_view_la_LIBADD = \
$(top_builddir)/libnautilus/libnautilus.la \
......
......@@ -55,6 +55,7 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AM_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
PKG_CHECK_MODULES(ALL, \
......@@ -126,7 +127,7 @@ AC_SUBST(ORBIT_IDL)
dnl ==========================================================================
AC_CHECK_FUNCS(setmntent endmntent hasmntopt getmntinfo)
AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h)
AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h fstab.h)
dnl ==========================================================================
......
......@@ -10,9 +10,10 @@ INCLUDES=\
libnautilus_adapter_la_LDFLAGS= \
-version-info 2:0:0 \
-no-undefined \
$(NULL)
libnautilus_adapter_la_LIBADD= @ALL_LIBS@ ../libnautilus/libnautilus.la
libnautilus_adapter_la_LIBADD= ../libnautilus/libnautilus.la @ALL_LIBS@
nautilus_adapter_factory_idl_sources = \
nautilus-adapter-factory-stubs.c \
......
......@@ -23,6 +23,7 @@ dependency_static_libs = \
libnautilus_private_la_LDFLAGS = \
-version-info 2:0:0 \
-no-undefined \
$(dependency_static_libs) \
$(CORE_LIBS) \
$(NULL)
......
......@@ -61,7 +61,7 @@
#ifdef HAVE_SYS_VFSTAB_H
#include <sys/vfstab.h>
#else
#elif HAVE_FSTAB_H
#include <fstab.h>
#endif
......@@ -78,7 +78,11 @@
#ifdef HAVE_MNTENT_H
#include <mntent.h>
#ifndef __CYGWIN__
#define MOUNT_TABLE_PATH _PATH_MNTTAB
#else
#define MOUNT_TABLE_PATH MOUNTED
#endif
#elif defined (HAVE_SYS_MNTTAB_H)
#define SOLARIS_MNT 1
#include <sys/mnttab.h>
......@@ -119,6 +123,9 @@
#ifndef HAVE_SETMNTENT
#define setmntent(f,m) fopen(f,m)
#endif
#ifndef HAVE_ENDMNTENT
#define endmntent(f) fclose(f)
#endif
#ifdef HAVE_CDDA_INTERFACE_H
#ifdef HAVE_CDDA_PARANOIA_H
......@@ -737,7 +744,7 @@ get_removable_volumes (NautilusVolumeMonitor *monitor)
}
#endif
fclose (file);
endmntent (file);
#ifdef HAVE_CDDA
volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH);
......@@ -811,7 +818,7 @@ volume_is_removable (const NautilusVolume *volume)
}
#endif
fclose (file);
endmntent (file);
return removable;
}
......@@ -1214,7 +1221,7 @@ get_mount_list (NautilusVolumeMonitor *monitor)
(monitor, volume, ent.mnt_fstype, volumes);
}
fclose (fh);
endmntent (fh);
return volumes;
}
......
......@@ -12,6 +12,7 @@ INCLUDES=\
libnautilus_la_LDFLAGS=\
-version-info 2:0:0 \
-no-undefined \
$(NULL)
libnautilus_la_LIBADD = @ALL_LIBS@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment