Browse Source

Fix FTBFS with libwpd 0.9 and above

This resolves Bug 1169
Remove spurious build files
tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
efca1544fd

+ 0
- 12406
acinclude.m4
File diff suppressed because it is too large
View File


+ 0
- 892
aclocal.m4 View File

@@ -1,892 +0,0 @@
1
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
2
-
3
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4
-# 2005  Free Software Foundation, Inc.
5
-# This file is free software; the Free Software Foundation
6
-# gives unlimited permission to copy and/or distribute it,
7
-# with or without modifications, as long as this notice is preserved.
8
-
9
-# This program is distributed in the hope that it will be useful,
10
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
11
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12
-# PARTICULAR PURPOSE.
13
-
14
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
15
-#
16
-# This file is free software; the Free Software Foundation
17
-# gives unlimited permission to copy and/or distribute it,
18
-# with or without modifications, as long as this notice is preserved.
19
-
20
-# AM_AUTOMAKE_VERSION(VERSION)
21
-# ----------------------------
22
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
23
-# generated from the m4 files accompanying Automake X.Y.
24
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
25
-
26
-# AM_SET_CURRENT_AUTOMAKE_VERSION
27
-# -------------------------------
28
-# Call AM_AUTOMAKE_VERSION so it can be traced.
29
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
30
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
31
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
32
-
33
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
34
-
35
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
36
-#
37
-# This file is free software; the Free Software Foundation
38
-# gives unlimited permission to copy and/or distribute it,
39
-# with or without modifications, as long as this notice is preserved.
40
-
41
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
42
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
43
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
44
-#
45
-# Of course, Automake must honor this variable whenever it calls a
46
-# tool from the auxiliary directory.  The problem is that $srcdir (and
47
-# therefore $ac_aux_dir as well) can be either absolute or relative,
48
-# depending on how configure is run.  This is pretty annoying, since
49
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
50
-# source directory, any form will work fine, but in subdirectories a
51
-# relative path needs to be adjusted first.
52
-#
53
-# $ac_aux_dir/missing
54
-#    fails when called from a subdirectory if $ac_aux_dir is relative
55
-# $top_srcdir/$ac_aux_dir/missing
56
-#    fails if $ac_aux_dir is absolute,
57
-#    fails when called from a subdirectory in a VPATH build with
58
-#          a relative $ac_aux_dir
59
-#
60
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
61
-# are both prefixed by $srcdir.  In an in-source build this is usually
62
-# harmless because $srcdir is `.', but things will broke when you
63
-# start a VPATH build or use an absolute $srcdir.
64
-#
65
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
66
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
67
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
68
-# and then we would define $MISSING as
69
-#   MISSING="\${SHELL} $am_aux_dir/missing"
70
-# This will work as long as MISSING is not called from configure, because
71
-# unfortunately $(top_srcdir) has no meaning in configure.
72
-# However there are other variables, like CC, which are often used in
73
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
74
-#
75
-# Another solution, used here, is to always expand $ac_aux_dir to an
76
-# absolute PATH.  The drawback is that using absolute paths prevent a
77
-# configured tree to be moved without reconfiguration.
78
-
79
-AC_DEFUN([AM_AUX_DIR_EXPAND],
80
-[dnl Rely on autoconf to set up CDPATH properly.
81
-AC_PREREQ([2.50])dnl
82
-# expand $ac_aux_dir to an absolute path
83
-am_aux_dir=`cd $ac_aux_dir && pwd`
84
-])
85
-
86
-# AM_CONDITIONAL                                            -*- Autoconf -*-
87
-
88
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
89
-# Free Software Foundation, Inc.
90
-#
91
-# This file is free software; the Free Software Foundation
92
-# gives unlimited permission to copy and/or distribute it,
93
-# with or without modifications, as long as this notice is preserved.
94
-
95
-# serial 7
96
-
97
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
98
-# -------------------------------------
99
-# Define a conditional.
100
-AC_DEFUN([AM_CONDITIONAL],
101
-[AC_PREREQ(2.52)dnl
102
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
103
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
104
-AC_SUBST([$1_TRUE])
105
-AC_SUBST([$1_FALSE])
106
-if $2; then
107
-  $1_TRUE=
108
-  $1_FALSE='#'
109
-else
110
-  $1_TRUE='#'
111
-  $1_FALSE=
112
-fi
113
-AC_CONFIG_COMMANDS_PRE(
114
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
115
-  AC_MSG_ERROR([[conditional "$1" was never defined.
116
-Usually this means the macro was only invoked conditionally.]])
117
-fi])])
118
-
119
-
120
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
121
-# Free Software Foundation, Inc.
122
-#
123
-# This file is free software; the Free Software Foundation
124
-# gives unlimited permission to copy and/or distribute it,
125
-# with or without modifications, as long as this notice is preserved.
126
-
127
-# serial 8
128
-
129
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
130
-# written in clear, in which case automake, when reading aclocal.m4,
131
-# will think it sees a *use*, and therefore will trigger all it's
132
-# C support machinery.  Also note that it means that autoscan, seeing
133
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
134
-
135
-
136
-# _AM_DEPENDENCIES(NAME)
137
-# ----------------------
138
-# See how the compiler implements dependency checking.
139
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
140
-# We try a few techniques and use that to set a single cache variable.
141
-#
142
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
143
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
144
-# dependency, and given that the user is not expected to run this macro,
145
-# just rely on AC_PROG_CC.
146
-AC_DEFUN([_AM_DEPENDENCIES],
147
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
148
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
149
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
150
-AC_REQUIRE([AM_DEP_TRACK])dnl
151
-
152
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
153
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
154
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
155
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
156
-                   [depcc="$$1"   am_compiler_list=])
157
-
158
-AC_CACHE_CHECK([dependency style of $depcc],
159
-               [am_cv_$1_dependencies_compiler_type],
160
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
161
-  # We make a subdir and do the tests there.  Otherwise we can end up
162
-  # making bogus files that we don't know about and never remove.  For
163
-  # instance it was reported that on HP-UX the gcc test will end up
164
-  # making a dummy file named `D' -- because `-MD' means `put the output
165
-  # in D'.
166
-  mkdir conftest.dir
167
-  # Copy depcomp to subdir because otherwise we won't find it if we're
168
-  # using a relative directory.
169
-  cp "$am_depcomp" conftest.dir
170
-  cd conftest.dir
171
-  # We will build objects and dependencies in a subdirectory because
172
-  # it helps to detect inapplicable dependency modes.  For instance
173
-  # both Tru64's cc and ICC support -MD to output dependencies as a
174
-  # side effect of compilation, but ICC will put the dependencies in
175
-  # the current directory while Tru64 will put them in the object
176
-  # directory.
177
-  mkdir sub
178
-
179
-  am_cv_$1_dependencies_compiler_type=none
180
-  if test "$am_compiler_list" = ""; then
181
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
182
-  fi
183
-  for depmode in $am_compiler_list; do
184
-    # Setup a source with many dependencies, because some compilers
185
-    # like to wrap large dependency lists on column 80 (with \), and
186
-    # we should not choose a depcomp mode which is confused by this.
187
-    #
188
-    # We need to recreate these files for each test, as the compiler may
189
-    # overwrite some of them when testing with obscure command lines.
190
-    # This happens at least with the AIX C compiler.
191
-    : > sub/conftest.c
192
-    for i in 1 2 3 4 5 6; do
193
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
194
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
195
-      # Solaris 8's {/usr,}/bin/sh.
196
-      touch sub/conftst$i.h
197
-    done
198
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
199
-
200
-    case $depmode in
201
-    nosideeffect)
202
-      # after this tag, mechanisms are not by side-effect, so they'll
203
-      # only be used when explicitly requested
204
-      if test "x$enable_dependency_tracking" = xyes; then
205
-	continue
206
-      else
207
-	break
208
-      fi
209
-      ;;
210
-    none) break ;;
211
-    esac
212
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
213
-    # mode.  It turns out that the SunPro C++ compiler does not properly
214
-    # handle `-M -o', and we need to detect this.
215
-    if depmode=$depmode \
216
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
217
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
218
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
219
-         >/dev/null 2>conftest.err &&
220
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
221
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
222
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
223
-      # icc doesn't choke on unknown options, it will just issue warnings
224
-      # or remarks (even with -Werror).  So we grep stderr for any message
225
-      # that says an option was ignored or not supported.
226
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
227
-      #   icc: Command line warning: ignoring option '-M'; no argument required
228
-      # The diagnosis changed in icc 8.0:
229
-      #   icc: Command line remark: option '-MP' not supported
230
-      if (grep 'ignoring option' conftest.err ||
231
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
232
-        am_cv_$1_dependencies_compiler_type=$depmode
233
-        break
234
-      fi
235
-    fi
236
-  done
237
-
238
-  cd ..
239
-  rm -rf conftest.dir
240
-else
241
-  am_cv_$1_dependencies_compiler_type=none
242
-fi
243
-])
244
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
245
-AM_CONDITIONAL([am__fastdep$1], [
246
-  test "x$enable_dependency_tracking" != xno \
247
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
248
-])
249
-
250
-
251
-# AM_SET_DEPDIR
252
-# -------------
253
-# Choose a directory name for dependency files.
254
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
255
-AC_DEFUN([AM_SET_DEPDIR],
256
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
257
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
258
-])
259
-
260
-
261
-# AM_DEP_TRACK
262
-# ------------
263
-AC_DEFUN([AM_DEP_TRACK],
264
-[AC_ARG_ENABLE(dependency-tracking,
265
-[  --disable-dependency-tracking  speeds up one-time build
266
-  --enable-dependency-tracking   do not reject slow dependency extractors])
267
-if test "x$enable_dependency_tracking" != xno; then
268
-  am_depcomp="$ac_aux_dir/depcomp"
269
-  AMDEPBACKSLASH='\'
270
-fi
271
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
272
-AC_SUBST([AMDEPBACKSLASH])
273
-])
274
-
275
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
276
-
277
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
278
-# Free Software Foundation, Inc.
279
-#
280
-# This file is free software; the Free Software Foundation
281
-# gives unlimited permission to copy and/or distribute it,
282
-# with or without modifications, as long as this notice is preserved.
283
-
284
-#serial 3
285
-
286
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
287
-# ------------------------------
288
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
289
-[for mf in $CONFIG_FILES; do
290
-  # Strip MF so we end up with the name of the file.
291
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
292
-  # Check whether this is an Automake generated Makefile or not.
293
-  # We used to match only the files named `Makefile.in', but
294
-  # some people rename them; so instead we look at the file content.
295
-  # Grep'ing the first line is not enough: some people post-process
296
-  # each Makefile.in and add a new line on top of each file to say so.
297
-  # So let's grep whole file.
298
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
299
-    dirpart=`AS_DIRNAME("$mf")`
300
-  else
301
-    continue
302
-  fi
303
-  # Extract the definition of DEPDIR, am__include, and am__quote
304
-  # from the Makefile without running `make'.
305
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
306
-  test -z "$DEPDIR" && continue
307
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
308
-  test -z "am__include" && continue
309
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
310
-  # When using ansi2knr, U may be empty or an underscore; expand it
311
-  U=`sed -n 's/^U = //p' < "$mf"`
312
-  # Find all dependency output files, they are included files with
313
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
314
-  # simplest approach to changing $(DEPDIR) to its actual value in the
315
-  # expansion.
316
-  for file in `sed -n "
317
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
318
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
319
-    # Make sure the directory exists.
320
-    test -f "$dirpart/$file" && continue
321
-    fdir=`AS_DIRNAME(["$file"])`
322
-    AS_MKDIR_P([$dirpart/$fdir])
323
-    # echo "creating $dirpart/$file"
324
-    echo '# dummy' > "$dirpart/$file"
325
-  done
326
-done
327
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
328
-
329
-
330
-# AM_OUTPUT_DEPENDENCY_COMMANDS
331
-# -----------------------------
332
-# This macro should only be invoked once -- use via AC_REQUIRE.
333
-#
334
-# This code is only required when automatic dependency tracking
335
-# is enabled.  FIXME.  This creates each `.P' file that we will
336
-# need in order to bootstrap the dependency handling code.
337
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
338
-[AC_CONFIG_COMMANDS([depfiles],
339
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
340
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
341
-])
342
-
343
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
344
-# Free Software Foundation, Inc.
345
-#
346
-# This file is free software; the Free Software Foundation
347
-# gives unlimited permission to copy and/or distribute it,
348
-# with or without modifications, as long as this notice is preserved.
349
-
350
-# serial 8
351
-
352
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
353
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
354
-
355
-# Do all the work for Automake.                             -*- Autoconf -*-
356
-
357
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
358
-# Free Software Foundation, Inc.
359
-#
360
-# This file is free software; the Free Software Foundation
361
-# gives unlimited permission to copy and/or distribute it,
362
-# with or without modifications, as long as this notice is preserved.
363
-
364
-# serial 12
365
-
366
-# This macro actually does too much.  Some checks are only needed if
367
-# your package does certain things.  But this isn't really a big deal.
368
-
369
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
370
-# AM_INIT_AUTOMAKE([OPTIONS])
371
-# -----------------------------------------------
372
-# The call with PACKAGE and VERSION arguments is the old style
373
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
374
-# and VERSION should now be passed to AC_INIT and removed from
375
-# the call to AM_INIT_AUTOMAKE.
376
-# We support both call styles for the transition.  After
377
-# the next Automake release, Autoconf can make the AC_INIT
378
-# arguments mandatory, and then we can depend on a new Autoconf
379
-# release and drop the old call support.
380
-AC_DEFUN([AM_INIT_AUTOMAKE],
381
-[AC_PREREQ([2.58])dnl
382
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
383
-dnl the ones we care about.
384
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
385
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
386
-AC_REQUIRE([AC_PROG_INSTALL])dnl
387
-# test to see if srcdir already configured
388
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
389
-   test -f $srcdir/config.status; then
390
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
391
-fi
392
-
393
-# test whether we have cygpath
394
-if test -z "$CYGPATH_W"; then
395
-  if (cygpath --version) >/dev/null 2>/dev/null; then
396
-    CYGPATH_W='cygpath -w'
397
-  else
398
-    CYGPATH_W=echo
399
-  fi
400
-fi
401
-AC_SUBST([CYGPATH_W])
402
-
403
-# Define the identity of the package.
404
-dnl Distinguish between old-style and new-style calls.
405
-m4_ifval([$2],
406
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
407
- AC_SUBST([PACKAGE], [$1])dnl
408
- AC_SUBST([VERSION], [$2])],
409
-[_AM_SET_OPTIONS([$1])dnl
410
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
411
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
412
-
413
-_AM_IF_OPTION([no-define],,
414
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
415
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
416
-
417
-# Some tools Automake needs.
418
-AC_REQUIRE([AM_SANITY_CHECK])dnl
419
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
420
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
421
-AM_MISSING_PROG(AUTOCONF, autoconf)
422
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
423
-AM_MISSING_PROG(AUTOHEADER, autoheader)
424
-AM_MISSING_PROG(MAKEINFO, makeinfo)
425
-AM_PROG_INSTALL_SH
426
-AM_PROG_INSTALL_STRIP
427
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
428
-# We need awk for the "check" target.  The system "awk" is bad on
429
-# some platforms.
430
-AC_REQUIRE([AC_PROG_AWK])dnl
431
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
432
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
433
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
434
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
435
-	      		     [_AM_PROG_TAR([v7])])])
436
-_AM_IF_OPTION([no-dependencies],,
437
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
438
-                  [_AM_DEPENDENCIES(CC)],
439
-                  [define([AC_PROG_CC],
440
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
441
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
442
-                  [_AM_DEPENDENCIES(CXX)],
443
-                  [define([AC_PROG_CXX],
444
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
445
-])
446
-])
447
-
448
-
449
-# When config.status generates a header, we must update the stamp-h file.
450
-# This file resides in the same directory as the config header
451
-# that is generated.  The stamp files are numbered to have different names.
452
-
453
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
454
-# loop where config.status creates the headers, so we can generate
455
-# our stamp files there.
456
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
457
-[# Compute $1's index in $config_headers.
458
-_am_stamp_count=1
459
-for _am_header in $config_headers :; do
460
-  case $_am_header in
461
-    $1 | $1:* )
462
-      break ;;
463
-    * )
464
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
465
-  esac
466
-done
467
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
468
-
469
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
470
-#
471
-# This file is free software; the Free Software Foundation
472
-# gives unlimited permission to copy and/or distribute it,
473
-# with or without modifications, as long as this notice is preserved.
474
-
475
-# AM_PROG_INSTALL_SH
476
-# ------------------
477
-# Define $install_sh.
478
-AC_DEFUN([AM_PROG_INSTALL_SH],
479
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
480
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
481
-AC_SUBST(install_sh)])
482
-
483
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
484
-#
485
-# This file is free software; the Free Software Foundation
486
-# gives unlimited permission to copy and/or distribute it,
487
-# with or without modifications, as long as this notice is preserved.
488
-
489
-# serial 2
490
-
491
-# Check whether the underlying file-system supports filenames
492
-# with a leading dot.  For instance MS-DOS doesn't.
493
-AC_DEFUN([AM_SET_LEADING_DOT],
494
-[rm -rf .tst 2>/dev/null
495
-mkdir .tst 2>/dev/null
496
-if test -d .tst; then
497
-  am__leading_dot=.
498
-else
499
-  am__leading_dot=_
500
-fi
501
-rmdir .tst 2>/dev/null
502
-AC_SUBST([am__leading_dot])])
503
-
504
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
505
-# From Jim Meyering
506
-
507
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
508
-# Free Software Foundation, Inc.
509
-#
510
-# This file is free software; the Free Software Foundation
511
-# gives unlimited permission to copy and/or distribute it,
512
-# with or without modifications, as long as this notice is preserved.
513
-
514
-# serial 4
515
-
516
-AC_DEFUN([AM_MAINTAINER_MODE],
517
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
518
-  dnl maintainer-mode is disabled by default
519
-  AC_ARG_ENABLE(maintainer-mode,
520
-[  --enable-maintainer-mode  enable make rules and dependencies not useful
521
-			  (and sometimes confusing) to the casual installer],
522
-      USE_MAINTAINER_MODE=$enableval,
523
-      USE_MAINTAINER_MODE=no)
524
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
525
-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
526
-  MAINT=$MAINTAINER_MODE_TRUE
527
-  AC_SUBST(MAINT)dnl
528
-]
529
-)
530
-
531
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
532
-
533
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
534
-
535
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
536
-#
537
-# This file is free software; the Free Software Foundation
538
-# gives unlimited permission to copy and/or distribute it,
539
-# with or without modifications, as long as this notice is preserved.
540
-
541
-# serial 3
542
-
543
-# AM_MAKE_INCLUDE()
544
-# -----------------
545
-# Check to see how make treats includes.
546
-AC_DEFUN([AM_MAKE_INCLUDE],
547
-[am_make=${MAKE-make}
548
-cat > confinc << 'END'
549
-am__doit:
550
-	@echo done
551
-.PHONY: am__doit
552
-END
553
-# If we don't find an include directive, just comment out the code.
554
-AC_MSG_CHECKING([for style of include used by $am_make])
555
-am__include="#"
556
-am__quote=
557
-_am_result=none
558
-# First try GNU make style include.
559
-echo "include confinc" > confmf
560
-# We grep out `Entering directory' and `Leaving directory'
561
-# messages which can occur if `w' ends up in MAKEFLAGS.
562
-# In particular we don't look at `^make:' because GNU make might
563
-# be invoked under some other name (usually "gmake"), in which
564
-# case it prints its new name instead of `make'.
565
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
566
-   am__include=include
567
-   am__quote=
568
-   _am_result=GNU
569
-fi
570
-# Now try BSD make style include.
571
-if test "$am__include" = "#"; then
572
-   echo '.include "confinc"' > confmf
573
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
574
-      am__include=.include
575
-      am__quote="\""
576
-      _am_result=BSD
577
-   fi
578
-fi
579
-AC_SUBST([am__include])
580
-AC_SUBST([am__quote])
581
-AC_MSG_RESULT([$_am_result])
582
-rm -f confinc confmf
583
-])
584
-
585
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
586
-
587
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
588
-# Free Software Foundation, Inc.
589
-#
590
-# This file is free software; the Free Software Foundation
591
-# gives unlimited permission to copy and/or distribute it,
592
-# with or without modifications, as long as this notice is preserved.
593
-
594
-# serial 4
595
-
596
-# AM_MISSING_PROG(NAME, PROGRAM)
597
-# ------------------------------
598
-AC_DEFUN([AM_MISSING_PROG],
599
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
600
-$1=${$1-"${am_missing_run}$2"}
601
-AC_SUBST($1)])
602
-
603
-
604
-# AM_MISSING_HAS_RUN
605
-# ------------------
606
-# Define MISSING if not defined so far and test if it supports --run.
607
-# If it does, set am_missing_run to use it, otherwise, to nothing.
608
-AC_DEFUN([AM_MISSING_HAS_RUN],
609
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
610
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
611
-# Use eval to expand $SHELL
612
-if eval "$MISSING --run true"; then
613
-  am_missing_run="$MISSING --run "
614
-else
615
-  am_missing_run=
616
-  AC_MSG_WARN([`missing' script is too old or missing])
617
-fi
618
-])
619
-
620
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
621
-#
622
-# This file is free software; the Free Software Foundation
623
-# gives unlimited permission to copy and/or distribute it,
624
-# with or without modifications, as long as this notice is preserved.
625
-
626
-# AM_PROG_MKDIR_P
627
-# ---------------
628
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
629
-#
630
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
631
-# created by `make install' are always world readable, even if the
632
-# installer happens to have an overly restrictive umask (e.g. 077).
633
-# This was a mistake.  There are at least two reasons why we must not
634
-# use `-m 0755':
635
-#   - it causes special bits like SGID to be ignored,
636
-#   - it may be too restrictive (some setups expect 775 directories).
637
-#
638
-# Do not use -m 0755 and let people choose whatever they expect by
639
-# setting umask.
640
-#
641
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
642
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
643
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
644
-# concurrently, both version can detect that a/ is missing, but only
645
-# one can create it and the other will error out.  Consequently we
646
-# restrict ourselves to GNU make (using the --version option ensures
647
-# this.)
648
-AC_DEFUN([AM_PROG_MKDIR_P],
649
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
650
-  # We used to keeping the `.' as first argument, in order to
651
-  # allow $(mkdir_p) to be used without argument.  As in
652
-  #   $(mkdir_p) $(somedir)
653
-  # where $(somedir) is conditionally defined.  However this is wrong
654
-  # for two reasons:
655
-  #  1. if the package is installed by a user who cannot write `.'
656
-  #     make install will fail,
657
-  #  2. the above comment should most certainly read
658
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
659
-  #     so it does not work when $(somedir) is undefined and
660
-  #     $(DESTDIR) is not.
661
-  #  To support the latter case, we have to write
662
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
663
-  #  so the `.' trick is pointless.
664
-  mkdir_p='mkdir -p --'
665
-else
666
-  # On NextStep and OpenStep, the `mkdir' command does not
667
-  # recognize any option.  It will interpret all options as
668
-  # directories to create, and then abort because `.' already
669
-  # exists.
670
-  for d in ./-p ./--version;
671
-  do
672
-    test -d $d && rmdir $d
673
-  done
674
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
675
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
676
-    mkdir_p='$(mkinstalldirs)'
677
-  else
678
-    mkdir_p='$(install_sh) -d'
679
-  fi
680
-fi
681
-AC_SUBST([mkdir_p])])
682
-
683
-# Helper functions for option handling.                     -*- Autoconf -*-
684
-
685
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
686
-#
687
-# This file is free software; the Free Software Foundation
688
-# gives unlimited permission to copy and/or distribute it,
689
-# with or without modifications, as long as this notice is preserved.
690
-
691
-# serial 3
692
-
693
-# _AM_MANGLE_OPTION(NAME)
694
-# -----------------------
695
-AC_DEFUN([_AM_MANGLE_OPTION],
696
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
697
-
698
-# _AM_SET_OPTION(NAME)
699
-# ------------------------------
700
-# Set option NAME.  Presently that only means defining a flag for this option.
701
-AC_DEFUN([_AM_SET_OPTION],
702
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
703
-
704
-# _AM_SET_OPTIONS(OPTIONS)
705
-# ----------------------------------
706
-# OPTIONS is a space-separated list of Automake options.
707
-AC_DEFUN([_AM_SET_OPTIONS],
708
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
709
-
710
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
711
-# -------------------------------------------
712
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
713
-AC_DEFUN([_AM_IF_OPTION],
714
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
715
-
716
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
717
-
718
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
719
-# Free Software Foundation, Inc.
720
-#
721
-# This file is free software; the Free Software Foundation
722
-# gives unlimited permission to copy and/or distribute it,
723
-# with or without modifications, as long as this notice is preserved.
724
-
725
-# serial 4
726
-
727
-# AM_SANITY_CHECK
728
-# ---------------
729
-AC_DEFUN([AM_SANITY_CHECK],
730
-[AC_MSG_CHECKING([whether build environment is sane])
731
-# Just in case
732
-sleep 1
733
-echo timestamp > conftest.file
734
-# Do `set' in a subshell so we don't clobber the current shell's
735
-# arguments.  Must try -L first in case configure is actually a
736
-# symlink; some systems play weird games with the mod time of symlinks
737
-# (eg FreeBSD returns the mod time of the symlink's containing
738
-# directory).
739
-if (
740
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
741
-   if test "$[*]" = "X"; then
742
-      # -L didn't work.
743
-      set X `ls -t $srcdir/configure conftest.file`
744
-   fi
745
-   rm -f conftest.file
746
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
747
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
748
-
749
-      # If neither matched, then we have a broken ls.  This can happen
750
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
751
-      # broken ls alias from the environment.  This has actually
752
-      # happened.  Such a system could not be considered "sane".
753
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
754
-alias in your environment])
755
-   fi
756
-
757
-   test "$[2]" = conftest.file
758
-   )
759
-then
760
-   # Ok.
761
-   :
762
-else
763
-   AC_MSG_ERROR([newly created file is older than distributed files!
764
-Check your system clock])
765
-fi
766
-AC_MSG_RESULT(yes)])
767
-
768
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
769
-#
770
-# This file is free software; the Free Software Foundation
771
-# gives unlimited permission to copy and/or distribute it,
772
-# with or without modifications, as long as this notice is preserved.
773
-
774
-# AM_PROG_INSTALL_STRIP
775
-# ---------------------
776
-# One issue with vendor `install' (even GNU) is that you can't
777
-# specify the program used to strip binaries.  This is especially
778
-# annoying in cross-compiling environments, where the build's strip
779
-# is unlikely to handle the host's binaries.
780
-# Fortunately install-sh will honor a STRIPPROG variable, so we
781
-# always use install-sh in `make install-strip', and initialize
782
-# STRIPPROG with the value of the STRIP variable (set by the user).
783
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
784
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
785
-# Installed binaries are usually stripped using `strip' when the user
786
-# run `make install-strip'.  However `strip' might not be the right
787
-# tool to use in cross-compilation environments, therefore Automake
788
-# will honor the `STRIP' environment variable to overrule this program.
789
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
790
-if test "$cross_compiling" != no; then
791
-  AC_CHECK_TOOL([STRIP], [strip], :)
792
-fi
793
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
794
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
795
-
796
-# Check how to create a tarball.                            -*- Autoconf -*-
797
-
798
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
799
-#
800
-# This file is free software; the Free Software Foundation
801
-# gives unlimited permission to copy and/or distribute it,
802
-# with or without modifications, as long as this notice is preserved.
803
-
804
-# serial 2
805
-
806
-# _AM_PROG_TAR(FORMAT)
807
-# --------------------
808
-# Check how to create a tarball in format FORMAT.
809
-# FORMAT should be one of `v7', `ustar', or `pax'.
810
-#
811
-# Substitute a variable $(am__tar) that is a command
812
-# writing to stdout a FORMAT-tarball containing the directory
813
-# $tardir.
814
-#     tardir=directory && $(am__tar) > result.tar
815
-#
816
-# Substitute a variable $(am__untar) that extract such
817
-# a tarball read from stdin.
818
-#     $(am__untar) < result.tar
819
-AC_DEFUN([_AM_PROG_TAR],
820
-[# Always define AMTAR for backward compatibility.
821
-AM_MISSING_PROG([AMTAR], [tar])
822
-m4_if([$1], [v7],
823
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
824
-     [m4_case([$1], [ustar],, [pax],,
825
-              [m4_fatal([Unknown tar format])])
826
-AC_MSG_CHECKING([how to create a $1 tar archive])
827
-# Loop over all known methods to create a tar archive until one works.
828
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
829
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
830
-# Do not fold the above two line into one, because Tru64 sh and
831
-# Solaris sh will not grok spaces in the rhs of `-'.
832
-for _am_tool in $_am_tools
833
-do
834
-  case $_am_tool in
835
-  gnutar)
836
-    for _am_tar in tar gnutar gtar;
837
-    do
838
-      AM_RUN_LOG([$_am_tar --version]) && break
839
-    done
840
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
841
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
842
-    am__untar="$_am_tar -xf -"
843
-    ;;
844
-  plaintar)
845
-    # Must skip GNU tar: if it does not support --format= it doesn't create
846
-    # ustar tarball either.
847
-    (tar --version) >/dev/null 2>&1 && continue
848
-    am__tar='tar chf - "$$tardir"'
849
-    am__tar_='tar chf - "$tardir"'
850
-    am__untar='tar xf -'
851
-    ;;
852
-  pax)
853
-    am__tar='pax -L -x $1 -w "$$tardir"'
854
-    am__tar_='pax -L -x $1 -w "$tardir"'
855
-    am__untar='pax -r'
856
-    ;;
857
-  cpio)
858
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
859
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
860
-    am__untar='cpio -i -H $1 -d'
861
-    ;;
862
-  none)
863
-    am__tar=false
864
-    am__tar_=false
865
-    am__untar=false
866
-    ;;
867
-  esac
868
-
869
-  # If the value was cached, stop now.  We just wanted to have am__tar
870
-  # and am__untar set.
871
-  test -n "${am_cv_prog_tar_$1}" && break
872
-
873
-  # tar/untar a dummy directory, and stop if the command works
874
-  rm -rf conftest.dir
875
-  mkdir conftest.dir
876
-  echo GrepMe > conftest.dir/file
877
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
878
-  rm -rf conftest.dir
879
-  if test -s conftest.tar; then
880
-    AM_RUN_LOG([$am__untar <conftest.tar])
881
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
882
-  fi
883
-done
884
-rm -rf conftest.dir
885
-
886
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
887
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
888
-AC_SUBST([am__tar])
889
-AC_SUBST([am__untar])
890
-]) # _AM_PROG_TAR
891
-
892
-m4_include([acinclude.m4])

+ 38
- 6
config.h.in View File

@@ -1,5 +1,8 @@
1 1
 /* config.h.in.  Generated from configure.in by autoheader.  */
2 2
 
3
+/* Define if building universal (internal helper macro) */
4
+#undef AC_APPLE_UNIVERSAL_BUILD
5
+
3 6
 /* Define to 1 if you have the <Carbon/Carbon.h> header file. */
4 7
 #undef HAVE_CARBON_CARBON_H
5 8
 
@@ -68,9 +71,6 @@
68 71
 /* Defines if your system has the fontconfig and freetype libraries */
69 72
 #undef HAVE_KARBONTEXT
70 73
 
71
-/* Define to 1 if you have the <tdespell2/broker.h> header file. */
72
-#undef HAVE_KSPELL2_BROKER_H
73
-
74 74
 /* Defines if your system has the libart library */
75 75
 #undef HAVE_LIBART
76 76
 
@@ -89,6 +89,9 @@
89 89
 /* Define if you have libtiff */
90 90
 #undef HAVE_LIBTIFF
91 91
 
92
+/* Defines if your system has libpwd greater than or equal to v0.9.0 */
93
+#undef HAVE_LIBWPD_090
94
+
92 95
 /* Define if you have libz */
93 96
 #undef HAVE_LIBZ
94 97
 
@@ -150,6 +153,9 @@
150 153
 /* Define to 1 if you have the `rewinddir' function. */
151 154
 #undef HAVE_REWINDDIR
152 155
 
156
+/* Defines if your system has Ruby 1.9.x */
157
+#undef HAVE_RUBY_1_9
158
+
153 159
 /* Define if you have a STL implementation by SGI */
154 160
 #undef HAVE_SGI_STL
155 161
 
@@ -200,6 +206,9 @@
200 206
 /* Define to 1 if you have the <sys/types.h> header file. */
201 207
 #undef HAVE_SYS_TYPES_H
202 208
 
209
+/* Define to 1 if you have the <tdespell2/broker.h> header file. */
210
+#undef HAVE_TDESPELL2_BROKER_H
211
+
203 212
 /* Define to 1 if you have the <unistd.h> header file. */
204 213
 #undef HAVE_UNISTD_H
205 214
 
@@ -227,6 +236,10 @@
227 236
 /* The correct header */
228 237
 #undef LCMS_HEADER
229 238
 
239
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
240
+   */
241
+#undef LT_OBJDIR
242
+
230 243
 /* Name of package */
231 244
 #undef PACKAGE
232 245
 
@@ -242,6 +255,9 @@
242 255
 /* Define to the one symbol short name of this package. */
243 256
 #undef PACKAGE_TARNAME
244 257
 
258
+/* Define to the home page for this package. */
259
+#undef PACKAGE_URL
260
+
245 261
 /* Define to the version of this package. */
246 262
 #undef PACKAGE_VERSION
247 263
 
@@ -275,9 +291,17 @@
275 291
 /* Defined if compiling without arts */
276 292
 #undef WITHOUT_ARTS
277 293
 
278
-/* Define to 1 if your processor stores words with the most significant byte
279
-   first (like Motorola and SPARC, unlike Intel and VAX). */
280
-#undef WORDS_BIGENDIAN
294
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
295
+   significant byte first (like Motorola and SPARC, unlike Intel). */
296
+#if defined AC_APPLE_UNIVERSAL_BUILD
297
+# if defined __BIG_ENDIAN__
298
+#  define WORDS_BIGENDIAN 1
299
+# endif
300
+#else
301
+# ifndef WORDS_BIGENDIAN
302
+#  undef WORDS_BIGENDIAN
303
+# endif
304
+#endif
281 305
 
282 306
 /* Defines the executable of xmllint */
283 307
 #undef XMLLINT
@@ -311,6 +335,11 @@
311 335
 #endif
312 336
 
313 337
 
338
+/* Enable large inode numbers on Mac OS X 10.5.  */
339
+#ifndef _DARWIN_USE_64_BIT_INODE
340
+# define _DARWIN_USE_64_BIT_INODE 1
341
+#endif
342
+
314 343
 /* Number of bits in a file offset, on hosts where this is settable. */
315 344
 #undef _FILE_OFFSET_BITS
316 345
 
@@ -379,6 +408,9 @@ int snprintf(char *str, size_t n, char const *fmt, ...);
379 408
 #endif
380 409
 
381 410
 
411
+/* define to 1 if -fvisibility is supported */
412
+#undef __KDE_HAVE_GCC_VISIBILITY
413
+
382 414
 
383 415
 #if defined(__SVR4) && !defined(__svr4__)
384 416
 #define __svr4__ 1

+ 4
- 4
configure.files View File

@@ -1,5 +1,9 @@
1 1
 ./admin/configure.in.min
2 2
 configure.in.in
3
+./chalk/configure.in.bot
4
+./chalk/configure.in.in
5
+./chalk/plugins/configure.in.in
6
+./chalk/plugins/viewplugins/imagesize/configure.in.in
3 7
 ./example/configure.in.in
4 8
 ./filters/configure.in.mid
5 9
 ./filters/chalk/configure.in.in
@@ -31,10 +35,6 @@ configure.in.in
31 35
 ./kexi/plugins/macros/configure.in.in
32 36
 ./kivio/configure.in.in
33 37
 ./kpresenter/configure.in.in
34
-./chalk/configure.in.bot
35
-./chalk/configure.in.in
36
-./chalk/plugins/configure.in.in
37
-./chalk/plugins/viewplugins/imagesize/configure.in.in
38 38
 ./kspread/plugins/calculator/configure.in.in
39 39
 ./kword/mailmerge/configure.in.in
40 40
 ./lib/configure.in.in

+ 0
- 2701
configure.in
File diff suppressed because it is too large
View File


+ 0
- 2
filters/kword/wordperfect/configure.in.in View File

@@ -41,8 +41,6 @@ if test -z "$LIBWPD_LIBS"; then
41 41
 
42 42
        AC_DEFINE_UNQUOTED(HAVE_WPD, 1, [Defines if your system has the libwpd library])
43 43
        AC_DEFINE_UNQUOTED(HAVE_LIBWPD_090, 1, [Defines if your system has libpwd greater than or equal to v0.9.0])
44
-
45
-       AC_MSG_ERROR([[libwpd >= 0.9.0 is not yet supported!]])       
46 44
     fi
47 45
   fi
48 46
 fi

+ 61
- 0
filters/kword/wordperfect/import/WordPerfectCollector.hxx View File

@@ -77,13 +77,72 @@ struct ltstr
77 77
   }
78 78
 };
79 79
 
80
+#ifdef HAVE_LIBWPD_090
81
+class WordPerfectCollector : public WPXDocumentInterface
82
+#else // HAVE_LIBWPD_090
80 83
 class WordPerfectCollector : public WPXHLListenerImpl
84
+#endif HAVE_LIBWPD_090
81 85
 {
82 86
 public:
83 87
 	WordPerfectCollector(WPXInputStream *pInput, DocumentHandler *pHandler);
84 88
 	virtual ~WordPerfectCollector();
85 89
 	bool filter();
86 90
 
91
+#ifdef HAVE_LIBWPD_090
92
+	virtual void setDocumentMetaData(const WPXPropertyList &propList) {};
93
+	virtual void startDocument();
94
+	virtual void endDocument();
95
+	virtual void definePageStyle(const WPXPropertyList &propList) {};
96
+	virtual void openPageSpan(const WPXPropertyList &propList) {};
97
+	virtual void closePageSpan() {};
98
+	virtual void openHeader(const WPXPropertyList &propList) {};
99
+	virtual void closeHeader() {};
100
+	virtual void openFooter(const WPXPropertyList &propList) {};
101
+	virtual void closeFooter() {};
102
+	virtual void defineParagraphStyle(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {};
103
+	virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
104
+	virtual void closeParagraph();
105
+	virtual void defineCharacterStyle(const WPXPropertyList &propList) {};
106
+	virtual void openSpan(const WPXPropertyList &propList);
107
+	virtual void closeSpan();
108
+	virtual void defineSectionStyle(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
109
+	virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
110
+	virtual void closeSection() {};
111
+	virtual void insertTab();
112
+	virtual void insertSpace() {};
113
+	virtual void insertText(const WPXString &text);
114
+ 	virtual void insertLineBreak();
115
+	virtual void insertField(const WPXString &type, const WPXPropertyList &propList) {};
116
+	virtual void defineOrderedListLevel(const WPXPropertyList &propList) {};
117
+	virtual void defineUnorderedListLevel(const WPXPropertyList &propList) {};	
118
+	virtual void openOrderedListLevel(const WPXPropertyList &propList) {};
119
+	virtual void openUnorderedListLevel(const WPXPropertyList &propList) {};
120
+	virtual void closeOrderedListLevel() {};
121
+	virtual void closeUnorderedListLevel() {};
122
+	virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {};
123
+	virtual void closeListElement() {};       
124
+	virtual void openFootnote(const WPXPropertyList &propList) {};
125
+	virtual void closeFootnote() {};
126
+	virtual void openEndnote(const WPXPropertyList &propList) {};
127
+	virtual void closeEndnote() {};
128
+	virtual void openComment(const WPXPropertyList &propList) {};
129
+	virtual void closeComment() {};
130
+	virtual void openTextBox(const WPXPropertyList &propList) {};
131
+	virtual void closeTextBox() {};
132
+ 	virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
133
+ 	virtual void openTableRow(const WPXPropertyList &propList) {};
134
+	virtual void closeTableRow() {};
135
+ 	virtual void openTableCell(const WPXPropertyList &propList) {};
136
+	virtual void closeTableCell() {};
137
+	virtual void insertCoveredTableCell(const WPXPropertyList &propList) {};
138
+ 	virtual void closeTable() {};
139
+	virtual void openFrame(const WPXPropertyList &propList) {};
140
+	virtual void closeFrame() {};
141
+	virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) {};
142
+	virtual void insertEquation(const WPXPropertyList &propList, const WPXString &data) {};
143
+
144
+#else // HAVE_LIBWPD_090
145
+
87 146
  	virtual void setDocumentMetaData(const WPXPropertyList &propList) {}
88 147
 	virtual void startDocument() {}
89 148
 	virtual void endDocument() {}
@@ -132,6 +191,8 @@ public:
132 191
 	virtual void insertCoveredTableCell(const WPXPropertyList &propList);
133 192
  	virtual void closeTable();
134 193
 
194
+#endif // HAVE_LIBWPD_090
195
+
135 196
 protected:
136 197
 	void _resetDocumentState();
137 198
 	bool _parseSourceDocument(WPXInputStream &input);

+ 104
- 0
filters/kword/wordperfect/import/wpimport.cc View File

@@ -44,6 +44,104 @@ K_EXPORT_COMPONENT_FACTORY( libwpimport, WPImportFactory( "kofficefilters" ) )
44 44
 #include "DocumentHandler.hxx"
45 45
 #include "WordPerfectCollector.hxx"
46 46
 
47
+#ifdef HAVE_LIBWPD_090
48
+class WPXMemoryInputStream : public WPXInputStream
49
+{
50
+public:
51
+    WPXMemoryInputStream(unsigned char *data, unsigned long size);
52
+    virtual ~WPXMemoryInputStream();
53
+
54
+    virtual bool isOLEStream() {
55
+        return false;
56
+    }
57
+    virtual WPXInputStream * getDocumentOLEStream(const char *name) {
58
+        return NULL;
59
+    }
60
+
61
+    const virtual unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
62
+    virtual int seek(long offset, WPX_SEEK_TYPE seekType);
63
+    virtual long tell();
64
+    virtual bool atEOS();
65
+
66
+private:
67
+    long m_offset;
68
+    size_t m_size;
69
+    unsigned char *m_data;
70
+};
71
+
72
+WPXMemoryInputStream::WPXMemoryInputStream(unsigned char *data, unsigned long size) :
73
+	WPXInputStream(),
74
+	m_offset(0),
75
+	m_size(size),
76
+	m_data(data)
77
+{
78
+}
79
+
80
+WPXMemoryInputStream::~WPXMemoryInputStream()
81
+{
82
+}
83
+
84
+const unsigned char * WPXMemoryInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
85
+{
86
+	numBytesRead = 0;
87
+
88
+	if (numBytes == 0)
89
+		return 0;
90
+	
91
+	int numBytesToRead;
92
+
93
+	if ((m_offset+numBytes) < m_size)
94
+		numBytesToRead = numBytes;
95
+	else
96
+		numBytesToRead = m_size - m_offset;
97
+	
98
+	numBytesRead = numBytesToRead; // about as paranoid as we can be..
99
+
100
+	if (numBytesToRead == 0)
101
+		return 0;
102
+
103
+	long oldOffset = m_offset;
104
+	m_offset += numBytesToRead;
105
+	
106
+	return &m_data[oldOffset];
107
+}
108
+
109
+int WPXMemoryInputStream::seek(long offset, WPX_SEEK_TYPE seekType)
110
+{
111
+	if (seekType == WPX_SEEK_CUR)
112
+		m_offset += offset;
113
+	else if (seekType == WPX_SEEK_SET)
114
+		m_offset = offset;
115
+
116
+	if (m_offset < 0)
117
+	{
118
+		m_offset = 0;
119
+		return 1;
120
+	}
121
+	if ((long)m_offset > (long)m_size)
122
+	{
123
+		m_offset = m_size;
124
+		return 1;
125
+	}
126
+
127
+	return 0;
128
+}
129
+
130
+long WPXMemoryInputStream::tell()
131
+{
132
+	return m_offset;
133
+}
134
+
135
+bool WPXMemoryInputStream::atEOS()
136
+{
137
+	if ((long)m_offset == (long)m_size) 
138
+		return true; 
139
+
140
+	return false;
141
+}
142
+
143
+#else // HAVE_LIBWPD_090
144
+
47 145
 class WPXMemoryInputStream : public WPXInputStream
48 146
 {
49 147
 public:
@@ -138,6 +236,8 @@ bool WPXMemoryInputStream::atEOS()
138 236
 	return false;
139 237
 }
140 238
 
239
+#endif // HAVE_LIBWPD_090
240
+
141 241
 class KWordHandler : public DocumentHandler
142 242
 {
143 243
 public:
@@ -250,7 +350,11 @@ KoFilter::ConversionStatus WPImport::convert( const TQCString& from, const TQCSt
250 350
   // instream now owns buf, no need to delete buf later
251 351
   WPXMemoryInputStream instream = WPXMemoryInputStream( buf, fsize );
252 352
 
353
+#ifdef HAVE_LIBWPD_090
354
+  WPDConfidence confidence = WPDocument::isFileFormatSupported(&instream);
355
+#else // HAVE_LIBWPD_090
253 356
   WPDConfidence confidence = WPDocument::isFileFormatSupported(&instream, false);
357
+#endif // HAVE_LIBWPD_090
254 358
   if( confidence == WPD_CONFIDENCE_NONE )
255 359
   {
256 360
     fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid WordPerfect document.\n");

+ 1
- 1
subdirs View File

@@ -1,6 +1,7 @@
1 1
 lib
2 2
 interfaces
3 3
 autocorrect
4
+chalk
4 5
 doc
5 6
 example
6 7
 karbon
@@ -11,7 +12,6 @@ kivio
11 12
 koshell
12 13
 kounavail
13 14
 kpresenter
14
-chalk
15 15
 kspread
16 16
 kugar
17 17
 mimetypes

Loading…
Cancel
Save