Commit 1974e169 authored by Masahiro Sakai's avatar Masahiro Sakai Committed by Masahiro Sakai
Browse files

call AC_LIBTOOL_WIN32_DLL which is necessary for building shared library



2003-05-14  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 lockf() for egg-recent-files.

	* libpanel-applet/Makefile.am (libpanel_applet_2_la_LDFLAGS):
	* applets/clock/Makefile.am (libclock_applet_2_la_LDFLAGS):
	add -no-undefined which is necessary for building shared library on
	some platforms (e.g. Win32 and BeOS).

	* gnome-panel/egg-recent-model.c: disable egg_recent_model_lock_file()
	and egg_recent_model_unlock_file() when lockf() isn't available.
	[FIXME: should be implemented using fcntl() and F_SETLK in such case.]
parent 5a6dd851
2003-05-14 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 lockf() for egg-recent-files.
* libpanel-applet/Makefile.am (libpanel_applet_2_la_LDFLAGS):
* applets/clock/Makefile.am (libclock_applet_2_la_LDFLAGS):
add -no-undefined which is necessary for building shared library on
some platforms (e.g. Win32 and BeOS).
* gnome-panel/egg-recent-model.c: disable egg_recent_model_lock_file()
and egg_recent_model_unlock_file() when lockf() isn't available.
[FIXME: should be implemented using fcntl() and F_SETLK in such case.]
2003-05-13 Greg Merchan <merchan@phys.lsu.edu>
* applets/fish/fish.c, applets/notification_area/main.c,
applets/clock/clock.c, applets/wncklet/showdesktop.c,
......
......@@ -30,7 +30,7 @@ libclock_applet_2_la_SOURCES = \
clock.c \
$(EGGFILES)
libclock_applet_2_la_LDFLAGS = -module -avoid-version
libclock_applet_2_la_LDFLAGS = -module -avoid-version -no-undefined
libclock_applet_2_la_LIBADD = \
../../libpanel-applet/libpanel-applet-2.la \
$(CLOCK_LIBS)
......
......@@ -21,6 +21,7 @@ AC_ISC_POSIX
AC_PROG_CC
AC_STDC_HEADERS
AC_ARG_PROGRAM
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
AC_PATH_PROGS(PATH_TO_XRDB, "xrdb")
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
......@@ -95,6 +96,9 @@ AC_CHECK_HEADERS(X11/extensions/shape.h, XSHAPE_LIBS="-lXext")
AC_SUBST(XSHAPE_LIBS)
CPPFLAGS=$savecppflags
# For egg-recent-files
AC_CHECK_FUNCS(lockf)
dnl X development libraries check
#
......
......@@ -871,23 +871,31 @@ egg_recent_model_open_file (EggRecentModel *model)
static gboolean
egg_recent_model_lock_file (FILE *file)
{
#ifdef HAVE_LOCKF
int fd;
rewind (file);
fd = fileno (file);
return lockf (fd, F_LOCK, 0) == 0 ? TRUE : FALSE;
#else
return FALSE; /* FIXME */
#endif
}
static gboolean
egg_recent_model_unlock_file (FILE *file)
{
#ifdef HAVE_LOCKF
int fd;
rewind (file);
fd = fileno (file);
return lockf (fd, F_ULOCK, 0) < 0 ? FALSE : TRUE;
#else
return FALSE; /* FIXME */
#endif
}
static void
......
......@@ -22,7 +22,9 @@ libpanel_applet_2_la_SOURCES = \
panel-applet-enums.h \
$(CORBA_SRCLIST)
libpanel_applet_2_la_LDFLAGS = -version-info $(LIB_PANEL_APPLET_LT_VERSION)
libpanel_applet_2_la_LDFLAGS = \
-version-info $(LIB_PANEL_APPLET_LT_VERSION) \
-no-undefined
libpanel_applet_2_la_LIBADD = $(LIBPANEL_APPLET_LIBS)
libpanel_appletincludedir = $(includedir)/panel-2.0
......
Supports Markdown
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