← Back to branch summary

~ubuntu-branches/ubuntu/raring/openmotif/raring-proposed

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bauer
  • Date: 2010-06-29 09:42:21 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100629094221-yee9gtet2dngu6cv
Tags: 2.3.3-1
http://bugs.debian.org/587461
* New upstream release
* Drop patch for autoconf-bug as this was fixed upstream
* Applied patch to fix implicit pointer conversion (Closes: #587461)
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
5
5
AC_CONFIG_AUX_DIR(.)
6
6
AC_CHECK_FILE(/usr/X/include/X11/X.h,
7
7
  AC_PREFIX_DEFAULT(/usr/X),
8
 
  AC_PREFIX_DEFAULT(/usr/X11R6))
9
 
AM_MAINTAINER_MODE
 
8
  AC_PREFIX_DEFAULT(/usr))
 
9
AC_CHECK_FILE(/usr/X11R6/include/X11/X.h,
 
10
  AC_PREFIX_DEFAULT(/usr/X11R6),
 
11
  AC_PREFIX_DEFAULT(/usr))
 
12
 
 
13
dnl AM_MAINTAINER_MODE
10
14
AC_CANONICAL_TARGET
11
15
 
12
16
dnl The version of the OpenMotif libraries
13
17
CURRENT=4
14
 
REVISION=0
 
18
REVISION=3
15
19
AGE=0
16
20
AC_SUBST(CURRENT)
17
21
AC_SUBST(REVISION)
18
22
AC_SUBST(AGE)
19
23
 
20
24
dnl This is really dumb but it seems to be bug
21
 
AM_INIT_AUTOMAKE(openmotif,2.3.0,no-define)
 
25
AM_INIT_AUTOMAKE(openmotif,2.3.3,no-define)
22
26
 
23
27
LIBTOOL_VERSION=$CURRENT:$REVISION:$AGE
24
28
 
41
45
dnl Do this the old fashioned way. 'bison -y' doesn't cut it
42
46
AC_CHECK_PROGS(YACC, byacc, yacc)
43
47
 
 
48
dnl AC_PROG_SPLINT
 
49
AC_CHECK_PROGS(SPLINT, splint)
 
50
if test x$SPLINT = x
 
51
then
 
52
    AC_MSG_WARN([No splint is dound])
 
53
fi
 
54
 
44
55
AM_PROG_LEX
45
56
AC_PROG_INSTALL
46
57
AC_PROG_LN_S
47
58
AC_PROG_MAKE_SET
48
59
 
 
60
 
49
61
dnl Checks for libraries.
50
62
 
51
63
AC_PATH_X
71
83
AC_CHECK_LIB(Xmu,XmuNCopyISOLatin1Lowered ,
72
84
AC_DEFINE(HAVE_XMU_N_COPY_ISO,1,Have XmuNCopyISOLatin1Lowered)
73
85
, , -lXt -lX11)
 
86
,,[[#include <X11/Intrinsic.h>]]
74
87
)
75
88
 
76
89
 
166
179
LIBDIR="${libdir}/X11"
167
180
AC_SUBST(LIBDIR)
168
181
 
 
182
MWMRCDIR="${libdir}/X11"
 
183
AC_SUBST(MWMRCDIR)
 
184
 
169
185
INCDIR="${includedir}/X11"
170
186
AC_SUBST(INCDIR)
171
187
 
172
188
XMBINDDIR_FALLBACK="${libdir}/X11/bindings"
173
189
AC_SUBST(XMBINDDIR_FALLBACK)
174
190
 
 
191
RM="rm -f"
 
192
AC_SUBST(RM)
 
193
 
175
194
AC_ARG_ENABLE(motif22-compatibility, [  --disable-motif22-compatibility
176
195
                       Disable binary compatibility with OpenMotif 2.2])
177
196
AC_ARG_ENABLE(utf8, [  --disable-utf8
221
240
if test "$enable_utf8" = "yes"
222
241
then
223
242
  AC_DEFINE([UTF8_SUPPORTED], [1], [UTF8 is supported])
224
 
  AC_CHECK_LIB([iconv], [iconv_open])
225
 
fi
 
243
  AC_SEARCH_LIBS([iconv_open], [iconv], ,
 
244
    AC_SEARCH_LIBS([libiconv_open], [iconv]))
 
245
fi
 
246
 
 
247
AC_ARG_ENABLE(printing, [  --disable-printing
 
248
                       Disable printing support])
 
249
 
 
250
if test x$enable_printing = x
 
251
then
 
252
    enable_printing="yes"
 
253
fi
 
254
 
 
255
if test "$enable_printing" = "yes"
 
256
then
 
257
  AC_MSG_CHECKING([for libXp])
 
258
  AC_CHECK_HEADERS(X11/extensions/Print.h,
 
259
    AC_CHECK_LIB(Xp, XpCreateContext, ,enable_printing="no"),
 
260
  enable_printing="no")
 
261
fi
 
262
 
 
263
if test "$enable_printing" = "yes"
 
264
then
 
265
  LIB_XP=-lXp
 
266
  AC_DEFINE([PRINTING_SUPPORTED], [1], [Printing is supported])
 
267
  PRINTING_SUPPORTED_FALSE=!
 
268
  PRINTING_SUPPORTED_TRUE=
 
269
else
 
270
  LIB_XP=
 
271
  PRINTING_SUPPORTED_FALSE=
 
272
  PRINTING_SUPPORTED_TRUE=!
 
273
fi
 
274
AC_SUBST(PRINTING_SUPPORTED_FALSE)
 
275
AC_SUBST(PRINTING_SUPPORTED_TRUE)
 
276
 
 
277
AM_CONDITIONAL(PRINTING, test "$enable_printing" = "yes")
 
278
AC_SUBST(LIB_XP)
226
279
 
227
280
AC_FIND_XFT
228
281
AC_IMAGE_SUPPORT
229
282
 
 
283
 
 
284
 
230
285
# AM_CONDITIONAL(Motif22Compatibility, test x$enable_motif22_compatibility = xyes)
231
286
 
232
287
AC_CONFIG_FILES([Makefile \