← Back to branch summary

~ubuntu-branches/debian/sid/openbox/sid

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Nico Golde, Nico Golde, Eugenio Paolantonio
  • Date: 2011-10-03 22:59:30 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20111003225930-tdvyax5tx63dyoez
Tags: 3.5.0-1
http://bugs.debian.org/638783
http://bugs.debian.org/563891
http://bugs.debian.org/627912
[Nico Golde]
* New upstream release (Closes: #638783).
  - Fix crashes in the menu code (Closes: #563891).
* Add Brazilian translation to openbox.desktop,
  thanks Sérgio Cipolla (Closes: #627912).
* Remove 06_fix_swap_byte_order.patch, applied upstream.
* Bump debhelper dependency to >= 7.0.50~ due to override.
* Remove CHANGELOG from openbox.docs to prevent double installation.
* Add 02_fix_freedesktop_compliance.dpatch desktop file to
  /usr/share/applications.

[Eugenio Paolantonio]
* debian/patches:
  - Disabled 03_place_windows_in_quadrants.patch
  - Updated 01_rc.xml.patch and 06_fix_swap_byte_order.patch
  - Removed 04_fix_ftbfs_no-add-needed.patch and 20_24bits_support.patch
* debian/control:
  - Added myself to the Uploaders.
  - Build-Depends: removed libxau-dev, libxft-dev and python-xdg;
    added libimlib2-dev
  - openbox Suggests: added python-xdg
  - libobrender21 renamed to libobrender27
  - libobparser21 renamed to libobt0
* debian/rules:
  - Rewrote using a simpler debhelper syntax
  - Moved the install pass to openbox.install
* debian/*.{install,links,dirs}:
  - Updated.
* debian/openbox.xsession:
  - Removed. Openbox now ships it by default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
AC_PREREQ([2.54])
2
 
AC_INIT([openbox], [3.4.11.2], [http://bugzilla.icculus.org])
 
2
AC_INIT([openbox], [3.5.0], [http://bugzilla.icculus.org])
3
3
AM_INIT_AUTOMAKE
4
4
AC_CONFIG_SRCDIR([openbox/openbox.c])
5
5
 
 
6
OB_VERSION=$PACKAGE_VERSION
 
7
AC_SUBST(OB_VERSION)
 
8
 
6
9
dnl Making releases:
7
 
dnl   OB_MICRO_VERSION += 1;
8
 
dnl   OB_INTERFACE_AGE += 1;
9
 
dnl   OB_BINARY_AGE += 1;
10
 
dnl if any functions have been added, set OB_INTERFACE_AGE to 0.
 
10
dnl   RR_MICRO_VERSION += 1;
 
11
dnl   RR_INTERFACE_AGE += 1;
 
12
dnl   R_BINARY_AGE += 1;
 
13
dnl if any functions have been added, set RR_INTERFACE_AGE to 0.
11
14
dnl if backwards compatibility has been broken,
12
 
dnl set OB_BINARY_AGE and OB_INTERFACE_AGE to 0.
 
15
dnl set RR_BINARY_AGE and RR_INTERFACE_AGE to 0.
13
16
dnl
14
17
dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
15
18
dnl
16
 
OB_MAJOR_VERSION=3
17
 
OB_MINOR_VERSION=4
18
 
OB_MICRO_VERSION=30
19
 
OB_INTERFACE_AGE=9
20
 
OB_BINARY_AGE=9
21
 
OB_VERSION=$PACKAGE_VERSION
22
 
 
23
 
AC_SUBST(OB_MAJOR_VERSION)
24
 
AC_SUBST(OB_MINOR_VERSION)
25
 
AC_SUBST(OB_MICRO_VERSION)
26
 
AC_SUBST(OB_INTERFACE_AGE)
27
 
AC_SUBST(OB_BINARY_AGE)
28
 
AC_SUBST(OB_VERSION)
 
19
RR_MAJOR_VERSION=3
 
20
RR_MINOR_VERSION=5
 
21
RR_MICRO_VERSION=28
 
22
RR_INTERFACE_AGE=1
 
23
RR_BINARY_AGE=1
 
24
RR_VERSION=$RR_MAJOR_VERSION.$RR_MINOR_VERSION
 
25
 
 
26
OBT_MAJOR_VERSION=3
 
27
OBT_MINOR_VERSION=5
 
28
OBT_MICRO_VERSION=1
 
29
OBT_INTERFACE_AGE=1
 
30
OBT_BINARY_AGE=1
 
31
OBT_VERSION=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION
 
32
 
 
33
AC_SUBST(RR_MAJOR_VERSION)
 
34
AC_SUBST(RR_MINOR_VERSION)
 
35
AC_SUBST(RR_MICRO_VERSION)
 
36
AC_SUBST(RR_INTERFACE_AGE)
 
37
AC_SUBST(RR_BINARY_AGE)
 
38
AC_SUBST(RR_VERSION)
 
39
AC_SUBST(OBT_MAJOR_VERSION)
 
40
AC_SUBST(OBT_MINOR_VERSION)
 
41
AC_SUBST(OBT_MICRO_VERSION)
 
42
AC_SUBST(OBT_INTERFACE_AGE)
 
43
AC_SUBST(OBT_BINARY_AGE)
 
44
AC_SUBST(OBT_VERSION)
29
45
 
30
46
dnl Libtool versioning
31
 
LT_RELEASE=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
32
 
LT_CURRENT=`expr $OB_MICRO_VERSION - $OB_INTERFACE_AGE`
33
 
LT_REVISION=$OB_INTERFACE_AGE
34
 
LT_AGE=`expr $OB_BINARY_AGE - $OB_INTERFACE_AGE`
35
 
LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
36
 
 
37
 
AC_SUBST(LT_RELEASE)
38
 
AC_SUBST(LT_CURRENT)
39
 
AC_SUBST(LT_REVISION)
40
 
AC_SUBST(LT_AGE)
41
 
AC_SUBST(LT_CURRENT_MINUS_AGE)
 
47
RR_RELEASE=$RR_MAJOR_VERSION.$RR_MINOR_VERSION
 
48
RR_CURRENT=`expr $RR_MICRO_VERSION - $RR_INTERFACE_AGE`
 
49
RR_REVISION=$RR_INTERFACE_AGE
 
50
RR_AGE=`expr $RR_BINARY_AGE - $RR_INTERFACE_AGE`
 
51
RR_CURRENT_MINUS_AGE=`expr $RR_CURRENT - $RR_AGE`
 
52
 
 
53
OBT_RELEASE=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION
 
54
OBT_CURRENT=`expr $OBT_MICRO_VERSION - $OBT_INTERFACE_AGE`
 
55
OBT_REVISION=$OBT_INTERFACE_AGE
 
56
OBT_AGE=`expr $OBT_BINARY_AGE - $OBT_INTERFACE_AGE`
 
57
OBT_CURRENT_MINUS_AGE=`expr $OBT_CURRENT - $OBT_AGE`
 
58
 
 
59
AC_SUBST(RR_RELEASE)
 
60
AC_SUBST(RR_CURRENT)
 
61
AC_SUBST(RR_REVISION)
 
62
AC_SUBST(RR_AGE)
 
63
AC_SUBST(RR_CURRENT_MINUS_AGE)
 
64
AC_SUBST(OBT_RELEASE)
 
65
AC_SUBST(OBT_CURRENT)
 
66
AC_SUBST(OBT_REVISION)
 
67
AC_SUBST(OBT_AGE)
 
68
AC_SUBST(OBT_CURRENT_MINUS_AGE)
42
69
 
43
70
AC_PREFIX_DEFAULT([/usr/local])
44
71
test "$prefix" = "NONE" && prefix=$ac_default_prefix
60
87
AM_GNU_GETTEXT_VERSION(0.15)
61
88
AM_GNU_GETTEXT([external])
62
89
 
63
 
AC_CHECK_HEADERS(ctype.h fcntl.h locale.h signal.h string.h stdio.h stdlib.h)
64
 
AC_CHECK_HEADERS(unistd.h sys/stat.h sys/select.h sys/time.h sys/wait.h)
65
 
# AC_HEADER_TIME
66
 
# AC_TYPE_SIGNAL
 
90
AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h grp.h locale.h pwd.h)
 
91
AC_CHECK_HEADERS(signal.h string.h stdio.h stdlib.h unistd.h sys/stat.h)
 
92
AC_CHECK_HEADERS(sys/select.h sys/socket.h sys/time.h sys/types.h sys/wait.h)
67
93
 
68
94
AC_PATH_PROG([SED], [sed], [no])
69
95
if test "$SED" = "no"; then
70
96
  AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.])
71
97
fi
72
98
 
 
99
AC_PATH_PROG([DIRNAME], [dirname], [no])
 
100
if test "$DIRNAME" = "no"; then
 
101
  AC_MSG_ERROR([The program "dirname" is not available. This program is required to build Openbox.])
 
102
fi
 
103
 
73
104
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0])
74
105
AC_SUBST(GLIB_CFLAGS)
75
106
AC_SUBST(GLIB_LIBS)
78
109
AC_SUBST(PANGO_CFLAGS)
79
110
AC_SUBST(PANGO_LIBS)
80
111
 
81
 
PKG_CHECK_MODULES(XFT, [xft])
82
 
AC_SUBST(XFT_CFLAGS)
83
 
AC_SUBST(XFT_LIBS)
84
 
 
85
 
PKG_CHECK_MODULES(XAU, [xau])
86
 
AC_SUBST(XAU_CFLAGS)
87
 
AC_SUBST(XAU_LIBS)
88
 
 
89
112
PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.0])
90
113
AC_SUBST(XML_CFLAGS)
91
114
AC_SUBST(XML_LIBS)
93
116
AC_ARG_ENABLE(startup-notification,
94
117
  AC_HELP_STRING(
95
118
    [--disable-startup-notification],
96
 
    [disable the startup notification library. [[default=enabled]]]
 
119
    [disable the startup notification library. [default=enabled]]
97
120
  ),
98
121
  [enable_sn=$enableval],
99
122
  [enable_sn=yes]
118
141
AC_ARG_ENABLE(xcursor,
119
142
  AC_HELP_STRING(
120
143
    [--disable-xcursor],
121
 
    [disable use of the X Cursor library. [[default=enabled]]]
 
144
    [disable use of the X Cursor library. [default=enabled]]
122
145
  ),
123
146
  [enable_xcursor=$enableval],
124
147
  [enable_xcursor=yes]
140
163
  xcursor_found=no
141
164
fi
142
165
 
 
166
AC_ARG_ENABLE(imlib2,
 
167
  AC_HELP_STRING(
 
168
    [--disable-imlib2],
 
169
    [disable use of Imlib2 image library for loading icons. [default=enabled]]
 
170
  ),
 
171
  [enable_imlib2=$enableeval],
 
172
  [enable_imlib2=yes]
 
173
)
 
174
 
 
175
if test "$enable_imlib2" = yes; then
 
176
PKG_CHECK_MODULES(IMLIB2, [imlib2],
 
177
  [
 
178
    AC_DEFINE(USE_IMLIB2, [1], [Use Imlib2 image library])
 
179
    AC_SUBST(IMLIB2_CFLAGS)
 
180
    AC_SUBST(IMLIB2_LIBS)
 
181
    # export it for the pkg-config file
 
182
    PKG_CONFIG_IMLIB=imlib2
 
183
    AC_SUBST(PKG_CONFIG_IMLIB)
 
184
    imlib2_found=yes
 
185
  ],
 
186
  [
 
187
    imlib2_found=no
 
188
  ]
 
189
)
 
190
else
 
191
  imlib2_found=no
 
192
fi
 
193
 
 
194
AM_CONDITIONAL(USE_IMLIB2, [test $imlib2_found = yes])
 
195
 
143
196
dnl Check for session management
144
197
X11_SM
145
198
 
153
206
X11_EXT_SHAPE
154
207
X11_EXT_XINERAMA
155
208
X11_EXT_SYNC
 
209
X11_EXT_AUTH
156
210
 
157
211
AC_CONFIG_FILES([
158
212
  Makefile
159
213
  m4/Makefile
160
214
  po/Makefile.in
161
 
  render/obrender-3.0.pc
162
 
  parser/obparser-3.0.pc
 
215
  obrender/obrender-3.5.pc
 
216
  obt/obt-3.5.pc
 
217
  obrender/version.h
 
218
  obt/version.h
163
219
  version.h
164
220
])
165
221
AC_CONFIG_COMMANDS([doc],
175
231
               Startup Notification... $sn_found
176
232
               X Cursor Library... $xcursor_found
177
233
               Session Management... $SM
 
234
               Imlib2 library... $imlib2_found
178
235
               ])
179
236
AC_MSG_RESULT([configure complete, now type "make"])