[beryl-dev] Patch for Beryl to support Solaris Express/Solaris 11
Albert Lee
trisk+beryl at acm.jhu.edu
Mon Mar 12 02:18:52 CET 2007
Hi,
I've slightly modified the build system and added compatibility code for
GNU-specific functions to get Compiz working on Solaris Express b59. Among
other things, this requires libXrender to be linked into libberyl.
Please review these changes and commit them if they are appropriate.
Thanks,
-Albert
-------------- next part --------------
Patch to Beryl compositing manager and utilities for Solaris Express b59 or later with Xorg 7.2. Needs updated xineramaproto (1.1.2), libXinerama (1.0.1), libXrender (0.9.2), compositeproto (0.3.1), libXcomposite (0.3.1).
Index: bdock/configure.ac
===================================================================
--- bdock/configure.ac (revision 4388)
+++ bdock/configure.ac (working copy)
@@ -1,7 +1,7 @@
AC_PREREQ(2.57)
source $srcdir/VERSION
-AC_INIT([bdock],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali at gmail.com])
+AC_INIT([bdock],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [livinglatexkali at gmail.com])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
Index: beryl-plugins-unsupported/configure.ac
===================================================================
--- beryl-plugins-unsupported/configure.ac (revision 4388)
+++ beryl-plugins-unsupported/configure.ac (working copy)
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT([beryl-plugins-unsupported],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali at gmail.com])
+AC_INIT([beryl-plugins-unsupported],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [livinglatexkali at gmail.com])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
Index: bcop/configure.ac
===================================================================
--- bcop/configure.ac (revision 4388)
+++ bcop/configure.ac (working copy)
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT([bcop],esyscmd(. ./VERSION;echo -n $VERSION), [onestone at beryl-project.org])
+AC_INIT([bcop],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [onestone at beryl-project.org])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
Index: beryl-manager/src/compat.c
===================================================================
--- beryl-manager/src/compat.c (revision 0)
+++ beryl-manager/src/compat.c (revision 0)
@@ -0,0 +1,66 @@
+/*
+ * daemon implementation for uClibc
+ *
+ * Copyright (c) 1991, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Modified for uClibc by Erik Andersen
+ * <andersee at debian.org>, <andersen at lineo.com>
+ *
+ * The uClibc Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The GNU C Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the GNU C Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Original copyright notice is retained at the end of this file.
+ */
+
+#include "config.h"
+
+#ifndef HAVE_DAEMON
+#include <fcntl.h>
+#include <unistd.h>
+
+#define STDIN_FILENO 0
+#define STDOUT_FILENO 1
+#define STDERR_FILENO 2
+
+int daemon( int nochdir, int noclose )
+{
+ int fd;
+
+ switch (fork()) {
+ case -1:
+ return(-1);
+ case 0:
+ break;
+ default:
+ _exit(0);
+ }
+
+ if (setsid() == -1)
+ return(-1);
+
+ if (!nochdir)
+ chdir("/");
+
+ if (!noclose && (fd = open("/dev/null", O_RDWR, 0)) != -1) {
+ dup2(fd, STDIN_FILENO);
+ dup2(fd, STDOUT_FILENO);
+ dup2(fd, STDERR_FILENO);
+ if (fd > 2)
+ close(fd);
+ }
+ return(0);
+}
+#endif
Index: beryl-manager/src/Makefile.am
===================================================================
--- beryl-manager/src/Makefile.am (revision 4388)
+++ beryl-manager/src/Makefile.am (working copy)
@@ -2,7 +2,7 @@
beryl_manager_CPPFLAGS=-DDATADIR='"$(datadir)"' -DPIXMAPS_DIR='"$(datadir)/pixmaps"' -DLOCALEDIR="\"@datadir@/locale\"" @CPPFLAGS@
beryl_manager_LDADD = @COMAN_LIBS@
INCLUDES = @COMAN_CFLAGS@
-beryl_manager_SOURCES = main.c eggtrayicon.c eggtrayicon.h
+beryl_manager_SOURCES = main.c compat.c eggtrayicon.c eggtrayicon.h
beryl_manager_program = beryl-manager
bin_PROGRAMS = $(beryl_manager_program)
Index: beryl-manager/configure.ac
===================================================================
--- beryl-manager/configure.ac (revision 4388)
+++ beryl-manager/configure.ac (working copy)
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT([beryl-manager],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali at gmail.com])
+AC_INIT([beryl-manager],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [livinglatexkali at gmail.com])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
@@ -28,6 +28,9 @@
PKG_CHECK_MODULES(COMAN, $COMAN_REQUIRES)
AC_SUBST(COMAN_REQUIRES)
+AC_CHECK_FUNC(daemon, [ AC_DEFINE(HAVE_DAEMON, 1, [Define if the 'daemon' function is available.]) ])
+
+
AC_OUTPUT([
Makefile
src/Makefile
Index: beryl-settings-tool/configure.ac
===================================================================
--- beryl-settings-tool/configure.ac (revision 4388)
+++ beryl-settings-tool/configure.ac (working copy)
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT([beryl-settings-tool],esyscmd(. ./VERSION;echo -n $VERSION),
+AC_INIT([beryl-settings-tool],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"),
[ixce at beryl-project.org])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
Index: emerald-themes/configure.ac
===================================================================
--- emerald-themes/configure.ac (revision 4388)
+++ emerald-themes/configure.ac (working copy)
@@ -1,7 +1,7 @@
AC_PREREQ(2.57)
source $srcdir/VERSION
-AC_INIT([emerald-themes],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali at gmail.com])
+AC_INIT([emerald-themes],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [livinglatexkali at gmail.com])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
Index: beryl-plugins/src/state.c
===================================================================
--- beryl-plugins/src/state.c (revision 4388)
+++ beryl-plugins/src/state.c (working copy)
@@ -635,7 +635,7 @@
if (value->is_regex)
return regexec(&value->match, match, 0, 0, 0) != REG_NOMATCH;
else
- return fnmatch(value->name, match, FNM_CASEFOLD) == 0;
+ return fnmatch(value->name, match, 0) == 0;
}
static signed int
Index: beryl-plugins/src/compat.c
===================================================================
--- beryl-plugins/src/compat.c (revision 0)
+++ beryl-plugins/src/compat.c (revision 0)
@@ -0,0 +1,42 @@
+/* Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2005, 2006 Free
+ Software Foundation, Inc.
+
+ NOTE: The canonical source of this file is maintained with the GNU C Library.
+ Bugs can be reported to bug-glibc at prep.ai.mit.edu.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+#include "config.h"
+
+#ifndef HAVE_STRNDUP
+#include <stdlib.h>
+#include <string.h>
+
+char *
+strndup (s, n)
+ const char *s;
+ size_t n;
+{
+ size_t len = strnlen (s, n);
+ char *new = malloc (len + 1);
+
+ if (new == NULL)
+ return NULL;
+
+ new[len] = '\0';
+ return memcpy (new, s, len);
+}
+
+#endif
Index: beryl-plugins/src/decoration.c
===================================================================
--- beryl-plugins/src/decoration.c (revision 4388)
+++ beryl-plugins/src/decoration.c (working copy)
@@ -30,6 +30,7 @@
#include <unistd.h>
#include <X11/Xatom.h>
+#include <X11/Xlib.h>
#include <X11/extensions/shape.h>
#include <beryl.h>
Index: beryl-plugins/src/Makefile.am
===================================================================
--- beryl-plugins/src/Makefile.am (revision 4388)
+++ beryl-plugins/src/Makefile.am (working copy)
@@ -52,7 +52,7 @@
if TEXT_PLUGIN
libtext_la_LDFLAGS = $(PFLAGS)
libtext_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@ @TEXT_LIBS@
-libtext_la_SOURCES = text.c
+libtext_la_SOURCES = text.c compat.c
endif
if DBUS_PLUGIN
@@ -79,6 +79,7 @@
libbench_la_LDFLAGS = $(PFLAGS)
libbench_la_LIBADD = @BERYL_LIBS@ @BERYLSETTINGS_LIBS@
libbench_la_SOURCES = bench_options.c bench.c bench_tex.h
+libbench_module = libbench.la
endif
libscreenshot_la_LDFLAGS = $(PFLAGS)
@@ -216,7 +217,6 @@
libblurfx.la \
libsplash.la \
libtext.la \
- libbench.la \
libclone.la \
libobs.la \
lib3d.la \
@@ -232,6 +232,7 @@
libfake.la \
$(libimgjpeg_module) \
$(libannotate_module) \
+ $(libbench_module) \
$(libdbus_module)
CLEANFILES = *_options.c *_options.h
Index: beryl-plugins/configure.ac
===================================================================
--- beryl-plugins/configure.ac (revision 4388)
+++ beryl-plugins/configure.ac (working copy)
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT([beryl-plugins],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali at gmail.com])
+AC_INIT([beryl-plugins],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [livinglatexkali at gmail.com])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
@@ -156,6 +156,8 @@
AM_CONDITIONAL(TEXT_PLUGIN, test "x$use_text" = "xyes")
if test "$use_text" = yes; then
AC_DEFINE(USE_TEXT, 1, [Build text plugin])
+ AC_CHECK_FUNC(strndup, [ AC_DEFINE(HAVE_STRNDUP, 1, [Define if the 'strndup' function is available.]) ])
+
fi
AM_CONDITIONAL(JPEG_PLUGIN, test "x$use_jpeg" = "xyes")
Index: beryl-settings-simple/configure.ac
===================================================================
--- beryl-settings-simple/configure.ac (revision 4388)
+++ beryl-settings-simple/configure.ac (working copy)
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT([beryl-settings-simple],esyscmd(. ./VERSION;echo -n $VERSION),
+AC_INIT([beryl-settings-simple],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"),
[racarr at beryl-project.org])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
Index: beryl-core/libberylsettings/Makefile.am
===================================================================
--- beryl-core/libberylsettings/Makefile.am (revision 4388)
+++ beryl-core/libberylsettings/Makefile.am (working copy)
@@ -7,6 +7,7 @@
-DIMAGEDIR=\"$(imagedir)\"
libberylsettings_la_SOURCES=main.c\
+ $(top_srcdir)/src/compat.c\
$(top_srcdir)/src/screen_options.c\
$(top_srcdir)/src/type_mask.c\
$(top_srcdir)/src/display_options.c
Index: beryl-core/src/compat.c
===================================================================
--- beryl-core/src/compat.c (revision 0)
+++ beryl-core/src/compat.c (revision 0)
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2001 Federico Di Gregorio <fog at debian.org>
+ * Copyright (C) 1991, 1994-1999, 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This code has been derived from an example in the glibc2 documentation.
+ * This file is part of the psycopg module.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+#ifndef HAVE_ASPRINTF
+#include <unistd.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <stdlib.h>
+
+int
+asprintf(char **buffer, char *fmt, ...)
+{
+ /* Guess we need no more than 200 chars of space. */
+ int size = 200;
+ int nchars;
+ va_list ap;
+
+ *buffer = (char*)malloc(size);
+ if (*buffer == NULL) return -1;
+
+ /* Try to print in the allocated space. */
+ va_start(ap, fmt);
+ nchars = vsnprintf(*buffer, size, fmt, ap);
+ va_end(ap);
+
+ if (nchars >= size)
+ {
+ char *tmpbuff;
+ /* Reallocate buffer now that we know how much space is needed. */
+ size = nchars+1;
+ tmpbuff = (char*)realloc(*buffer, size);
+
+
+ if (tmpbuff == NULL) { /* we need to free it*/
+ free(*buffer);
+ return -1;
+ }
+
+ *buffer=tmpbuff;
+ /* Try again. */
+ va_start(ap, fmt);
+ nchars = vsnprintf(*buffer, size, fmt, ap);
+ va_end(ap);
+ }
+
+ if (nchars < 0) return nchars;
+ return size;
+}
+#endif /* HAVE_ASPRINTF */
+
+#ifndef HAVE_STRCASESTR
+#include <ctype.h>
+
+char *
+strcasestr (char *haystack, char *needle)
+{
+ char *p, *startn = 0, *np = 0;
+
+ for (p = haystack; *p; p++) {
+ if (np) {
+ if (toupper(*p) == toupper(*np)) {
+ if (!*++np)
+ return startn;
+ } else
+ np = 0;
+ } else if (toupper(*p) == toupper(*needle)) {
+ np = needle + 1;
+ startn = p;
+ }
+ }
+
+ return 0;
+}
+#endif /* HAVE_STRCASESTR */
Index: beryl-core/src/Makefile.am
===================================================================
--- beryl-core/src/Makefile.am (revision 4388)
+++ beryl-core/src/Makefile.am (working copy)
@@ -40,6 +40,7 @@
beryl-private.h \
fsp.h \
library.c \
+ compat.c \
blog.c
Index: beryl-core/configure.ac
===================================================================
--- beryl-core/configure.ac (revision 4388)
+++ beryl-core/configure.ac (working copy)
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT([beryl-core],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali at gmail.com])
+AC_INIT([beryl-core],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [livinglatexkali at gmail.com])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
@@ -90,6 +90,7 @@
xfixes \
xdamage \
xrandr \
+xrender >= 0.8.4 \
ice \
sm \
xinerama \
@@ -99,6 +100,10 @@
AC_SUBST(BERYL_REQUIRES)
PKG_CHECK_MODULES(GLIB, "glib-2.0")
+AC_CHECK_FUNC(strcasestr, [ AC_DEFINE(HAVE_STRCASESTR, 1, [Define if the 'strcasestr' function is available.]) ])
+
+AC_CHECK_FUNC(asprintf, [ AC_DEFINE(HAVE_ASPRINTF, 1, [Define if the 'asprintf' function is available.]) ])
+
AC_ARG_ENABLE(gconf, [ --disable-gconf Disable GConf backend for libberylsettings],
[beryl_gconf=$enableval],[beryl_gconf=yes])
Index: heliodor/configure.ac
===================================================================
--- heliodor/configure.ac (revision 4388)
+++ heliodor/configure.ac (working copy)
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT([heliodor],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali at gmail.com])
+AC_INIT([heliodor],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [livinglatexkali at gmail.com])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
Index: beryl-settings-bindings/configure.ac
===================================================================
--- beryl-settings-bindings/configure.ac (revision 4388)
+++ beryl-settings-bindings/configure.ac (working copy)
@@ -1,5 +1,5 @@
AC_PREREQ(2.57)
-AC_INIT([beryl-settings-bindings],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali at gmail.com])
+AC_INIT([beryl-settings-bindings],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [livinglatexkali at gmail.com])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
Index: emerald/themer/compat.c
===================================================================
--- emerald/themer/compat.c (revision 0)
+++ emerald/themer/compat.c (revision 0)
@@ -0,0 +1,122 @@
+/* Compare strings while treating digits characters numerically.
+ Copyright (C) 1997, 2000, 2002, 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jean-Fran?ois Bignolles <bignolle at ecoledoc.ibp.fr>, 1997.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+#include "config.h"
+
+#ifndef HAVE_STRVERSCMP
+
+#include <string.h>
+#include <ctype.h>
+
+/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
+ fractional parts, S_Z: idem but with leading Zeroes only */
+#define S_N 0x0
+#define S_I 0x4
+#define S_F 0x8
+#define S_Z 0xC
+
+/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
+#define CMP 2
+#define LEN 3
+
+
+/* ISDIGIT differs from isdigit, as follows:
+ - Its arg may be any int or unsigned int; it need not be an unsigned char.
+ - It's guaranteed to evaluate its argument exactly once.
+ - It's typically faster.
+ POSIX says that only '0' through '9' are digits. Prefer ISDIGIT to
+ ISDIGIT_LOCALE unless it's important to use the locale's definition
+ of `digit' even when the host does not conform to POSIX. */
+#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9)
+
+/* Compare S1 and S2 as strings holding indices/version numbers,
+ returning less than, equal to or greater than zero if S1 is less than,
+ equal to or greater than S2 (for more info, see the texinfo doc).
+*/
+
+int
+strverscmp (const char *s1, const char *s2)
+{
+ const unsigned char *p1 = (const unsigned char *) s1;
+ const unsigned char *p2 = (const unsigned char *) s2;
+ unsigned char c1, c2;
+ int state;
+ int diff;
+
+ /* Symbol(s) 0 [1-9] others (padding)
+ Transition (10) 0 (01) d (00) x (11) - */
+ static const unsigned int next_state[] =
+ {
+ /* state x d 0 - */
+ /* S_N */ S_N, S_I, S_Z, S_N,
+ /* S_I */ S_N, S_I, S_I, S_I,
+ /* S_F */ S_N, S_F, S_F, S_F,
+ /* S_Z */ S_N, S_F, S_Z, S_Z
+ };
+
+ static const int result_type[] =
+ {
+ /* state x/x x/d x/0 x/- d/x d/d d/0 d/-
+ 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */
+
+ /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
+ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
+ /* S_I */ CMP, -1, -1, CMP, 1, LEN, LEN, CMP,
+ 1, LEN, LEN, CMP, CMP, CMP, CMP, CMP,
+ /* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
+ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
+ /* S_Z */ CMP, 1, 1, CMP, -1, CMP, CMP, CMP,
+ -1, CMP, CMP, CMP
+ };
+
+ if (p1 == p2)
+ return 0;
+
+ c1 = *p1++;
+ c2 = *p2++;
+ /* Hint: '0' is a digit too. */
+ state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0));
+
+ while ((diff = c1 - c2) == 0 && c1 != '\0')
+ {
+ state = next_state[state];
+ c1 = *p1++;
+ c2 = *p2++;
+ state |= (c1 == '0') + (ISDIGIT (c1) != 0);
+ }
+
+ state = result_type[state << 2 | ((c2 == '0') + (ISDIGIT (c2) != 0))];
+
+ switch (state)
+ {
+ case CMP:
+ return diff;
+
+ case LEN:
+ while (ISDIGIT (*p1++))
+ if (!ISDIGIT (*p2++))
+ return 1;
+
+ return ISDIGIT (*p2) ? -1 : diff;
+
+ default:
+ return state;
+ }
+}
+#endif
Index: emerald/themer/Makefile.am
===================================================================
--- emerald/themer/Makefile.am (revision 4388)
+++ emerald/themer/Makefile.am (working copy)
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-emerald_theme_manager_SOURCES = main.c
+emerald_theme_manager_SOURCES = main.c compat.c
emerald_theme_manager_LDADD = $(EMERALD_LIBS) ../libengine/libemeraldengine.la
bin_PROGRAMS = emerald-theme-manager
Index: emerald/configure.ac
===================================================================
--- emerald/configure.ac (revision 4388)
+++ emerald/configure.ac (working copy)
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT([emerald],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali at gmail.com])
+AC_INIT([emerald],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [livinglatexkali at gmail.com])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
@@ -48,6 +48,8 @@
LIBS="$LIBS $EMERALD_LIBS"
AC_CHECK_FUNCS(wnck_window_has_name)
+AC_CHECK_FUNC(strverscmp, [ AC_DEFINE(HAVE_STRVERSCMP, 1, [Define if the 'strverscmp' function is available.]) ])
+
AC_ARG_ENABLE(mime-update,
[ --enable-mime-update],
[case "${enableval}" in
Index: beryl-settings/configure.ac
===================================================================
--- beryl-settings/configure.ac (revision 4388)
+++ beryl-settings/configure.ac (working copy)
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT([beryl-settings],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali at gmail.com])
+AC_INIT([beryl-settings],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [livinglatexkali at gmail.com])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
More information about the beryl-dev
mailing list