3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
6 --- lisa-0.2.2/Makefile.am~configure
7 +++ lisa-0.2.2/Makefile.am
9 @echo "****************************************************"
12 -$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs $(CONF_FILES)
13 +#$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs $(CONF_FILES)
14 +$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs
15 @cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in
16 $(top_srcdir)/configure.files:
17 @cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
18 --- lisa-0.2.2/Makefile.am.in~configure
19 +++ lisa-0.2.2/Makefile.am.in
21 @echo "****************************************************"
24 -$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs $(CONF_FILES)
25 +#$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs $(CONF_FILES)
26 +$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs
27 @cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in
28 $(top_srcdir)/configure.files:
29 @cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
30 --- lisa-0.2.2/Makefile.in~configure
31 +++ lisa-0.2.2/Makefile.in
33 -# Makefile.in generated by automake 1.7 from Makefile.am.
34 +# Makefile.in generated by automake 1.7.7 from Makefile.am.
37 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
38 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
39 # Free Software Foundation, Inc.
40 # This Makefile.in is free software; the Free Software Foundation
41 # gives unlimited permission to copy and/or distribute it,
43 AMDEP_FALSE = @AMDEP_FALSE@
44 AMDEP_TRUE = @AMDEP_TRUE@
46 -ARTSCCONFIG = @ARTSCCONFIG@
48 -AUTODIRS = @AUTODIRS@
49 AUTOHEADER = @AUTOHEADER@
53 CCDEPMODE = @CCDEPMODE@
55 -CONF_FILES = @CONF_FILES@
60 CXXDEPMODE = @CXXDEPMODE@
62 CYGPATH_W = @CYGPATH_W@
64 -DCOPIDL2CPP = @DCOPIDL2CPP@
65 -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
73 -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
75 INSTALL_DATA = @INSTALL_DATA@
76 INSTALL_PROGRAM = @INSTALL_PROGRAM@
77 INSTALL_SCRIPT = @INSTALL_SCRIPT@
78 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
79 -KDECONFIG = @KDECONFIG@
80 -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
81 -KDE_INCLUDES = @KDE_INCLUDES@
82 -KDE_LDFLAGS = @KDE_LDFLAGS@
83 -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
84 -KDE_MT_LIBS = @KDE_MT_LIBS@
85 -KDE_PLUGIN = @KDE_PLUGIN@
86 -KDE_RPATH = @KDE_RPATH@
87 KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
88 KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
89 KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
90 KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
91 -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
93 -LIBCOMPAT = @LIBCOMPAT@
94 -LIBCRYPT = @LIBCRYPT@
98 -LIBPTHREAD = @LIBPTHREAD@
100 LIBRESOLV = @LIBRESOLV@
103 -LIBSOCKET = @LIBSOCKET@
108 -LIBXINERAMA = @LIBXINERAMA@
111 -LIB_KDECORE = @LIB_KDECORE@
112 -LIB_KDEPRINT = @LIB_KDEPRINT@
113 -LIB_KDEUI = @LIB_KDEUI@
114 -LIB_KFILE = @LIB_KFILE@
116 -LIB_KHTML = @LIB_KHTML@
117 -LIB_KIMGIO = @LIB_KIMGIO@
119 -LIB_KPARTS = @LIB_KPARTS@
120 -LIB_KSPELL = @LIB_KSPELL@
121 -LIB_KSYCOCA = @LIB_KSYCOCA@
122 -LIB_POLL = @LIB_POLL@
128 -LIB_XEXT = @LIB_XEXT@
130 LTLIBOBJS = @LTLIBOBJS@
131 MAKEINFO = @MAKEINFO@
133 -MEINPROC = @MEINPROC@
136 NOOPT_CFLAGS = @NOOPT_CFLAGS@
137 NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
140 PACKAGE_TARNAME = @PACKAGE_TARNAME@
141 PACKAGE_VERSION = @PACKAGE_VERSION@
142 PATH_SEPARATOR = @PATH_SEPARATOR@
143 -QTE_NORTTI = @QTE_NORTTI@
144 -QT_INCLUDES = @QT_INCLUDES@
145 -QT_LDFLAGS = @QT_LDFLAGS@
148 SET_MAKE = @SET_MAKE@
151 TOPSUBDIRS = @TOPSUBDIRS@
154 -USER_INCLUDES = @USER_INCLUDES@
155 -USER_LDFLAGS = @USER_LDFLAGS@
156 USE_EXCEPTIONS = @USE_EXCEPTIONS@
157 USE_RTTI = @USE_RTTI@
158 -USE_THREADS = @USE_THREADS@
160 WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
161 -XGETTEXT = @XGETTEXT@
162 -X_EXTRA_LIBS = @X_EXTRA_LIBS@
163 -X_INCLUDES = @X_INCLUDES@
164 -X_LDFLAGS = @X_LDFLAGS@
165 -X_PRE_LIBS = @X_PRE_LIBS@
166 ac_ct_CC = @ac_ct_CC@
167 ac_ct_CXX = @ac_ct_CXX@
168 ac_ct_RANLIB = @ac_ct_RANLIB@
169 ac_ct_STRIP = @ac_ct_STRIP@
170 -all_includes = @all_includes@
171 -all_libraries = @all_libraries@
172 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
173 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
174 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
175 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
176 am__include = @am__include@
177 +am__leading_dot = @am__leading_dot@
178 am__quote = @am__quote@
182 includedir = @includedir@
184 install_sh = @install_sh@
185 -kde_appsdir = @kde_appsdir@
186 -kde_bindir = @kde_bindir@
187 -kde_confdir = @kde_confdir@
188 -kde_datadir = @kde_datadir@
189 -kde_htmldir = @kde_htmldir@
190 -kde_icondir = @kde_icondir@
191 -kde_includes = @kde_includes@
192 -kde_libraries = @kde_libraries@
193 -kde_libs_htmldir = @kde_libs_htmldir@
194 -kde_libs_prefix = @kde_libs_prefix@
195 -kde_locale = @kde_locale@
196 -kde_mimedir = @kde_mimedir@
197 -kde_moduledir = @kde_moduledir@
198 -kde_qtver = @kde_qtver@
199 -kde_servicesdir = @kde_servicesdir@
200 -kde_servicetypesdir = @kde_servicetypesdir@
201 -kde_sounddir = @kde_sounddir@
202 -kde_styledir = @kde_styledir@
203 -kde_templatesdir = @kde_templatesdir@
204 -kde_wallpaperdir = @kde_wallpaperdir@
205 -kde_widgetdir = @kde_widgetdir@
207 libexecdir = @libexecdir@
208 lisa_SUBDIR_included_FALSE = @lisa_SUBDIR_included_FALSE@
210 oldincludedir = @oldincludedir@
212 program_transform_name = @program_transform_name@
213 -qt_includes = @qt_includes@
214 -qt_libraries = @qt_libraries@
216 sharedstatedir = @sharedstatedir@
217 sysconfdir = @sysconfdir@
219 target_cpu = @target_cpu@
220 target_os = @target_os@
221 target_vendor = @target_vendor@
222 -x_includes = @x_includes@
223 -x_libraries = @x_libraries@
225 AUTOMAKE_OPTIONS = foreign 1.5
226 COMPILE_AFTER_mimelib = korn kmail
227 @@ -257,12 +167,12 @@
228 all-recursive install-data-recursive install-exec-recursive \
229 installdirs-recursive install-recursive uninstall-recursive \
230 check-recursive installcheck-recursive
231 -DIST_COMMON = README AUTHORS COPYING INSTALL Makefile.am Makefile.in \
232 - acinclude.m4 aclocal.m4 admin/ChangeLog admin/compile \
233 - admin/config.guess admin/config.sub admin/depcomp \
234 - admin/install-sh admin/ltmain.sh admin/missing \
235 - admin/mkinstalldirs admin/ylwrap config.h.bot config.h.in \
236 - configure configure.in install-sh
237 +DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
238 + COPYING INSTALL Makefile.am acinclude.m4 aclocal.m4 \
239 + admin/ChangeLog admin/compile admin/config.guess \
240 + admin/config.sub admin/depcomp admin/install-sh admin/ltmain.sh \
241 + admin/missing admin/mkinstalldirs admin/ylwrap config.h.bot \
242 + config.h.in configure configure.in install-sh
243 DIST_SUBDIRS = $(SUBDIRS)
245 $(MAKE) $(AM_MAKEFLAGS) all-recursive
247 $(TAGS_FILES) $(LISP)
250 + if (etags --etags-include --version) >/dev/null 2>&1; then \
251 + include_option=--etags-include; \
253 + include_option=--include; \
255 list='$(SUBDIRS)'; for subdir in $$list; do \
256 if test "$$subdir" = .; then :; else \
257 - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
258 + test -f $$subdir/TAGS && \
259 + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
262 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
265 $(mkinstalldirs) $(distdir)/admin
266 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
267 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
268 list='$(DISTFILES)'; for file in $$list; do \
270 $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
271 + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
273 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
274 dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
275 @@ -504,13 +422,12 @@
276 $(am__remove_distdir)
277 GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
278 chmod -R a-w $(distdir); chmod a+w $(distdir)
279 - mkdir $(distdir)/=build
280 - mkdir $(distdir)/=inst
281 + mkdir $(distdir)/_build
282 + mkdir $(distdir)/_inst
284 - dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
285 + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
286 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
287 - && $(mkinstalldirs) $$dc_destdir \
288 - && cd $(distdir)/=build \
289 + && cd $(distdir)/_build \
290 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
291 $(DISTCHECK_CONFIGURE_FLAGS) \
292 && $(MAKE) $(AM_MAKEFLAGS) \
294 && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
296 && chmod -R a-w "$$dc_install_base" \
297 - && ({ $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
299 + (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
300 + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
301 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
302 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
303 distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
305 @echo "$(distdir).tar.gz is ready for distribution" | \
306 sed 'h;s/./=/g;p;x;p;x'
308 - cd $(distuninstallcheck_dir) \
309 + @cd $(distuninstallcheck_dir) \
310 && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
311 || { echo "ERROR: files left after uninstall:" ; \
312 if test -n "$(DESTDIR)"; then \
313 @@ -544,11 +463,11 @@
314 $(distuninstallcheck_listfiles) ; \
316 distcleancheck: distclean
317 - if test '$(srcdir)' = . ; then \
318 + @if test '$(srcdir)' = . ; then \
319 echo "ERROR: distcleancheck can only run from a VPATH build" ; \
322 - test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
323 + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
324 || { echo "ERROR: files left in build directory after distclean:" ; \
325 $(distcleancheck_listfiles) ; \
331 - -rm -f Makefile $(CONFIG_CLEAN_FILES)
332 + -rm -f $(CONFIG_CLEAN_FILES)
333 -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
335 maintainer-clean-generic:
338 distclean: distclean-recursive
339 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
342 distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
347 maintainer-clean: maintainer-clean-recursive
348 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
349 - -rm -rf autom4te.cache
350 + -rm -rf $(top_srcdir)/autom4te.cache
353 maintainer-clean-am: distclean-am maintainer-clean-generic
355 mostlyclean: mostlyclean-recursive
357 @echo "****************************************************"
360 -$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs $(CONF_FILES)
361 +#$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs $(CONF_FILES)
362 +$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs
363 @cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in
364 $(top_srcdir)/configure.files:
365 @cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
366 --- lisa-0.2.2/admin/configure.in.min~configure
367 +++ lisa-0.2.2/admin/configure.in.min
369 dnl Automake doc recommends to do this only here. (Janos)
370 AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
375 dnl generate the config header
376 AM_CONFIG_HEADER(config.h) dnl at the distribution this done
379 AC_ENABLE_SHARED(yes)
384 dnl for NLS support. Call them in this order!
385 dnl WITH_NLS is for the po files
392 --- lisa-0.2.2/config.h.in~configure
393 +++ lisa-0.2.2/config.h.in
395 /* Define to 1 if you have the <byteswap.h> header file. */
396 #undef HAVE_BYTESWAP_H
398 -/* Define if you have the CoreAudio API */
399 -#undef HAVE_COREAUDIO
401 -/* Define to 1 if you have the <crt_externs.h> header file. */
402 -#undef HAVE_CRT_EXTERNS_H
404 -/* Defines if your system has the crypt function */
407 /* Define to 1 if you have the <dlfcn.h> header file. */
411 /* Define to 1 if you have the <inttypes.h> header file. */
412 #undef HAVE_INTTYPES_H
414 -/* Define if you have libjpeg */
417 -/* Define if you have libpng */
420 -/* Define if you have a working libpthread (will enable threaded code) */
421 -#undef HAVE_LIBPTHREAD
423 -/* Define if you have libtiff */
426 -/* Define if you have libz */
429 /* Define to 1 if you have the <linux/if_ppp.h> header file. */
430 #undef HAVE_LINUX_IF_PPP_H
433 /* Define to 1 if you have the <net/if_ppp.h> header file. */
434 #undef HAVE_NET_IF_PPP_H
436 -/* Define if your system needs _NSGetEnviron to set up the environment */
437 -#undef HAVE_NSGETENVIRON
439 /* Define to 1 if you have the <paths.h> header file. */
442 -/* Define to 1 if you have the <pthread/linuxthreads/pthread.h> header file.
444 -#undef HAVE_PTHREAD_LINUXTHREADS_PTHREAD_H
446 /* Define to 1 if you have the <resolv.h> header file. */
449 -/* Define if you have res_init */
450 -#undef HAVE_RES_INIT
452 -/* Define if you have the res_init prototype */
453 -#undef HAVE_RES_INIT_PROTO
455 /* Define to 1 if you have the <re_comp.h> header file. */
456 #undef HAVE_RE_COMP_H
459 /* Define to 1 if you have the `vsnprintf' function. */
460 #undef HAVE_VSNPRINTF
462 -/* Define if you want Xinerama support */
463 -#undef HAVE_XINERAMA
465 -/* Suffix for lib directories */
468 /* Name of package */
472 /* Define to the version of this package. */
473 #undef PACKAGE_VERSION
475 -/* The size of a `char', as computed by sizeof. */
478 -/* The size of a `char *', as computed by sizeof. */
479 -#undef SIZEOF_CHAR_P
481 -/* The size of a `int', as computed by sizeof. */
484 -/* The size of a `long', as computed by sizeof. */
487 /* Define to 1 if you have the ANSI C header files. */
491 first (like Motorola and SPARC, unlike Intel and VAX). */
492 #undef WORDS_BIGENDIAN
495 - * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
496 - * headers and I'm too lazy to write a configure test as long as only
497 - * unixware is related
500 -#define HAVE_BOOLEAN
506 - * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
507 - * that defines bzero.
511 -#include <strings.h>
515 /* Number of bits in a file offset, on hosts where this is settable. */
516 #undef _FILE_OFFSET_BITS
522 -#if !defined(HAVE_RES_INIT_PROTO)
526 -int res_init (void);
531 #if !defined(HAVE_USLEEP_PROTO)
535 /* Define for large files, on AIX-style hosts. */
540 - * On HP-UX, the declaration of vsnprintf() is needed every time !
543 -#if !defined(HAVE_VSNPRINTF) || defined(hpux)
548 -#include <varargs.h>
553 -int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
557 -int snprintf(char *str, size_t n, char const *fmt, ...);
562 -#if defined(__SVR4) && !defined(__svr4__)
567 -/* Compatibility define */
570 -/* Define the real type of socklen_t */
574 /* From Tom Leitner <tom@radar.tu-graz.ac.at> */
576 --- lisa-0.2.2/configure.in.in~configure
577 +++ lisa-0.2.2/configure.in.in
580 dnl Image readers/writers
582 +dnl KDE_CHECK_KIMGIO
584 dnl Checks for header files.
585 AC_CHECK_HEADERS(linux/tcp.h linux/if_ppp.h)
587 LIBS=$save_slptest_LIBS
591 +dnl KDE_CHECK_THREADING
593 dnl For apps that NEED threads
594 if test -z "$LIBPTHREAD" && test -z "$USE_THREADS"; then
595 --- lisa-0.2.2/lisa/Makefile.in~configure
596 +++ lisa-0.2.2/lisa/Makefile.in
599 CCDEPMODE = @CCDEPMODE@
601 -CONF_FILES = @CONF_FILES@
603 CPPFLAGS = @CPPFLAGS@