summaryrefslogtreecommitdiff
path: root/recipes/lisa/lisa-0.2.2/configure.patch
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/lisa/lisa-0.2.2/configure.patch
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/lisa/lisa-0.2.2/configure.patch')
-rw-r--r--recipes/lisa/lisa-0.2.2/configure.patch604
1 files changed, 604 insertions, 0 deletions
diff --git a/recipes/lisa/lisa-0.2.2/configure.patch b/recipes/lisa/lisa-0.2.2/configure.patch
new file mode 100644
index 0000000000..3e9d7870f5
--- /dev/null
+++ b/recipes/lisa/lisa-0.2.2/configure.patch
@@ -0,0 +1,604 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- lisa-0.2.2/Makefile.am~configure
++++ lisa-0.2.2/Makefile.am
+@@ -22,7 +22,8 @@
+ @echo "****************************************************"
+ @echo ""
+
+-$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs $(CONF_FILES)
++#$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs $(CONF_FILES)
++$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs
+ @cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in
+ $(top_srcdir)/configure.files:
+ @cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
+--- lisa-0.2.2/Makefile.am.in~configure
++++ lisa-0.2.2/Makefile.am.in
+@@ -22,7 +22,8 @@
+ @echo "****************************************************"
+ @echo ""
+
+-$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs $(CONF_FILES)
++#$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs $(CONF_FILES)
++$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs
+ @cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in
+ $(top_srcdir)/configure.files:
+ @cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
+--- lisa-0.2.2/Makefile.in~configure
++++ lisa-0.2.2/Makefile.in
+@@ -1,7 +1,7 @@
+-# Makefile.in generated by automake 1.7 from Makefile.am.
++# Makefile.in generated by automake 1.7.7 from Makefile.am.
+ # @configure_input@
+
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+ # Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -42,16 +42,13 @@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+-ARTSCCONFIG = @ARTSCCONFIG@
+ AUTOCONF = @AUTOCONF@
+-AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CONF_FILES = @CONF_FILES@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -59,9 +56,6 @@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-DCOPIDL = @DCOPIDL@
+-DCOPIDL2CPP = @DCOPIDL2CPP@
+-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -70,68 +64,23 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GMSGFMT = @GMSGFMT@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-KDECONFIG = @KDECONFIG@
+-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
+-KDE_INCLUDES = @KDE_INCLUDES@
+-KDE_LDFLAGS = @KDE_LDFLAGS@
+-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
+-KDE_MT_LIBS = @KDE_MT_LIBS@
+-KDE_PLUGIN = @KDE_PLUGIN@
+-KDE_RPATH = @KDE_RPATH@
+ KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
+ KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
+ KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
+ KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
+-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
+ LDFLAGS = @LDFLAGS@
+-LIBCOMPAT = @LIBCOMPAT@
+-LIBCRYPT = @LIBCRYPT@
+-LIBDL = @LIBDL@
+-LIBJPEG = @LIBJPEG@
+-LIBPNG = @LIBPNG@
+-LIBPTHREAD = @LIBPTHREAD@
++LIBOBJS = @LIBOBJS@
+ LIBRESOLV = @LIBRESOLV@
+ LIBS = @LIBS@
+-LIBSM = @LIBSM@
+-LIBSOCKET = @LIBSOCKET@
+-LIBTIFF = @LIBTIFF@
+ LIBTOOL = @LIBTOOL@
+-LIBUCB = @LIBUCB@
+-LIBUTIL = @LIBUTIL@
+-LIBXINERAMA = @LIBXINERAMA@
+-LIBZ = @LIBZ@
+-LIB_KAB = @LIB_KAB@
+-LIB_KDECORE = @LIB_KDECORE@
+-LIB_KDEPRINT = @LIB_KDEPRINT@
+-LIB_KDEUI = @LIB_KDEUI@
+-LIB_KFILE = @LIB_KFILE@
+-LIB_KFM = @LIB_KFM@
+-LIB_KHTML = @LIB_KHTML@
+-LIB_KIMGIO = @LIB_KIMGIO@
+-LIB_KIO = @LIB_KIO@
+-LIB_KPARTS = @LIB_KPARTS@
+-LIB_KSPELL = @LIB_KSPELL@
+-LIB_KSYCOCA = @LIB_KSYCOCA@
+-LIB_POLL = @LIB_POLL@
+-LIB_QPE = @LIB_QPE@
+-LIB_QT = @LIB_QT@
+ LIB_SLP = @LIB_SLP@
+-LIB_SMB = @LIB_SMB@
+-LIB_X11 = @LIB_X11@
+-LIB_XEXT = @LIB_XEXT@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MCOPIDL = @MCOPIDL@
+-MEINPROC = @MEINPROC@
+-MOC = @MOC@
+-MSGFMT = @MSGFMT@
+ NOOPT_CFLAGS = @NOOPT_CFLAGS@
+ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
+ NOREPO = @NOREPO@
+@@ -143,40 +92,26 @@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+-QTE_NORTTI = @QTE_NORTTI@
+-QT_INCLUDES = @QT_INCLUDES@
+-QT_LDFLAGS = @QT_LDFLAGS@
+ RANLIB = @RANLIB@
+ REPO = @REPO@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TOPSUBDIRS = @TOPSUBDIRS@
+-UIC = @UIC@
+-UIC_TR = @UIC_TR@
+-USER_INCLUDES = @USER_INCLUDES@
+-USER_LDFLAGS = @USER_LDFLAGS@
+ USE_EXCEPTIONS = @USE_EXCEPTIONS@
+ USE_RTTI = @USE_RTTI@
+-USE_THREADS = @USE_THREADS@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+-XGETTEXT = @XGETTEXT@
+-X_EXTRA_LIBS = @X_EXTRA_LIBS@
+-X_INCLUDES = @X_INCLUDES@
+-X_LDFLAGS = @X_LDFLAGS@
+-X_PRE_LIBS = @X_PRE_LIBS@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
+-all_includes = @all_includes@
+-all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
++am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ bindir = @bindir@
+ build = @build@
+@@ -194,27 +129,6 @@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-kde_appsdir = @kde_appsdir@
+-kde_bindir = @kde_bindir@
+-kde_confdir = @kde_confdir@
+-kde_datadir = @kde_datadir@
+-kde_htmldir = @kde_htmldir@
+-kde_icondir = @kde_icondir@
+-kde_includes = @kde_includes@
+-kde_libraries = @kde_libraries@
+-kde_libs_htmldir = @kde_libs_htmldir@
+-kde_libs_prefix = @kde_libs_prefix@
+-kde_locale = @kde_locale@
+-kde_mimedir = @kde_mimedir@
+-kde_moduledir = @kde_moduledir@
+-kde_qtver = @kde_qtver@
+-kde_servicesdir = @kde_servicesdir@
+-kde_servicetypesdir = @kde_servicetypesdir@
+-kde_sounddir = @kde_sounddir@
+-kde_styledir = @kde_styledir@
+-kde_templatesdir = @kde_templatesdir@
+-kde_wallpaperdir = @kde_wallpaperdir@
+-kde_widgetdir = @kde_widgetdir@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ lisa_SUBDIR_included_FALSE = @lisa_SUBDIR_included_FALSE@
+@@ -224,8 +138,6 @@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+-qt_includes = @qt_includes@
+-qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -234,8 +146,6 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-x_includes = @x_includes@
+-x_libraries = @x_libraries@
+
+ AUTOMAKE_OPTIONS = foreign 1.5
+ COMPILE_AFTER_mimelib = korn kmail
+@@ -257,12 +167,12 @@
+ all-recursive install-data-recursive install-exec-recursive \
+ installdirs-recursive install-recursive uninstall-recursive \
+ check-recursive installcheck-recursive
+-DIST_COMMON = README AUTHORS COPYING INSTALL Makefile.am Makefile.in \
+- acinclude.m4 aclocal.m4 admin/ChangeLog admin/compile \
+- admin/config.guess admin/config.sub admin/depcomp \
+- admin/install-sh admin/ltmain.sh admin/missing \
+- admin/mkinstalldirs admin/ylwrap config.h.bot config.h.in \
+- configure configure.in install-sh
++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
++ COPYING INSTALL Makefile.am acinclude.m4 aclocal.m4 \
++ admin/ChangeLog admin/compile admin/config.guess \
++ admin/config.sub admin/depcomp admin/install-sh admin/ltmain.sh \
++ admin/missing admin/mkinstalldirs admin/ylwrap config.h.bot \
++ config.h.in configure configure.in install-sh
+ DIST_SUBDIRS = $(SUBDIRS)
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -392,9 +302,15 @@
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
++ if (etags --etags-include --version) >/dev/null 2>&1; then \
++ include_option=--etags-include; \
++ else \
++ include_option=--include; \
++ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && \
++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+@@ -448,9 +364,11 @@
+ mkdir $(distdir)
+ $(mkinstalldirs) $(distdir)/admin
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+@@ -504,13 +422,12 @@
+ $(am__remove_distdir)
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
+- mkdir $(distdir)/=build
+- mkdir $(distdir)/=inst
++ mkdir $(distdir)/_build
++ mkdir $(distdir)/_inst
+ chmod a-w $(distdir)
+- dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
++ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+- && $(mkinstalldirs) $$dc_destdir \
+- && cd $(distdir)/=build \
++ && cd $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+@@ -522,7 +439,9 @@
+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+- && ({ $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
++ && ({ \
++ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+@@ -535,7 +454,7 @@
+ @echo "$(distdir).tar.gz is ready for distribution" | \
+ sed 'h;s/./=/g;p;x;p;x'
+ distuninstallcheck:
+- cd $(distuninstallcheck_dir) \
++ @cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+@@ -544,11 +463,11 @@
+ $(distuninstallcheck_listfiles) ; \
+ exit 1; } >&2
+ distcleancheck: distclean
+- if test '$(srcdir)' = . ; then \
++ @if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+- test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
++ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left in build directory after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
+@@ -577,7 +496,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -rm -f Makefile $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+ maintainer-clean-generic:
+@@ -590,6 +509,8 @@
+
+ distclean: distclean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
++
++ -rm -f Makefile
+ distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags
+
+@@ -613,7 +534,9 @@
+
+ maintainer-clean: maintainer-clean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+- -rm -rf autom4te.cache
++ -rm -rf $(top_srcdir)/autom4te.cache
++
++ -rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -668,7 +591,8 @@
+ @echo "****************************************************"
+ @echo ""
+
+-$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs $(CONF_FILES)
++#$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs $(CONF_FILES)
++$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(top_srcdir)/subdirs
+ @cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in
+ $(top_srcdir)/configure.files:
+ @cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
+--- lisa-0.2.2/admin/configure.in.min~configure
++++ lisa-0.2.2/admin/configure.in.min
+@@ -38,7 +38,7 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+
+-KDE_SET_PREFIX
++dnl KDE_SET_PREFIX
+
+ dnl generate the config header
+ AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+@@ -47,11 +47,11 @@
+ AC_CHECK_COMPILERS
+ AC_ENABLE_SHARED(yes)
+ AC_ENABLE_STATIC(no)
+-KDE_PROG_LIBTOOL
++AC_PROG_LIBTOOL
+
+ dnl for NLS support. Call them in this order!
+ dnl WITH_NLS is for the po files
+-AM_KDE_WITH_NLS
++dnl AM_KDE_WITH_NLS
+
+ dnl KDE_USE_QT
+-AC_PATH_KDE
++dnl AC_PATH_KDE
+--- lisa-0.2.2/config.h.in~configure
++++ lisa-0.2.2/config.h.in
+@@ -6,15 +6,6 @@
+ /* Define to 1 if you have the <byteswap.h> header file. */
+ #undef HAVE_BYTESWAP_H
+
+-/* Define if you have the CoreAudio API */
+-#undef HAVE_COREAUDIO
+-
+-/* Define to 1 if you have the <crt_externs.h> header file. */
+-#undef HAVE_CRT_EXTERNS_H
+-
+-/* Defines if your system has the crypt function */
+-#undef HAVE_CRYPT
+-
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ #undef HAVE_DLFCN_H
+
+@@ -48,21 +39,6 @@
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+
+-/* Define if you have libjpeg */
+-#undef HAVE_LIBJPEG
+-
+-/* Define if you have libpng */
+-#undef HAVE_LIBPNG
+-
+-/* Define if you have a working libpthread (will enable threaded code) */
+-#undef HAVE_LIBPTHREAD
+-
+-/* Define if you have libtiff */
+-#undef HAVE_LIBTIFF
+-
+-/* Define if you have libz */
+-#undef HAVE_LIBZ
+-
+ /* Define to 1 if you have the <linux/if_ppp.h> header file. */
+ #undef HAVE_LINUX_IF_PPP_H
+
+@@ -78,25 +54,12 @@
+ /* Define to 1 if you have the <net/if_ppp.h> header file. */
+ #undef HAVE_NET_IF_PPP_H
+
+-/* Define if your system needs _NSGetEnviron to set up the environment */
+-#undef HAVE_NSGETENVIRON
+-
+ /* Define to 1 if you have the <paths.h> header file. */
+ #undef HAVE_PATHS_H
+
+-/* Define to 1 if you have the <pthread/linuxthreads/pthread.h> header file.
+- */
+-#undef HAVE_PTHREAD_LINUXTHREADS_PTHREAD_H
+-
+ /* Define to 1 if you have the <resolv.h> header file. */
+ #undef HAVE_RESOLV_H
+
+-/* Define if you have res_init */
+-#undef HAVE_RES_INIT
+-
+-/* Define if you have the res_init prototype */
+-#undef HAVE_RES_INIT_PROTO
+-
+ /* Define to 1 if you have the <re_comp.h> header file. */
+ #undef HAVE_RE_COMP_H
+
+@@ -175,12 +138,6 @@
+ /* Define to 1 if you have the `vsnprintf' function. */
+ #undef HAVE_VSNPRINTF
+
+-/* Define if you want Xinerama support */
+-#undef HAVE_XINERAMA
+-
+-/* Suffix for lib directories */
+-#undef KDELIBSUFF
+-
+ /* Name of package */
+ #undef PACKAGE
+
+@@ -199,18 +156,6 @@
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+
+-/* The size of a `char', as computed by sizeof. */
+-#undef SIZEOF_CHAR
+-
+-/* The size of a `char *', as computed by sizeof. */
+-#undef SIZEOF_CHAR_P
+-
+-/* The size of a `int', as computed by sizeof. */
+-#undef SIZEOF_INT
+-
+-/* The size of a `long', as computed by sizeof. */
+-#undef SIZEOF_LONG
+-
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+
+@@ -221,27 +166,6 @@
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+ #undef WORDS_BIGENDIAN
+
+-/*
+- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
+- * headers and I'm too lazy to write a configure test as long as only
+- * unixware is related
+- */
+-#ifdef _UNIXWARE
+-#define HAVE_BOOLEAN
+-#endif
+-
+-
+-
+-/*
+- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
+- * that defines bzero.
+- */
+-
+-#if defined(_AIX)
+-#include <strings.h>
+-#endif
+-
+-
+ /* Number of bits in a file offset, on hosts where this is settable. */
+ #undef _FILE_OFFSET_BITS
+
+@@ -264,15 +188,6 @@
+
+
+
+-#if !defined(HAVE_RES_INIT_PROTO)
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-int res_init (void);
+-#endif
+-
+-
+-
+ #if !defined(HAVE_USLEEP_PROTO)
+ #ifdef __cplusplus
+ extern "C"
+@@ -284,41 +199,6 @@
+ /* Define for large files, on AIX-style hosts. */
+ #undef _LARGE_FILES
+
+-
+-/*
+- * On HP-UX, the declaration of vsnprintf() is needed every time !
+- */
+-
+-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
+-#if __STDC__
+-#include <stdarg.h>
+-#include <stdlib.h>
+-#else
+-#include <varargs.h>
+-#endif
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-int snprintf(char *str, size_t n, char const *fmt, ...);
+-#endif
+-
+-
+-
+-#if defined(__SVR4) && !defined(__svr4__)
+-#define __svr4__ 1
+-#endif
+-
+-
+-/* Compatibility define */
+-#undef ksize_t
+-
+-/* Define the real type of socklen_t */
+-#undef socklen_t
+-
+ #ifdef __osf__
+ /* From Tom Leitner <tom@radar.tu-graz.ac.at> */
+ #if __STDC__
+--- lisa-0.2.2/configure.in.in~configure
++++ lisa-0.2.2/configure.in.in
+@@ -1,6 +1,6 @@
+ #MIN_CONFIG
+ dnl Image readers/writers
+-KDE_CHECK_KIMGIO
++dnl KDE_CHECK_KIMGIO
+
+ dnl Checks for header files.
+ AC_CHECK_HEADERS(linux/tcp.h linux/if_ppp.h)
+@@ -74,7 +74,7 @@
+ LIBS=$save_slptest_LIBS
+ AC_SUBST(LIB_SLP)
+
+-KDE_CHECK_THREADING
++dnl KDE_CHECK_THREADING
+
+ dnl For apps that NEED threads
+ if test -z "$LIBPTHREAD" && test -z "$USE_THREADS"; then
+--- lisa-0.2.2/lisa/Makefile.in~configure
++++ lisa-0.2.2/lisa/Makefile.in
+@@ -51,7 +51,6 @@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CONF_FILES = @CONF_FILES@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@