Updating branch refs/heads/master
to 64627c8b8b2c1b95e69a95e927e4e4ccd0e5ade6 (commit)
from e5e8e4c0410a4764797616d8e3930cb032f2e031 (commit)
commit 64627c8b8b2c1b95e69a95e927e4e4ccd0e5ade6
Author: Juha Kautto <j...@xfce.org>
Date: Thu Feb 25 15:03:12 2010 +0200
4.7.5.14: Fix for bug 6234
Thanks to Kevin Fenzi for that patch.
configure.in.in | 2 +-
globaltime/Makefile.am | 1 +
panel-plugin/Makefile.am | 3 ++-
src/Makefile.am | 2 ++
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 61e1175..290e6f8 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <j...@xfce.org>
dnl
dnl Version information
-m4_define([orage_version], [4.7.5.13-git])
+m4_define([orage_version], [4.7.5.14-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/globaltime/Makefile.am b/globaltime/Makefile.am
index 8da869a..c9467f3 100644
--- a/globaltime/Makefile.am
+++ b/globaltime/Makefile.am
@@ -32,6 +32,7 @@ globaltime_CFLAGS =
\
globaltime_LDADD = \
$(LIBXFCEGUI4_LIBS) \
$(LIBXFCEUTIL_LIBS) \
+ -lX11 \
$(INTLLIBS)
EXTRA_DIST = \
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 03a8a70..7201c50 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -8,7 +8,8 @@ xfce4_orageclock_plugin_CFLAGS =
\
@LIBXFCE4PANEL_CFLAGS@
xfce4_orageclock_plugin_LDFLAGS =
\
- @LIBXFCE4PANEL_LIBS@
+ @LIBXFCE4PANEL_LIBS@ \
+ -lX11
xfce4_orageclock_plugin_SOURCES =
\
oc_config.c
\
diff --git a/src/Makefile.am b/src/Makefile.am
index 65f5b30..1940dce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,6 +42,8 @@ orage_CFLAGS =
\
orage_LDADD = \
$(LIBXFCEGUI4_LIBS) \
$(LIBXFCEUTIL_LIBS) \
+ -lX11 \
+ -lm \
$(INTLLIBS)
if INCLUDED_LIBICAL
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
