1 diff -pruN lxpanel-0.5.10/autogen.sh lxpanel-0.5.10_new/autogen.sh
2 --- lxpanel-0.5.10/autogen.sh 2012-04-08 01:27:42.000000000 +0200
3 +++ lxpanel-0.5.10_new/autogen.sh 2012-12-17 19:03:28.000000000 +0100
4 @@ -2,16 +2,6 @@
5 AC_VERSION=
6
7 AUTOMAKE=${AUTOMAKE:-automake}
8 -AM_INSTALLED_VERSION=$($AUTOMAKE --version | sed -e '2,$ d' -e 's/.* \([0-9]*\.[0-9]*\).*/\1/')
9 -
10 -if [ "$AM_INSTALLED_VERSION" != "1.10" \
11 - -a "$AM_INSTALLED_VERSION" != "1.11" ];then
12 - echo
13 - echo "You must have automake > 1.10 or 1.11 installed to compile lxpanel."
14 - echo "Install the appropriate package for your distribution,"
15 - echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
16 - exit 1
17 -fi
18
19 set -x
20
21 @@ -22,7 +12,6 @@ fi
22 ${ACLOCAL:-aclocal$AM_VERSION} ${ACLOCAL_ARG}
23 ${AUTOHEADER:-autoheader$AC_VERSION} --force
24 AUTOMAKE=$AUTOMAKE libtoolize -c --automake --force
25 -AUTOMAKE=$AUTOMAKE intltoolize -c --automake --force
26 $AUTOMAKE --add-missing --copy --include-deps
27 ${AUTOCONF:-autoconf$AC_VERSION}
28
29 diff -pruN lxpanel-0.5.10/configure.ac lxpanel-0.5.10_new/configure.ac
30 --- lxpanel-0.5.10/configure.ac 2012-06-10 23:22:21.000000000 +0200
31 +++ lxpanel-0.5.10_new/configure.ac 2012-12-17 19:05:11.000000000 +0100
32 @@ -1,6 +1,6 @@
33 AC_PREREQ(2.53)
34 AC_INIT(lxpanel, 0.5.10, http://lxde.org/)
35 -AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign])
36 +AM_INIT_AUTOMAKE([1.11 -Wall foreign])
37 AC_CONFIG_HEADER([config.h])
38
39 # Support silent build rules. Disable by either passing --disable-silent-rules
40 @@ -14,7 +14,6 @@ AC_DISABLE_STATIC
41 AC_PROG_CC
42 AC_PROG_INSTALL
43 AC_PROG_LN_S
44 -AC_PROG_INTLTOOL(, [no-xml])
45 AM_PROG_CC_C_O
46
47 #Initialize libtool
48 @@ -443,7 +442,6 @@ AC_CONFIG_FILES([
49 src/plugins/monitors/Makefile
50 src/plugins/wnckpager/Makefile
51 src/plugins/indicator/Makefile
52 - po/Makefile.in
53 data/Makefile
54 data/default/panels/panel
55 data/two_panels/panels/top
56 diff -pruN lxpanel-0.5.10/Makefile.am lxpanel-0.5.10_new/Makefile.am
57 --- lxpanel-0.5.10/Makefile.am 2012-04-08 01:27:42.000000000 +0200
58 +++ lxpanel-0.5.10_new/Makefile.am 2012-12-17 19:00:43.000000000 +0100
59 @@ -1,13 +1,9 @@
60 ## Process this file with automake to produce Makefile.in
61
62 -SUBDIRS = src data po man
63 +SUBDIRS = src data man
64
65 EXTRA_DIST = \
66 autogen.sh \
67 - autogen.sh \
68 - intltool-extract.in \
69 - intltool-merge.in \
70 - intltool-update.in \
71 lxpanel.pc.in
72
73 pkgconfigdir = $(libdir)/pkgconfig
74 diff -pruN lxpanel-0.5.10/src/Makefile.am lxpanel-0.5.10_new/src/Makefile.am
75 --- lxpanel-0.5.10/src/Makefile.am 2012-04-08 01:27:42.000000000 +0200
76 +++ lxpanel-0.5.10_new/src/Makefile.am 2012-12-17 18:39:05.000000000 +0100
77 @@ -46,7 +46,8 @@ lxpanel_LDADD = \
78 $(BUILTIN_PLUGINS) \
79 $(PACKAGE_LIBS) \
80 $(X11_LIBS) \
81 - $(INTLLIBS)
82 + $(INTLLIBS) \
83 + -lgmodule-2.0
84
85 lxpanelctl_SOURCES = lxpanelctl.c lxpanelctl.h
86 lxpanelctl_LDADD = $(X11_LIBS) $(INTLLIBS)
|
