Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 24207 Details for
Bug 38184
Celestia is at version 1.3.1
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
celestia-1.3.1-kde.patch
celestia-1.3.1-kde.patch (text/plain), 798.16 KB, created by
Bret Towe
on 2004-01-21 15:54:31 UTC
(
hide
)
Description:
celestia-1.3.1-kde.patch
Filename:
MIME Type:
Creator:
Bret Towe
Created:
2004-01-21 15:54:31 UTC
Size:
798.16 KB
patch
obsolete
>diff -urN celestia-1.3.1-old/Makefile.in celestia-1.3.1/Makefile.in >--- celestia-1.3.1-old/Makefile.in 2003-12-25 00:21:20.000000000 -0800 >+++ celestia-1.3.1/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = . > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ > pkgdatadir = @datadir@/@PACKAGE@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > dosstuff = celestia.mak $(wildcard *.bat) >@@ -290,10 +290,11 @@ > DATA = $(noinst_DATA) $(pkgdata_DATA) > > >-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ >- uninstall-info-recursive all-recursive install-data-recursive \ >- install-exec-recursive installdirs-recursive install-recursive \ >- uninstall-recursive check-recursive installcheck-recursive >+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ >+ ps-recursive install-info-recursive uninstall-info-recursive \ >+ all-recursive install-data-recursive install-exec-recursive \ >+ installdirs-recursive install-recursive uninstall-recursive \ >+ check-recursive installcheck-recursive > DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ > Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 \ > admin/ChangeLog admin/compile admin/config.guess \ >@@ -428,10 +429,17 @@ > list='$(SUBDIRS)'; for subdir in $$list; do \ > test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ > done >+ctags-recursive: >+ list='$(SUBDIRS)'; for subdir in $$list; do \ >+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ >+ done > > ETAGS = etags > ETAGSFLAGS = > >+CTAGS = ctags >+CTAGSFLAGS = >+ > tags: TAGS > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) >@@ -447,9 +455,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)'; \ >@@ -462,16 +476,31 @@ > || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > $$tags $$unique > >+ctags: CTAGS >+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ >+ $(TAGS_FILES) $(LISP) >+ tags=; \ >+ here=`pwd`; \ >+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ >+ unique=`for i in $$list; do \ >+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ >+ done | \ >+ $(AWK) ' { files[$$0] = 1; } \ >+ END { for (i in files) print i; }'`; \ >+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ >+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ >+ $$tags $$unique >+ > GTAGS: > here=`$(am__cd) $(top_builddir) && pwd` \ > && cd $(top_srcdir) \ > && gtags -i $(GTAGS_ARGS) $$here > > distclean-tags: >- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH >+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=guide.cel celestia.cfg makerelease.bat stamp-h.in devguide.txt subdirs makedebug.bat celestia.iss demo.cel TRANSLATORS Makefile.cvs celestia.mak coding-standards.html controls.txt start.cel >+KDE_DIST=makedebug.bat coding-standards.html makerelease.bat TRANSLATORS celestia.cfg devguide.txt guide.cel Makefile.cvs celestia.mak start.cel demo.cel controls.txt celestia.iss > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -485,13 +514,20 @@ > && rm -fr $(distdir); }; } > > GZIP_ENV = --best >+distuninstallcheck_listfiles = find . -type f -print > distcleancheck_listfiles = find . -type f -print > > distdir: $(DISTFILES) > $(am__remove_distdir) > mkdir $(distdir) > $(mkinstalldirs) $(distdir)/admin >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -525,7 +561,7 @@ > fi; \ > done > $(MAKE) $(AM_MAKEFLAGS) \ >- top_distdir="${top_distdir}" distdir="$(distdir)" \ >+ top_distdir="$(top_distdir)" distdir="$(distdir)" \ > dist-hook > -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ > ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ >@@ -547,12 +583,13 @@ > $(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` \ >- && cd $(distdir)/=build \ >- && ../configure --srcdir=.. --prefix=$$dc_install_base \ >+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ >+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ >+ && cd $(distdir)/_build \ >+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ > $(DISTCHECK_CONFIGURE_FLAGS) \ > && $(MAKE) $(AM_MAKEFLAGS) \ > && $(MAKE) $(AM_MAKEFLAGS) dvi \ >@@ -560,23 +597,39 @@ > && $(MAKE) $(AM_MAKEFLAGS) install \ > && $(MAKE) $(AM_MAKEFLAGS) installcheck \ > && $(MAKE) $(AM_MAKEFLAGS) uninstall \ >- && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ >- || { echo "ERROR: files left after uninstall:" ; \ >- find $$dc_install_base -type f -print ; \ >- exit 1; } >&2 ) \ >+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ >+ distuninstallcheck \ >+ && chmod -R a-w "$$dc_install_base" \ >+ && ({ \ >+ (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; \ >+ } || { rm -rf "$$dc_destdir"; exit 1; }) \ >+ && rm -rf "$$dc_destdir" \ > && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ > && rm -f $(distdir).tar.gz \ > && $(MAKE) $(AM_MAKEFLAGS) distcleancheck > $(am__remove_distdir) > @echo "$(distdir).tar.gz is ready for distribution" | \ > sed 'h;s/./=/g;p;x;p;x' >+distuninstallcheck: >+ @cd $(distuninstallcheck_dir) \ >+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ >+ || { echo "ERROR: files left after uninstall:" ; \ >+ if test -n "$(DESTDIR)"; then \ >+ echo " (check DESTDIR support)"; \ >+ fi ; \ >+ $(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 \ >- || { echo "ERROR: files left after distclean:" ; \ >+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ >+ || { echo "ERROR: files left in build directory after distclean:" ; \ > $(distcleancheck_listfiles) ; \ > exit 1; } >&2 > check-am: all-am >@@ -642,22 +695,31 @@ > > maintainer-clean: maintainer-clean-recursive > -rm -f $(am__CONFIG_DISTCLEAN_FILES) >- -rm -rf autom4te.cache >+ -rm -rf $(top_srcdir)/autom4te.cache > maintainer-clean-am: distclean-am maintainer-clean-generic > > mostlyclean: mostlyclean-recursive > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-recursive >+ >+pdf-am: >+ >+ps: ps-recursive >+ >+ps-am: >+ > uninstall-am: uninstall-info-am uninstall-pkgdataDATA > > uninstall-info: uninstall-info-recursive > >-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ >- clean-generic clean-libtool clean-recursive dist dist-all \ >- dist-gzip distcheck distclean distclean-generic distclean-hdr \ >- distclean-libtool distclean-recursive distclean-tags \ >- distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ >+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ >+ clean-generic clean-libtool clean-recursive ctags \ >+ ctags-recursive dist dist-all dist-gzip distcheck distclean \ >+ distclean-generic distclean-hdr distclean-libtool \ >+ distclean-recursive distclean-tags distcleancheck distdir \ >+ distuninstallcheck dvi dvi-am dvi-recursive info info-am \ > info-recursive install install-am install-data install-data-am \ > install-data-recursive install-exec install-exec-am \ > install-exec-recursive install-info install-info-am \ >@@ -666,7 +728,8 @@ > installdirs installdirs-am installdirs-recursive \ > maintainer-clean maintainer-clean-generic \ > maintainer-clean-recursive mostlyclean mostlyclean-generic \ >- mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ >+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ >+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ > uninstall uninstall-am uninstall-info-am \ > uninstall-info-recursive uninstall-pkgdataDATA \ > uninstall-recursive >diff -urN celestia-1.3.1-old/aclocal.m4 celestia-1.3.1/aclocal.m4 >--- celestia-1.3.1-old/aclocal.m4 2003-12-25 00:12:44.000000000 -0800 >+++ celestia-1.3.1/aclocal.m4 2003-12-25 11:35:16.000000000 -0800 >@@ -1,6 +1,6 @@ >-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- >+# generated automatically by aclocal 1.7.6 -*- Autoconf -*- > >-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 >+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 > # Free Software Foundation, Inc. > # This file is free software; the Free Software Foundation > # gives unlimited permission to copy and/or distribute it, >@@ -10773,7 +10773,7 @@ > # This macro actually does too much some checks are only needed if > # your package does certain things. But this isn't really a big deal. > >-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 >+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 > # Free Software Foundation, Inc. > > # This program is free software; you can redistribute it and/or modify >@@ -10791,16 +10791,9 @@ > # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA > # 02111-1307, USA. > >-# serial 8 >+# serial 10 > >-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be >-# written in clear, in which case automake, when reading aclocal.m4, >-# will think it sees a *use*, and therefore will trigger all it's >-# C support machinery. Also note that it means that autoscan, seeing >-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... >- >- >-AC_PREREQ([2.52]) >+AC_PREREQ([2.54]) > > # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow > # the ones we care about. >@@ -10826,6 +10819,16 @@ > AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) > fi > >+# test whether we have cygpath >+if test -z "$CYGPATH_W"; then >+ if (cygpath --version) >/dev/null 2>/dev/null; then >+ CYGPATH_W='cygpath -w' >+ else >+ CYGPATH_W=echo >+ fi >+fi >+AC_SUBST([CYGPATH_W]) >+ > # Define the identity of the package. > dnl Distinguish between old-style and new-style calls. > m4_ifval([$2], >@@ -10833,8 +10836,8 @@ > AC_SUBST([PACKAGE], [$1])dnl > AC_SUBST([VERSION], [$2])], > [_AM_SET_OPTIONS([$1])dnl >- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl >- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl >+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl >+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl > > _AM_IF_OPTION([no-define],, > [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) >@@ -10855,19 +10858,41 @@ > # some platforms. > AC_REQUIRE([AC_PROG_AWK])dnl > AC_REQUIRE([AC_PROG_MAKE_SET])dnl >+AC_REQUIRE([AM_SET_LEADING_DOT])dnl > > _AM_IF_OPTION([no-dependencies],, >-[AC_PROVIDE_IFELSE([AC_PROG_][CC], >+[AC_PROVIDE_IFELSE([AC_PROG_CC], > [_AM_DEPENDENCIES(CC)], >- [define([AC_PROG_][CC], >- defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl >-AC_PROVIDE_IFELSE([AC_PROG_][CXX], >+ [define([AC_PROG_CC], >+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl >+AC_PROVIDE_IFELSE([AC_PROG_CXX], > [_AM_DEPENDENCIES(CXX)], >- [define([AC_PROG_][CXX], >- defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl >+ [define([AC_PROG_CXX], >+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl > ]) > ]) > >+ >+# When config.status generates a header, we must update the stamp-h file. >+# This file resides in the same directory as the config header >+# that is generated. The stamp files are numbered to have different names. >+ >+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the >+# loop where config.status creates the headers, so we can generate >+# our stamp files there. >+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], >+[# Compute $1's index in $config_headers. >+_am_stamp_count=1 >+for _am_header in $config_headers :; do >+ case $_am_header in >+ $1 | $1:* ) >+ break ;; >+ * ) >+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; >+ esac >+done >+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) >+ > # Copyright 2002 Free Software Foundation, Inc. > > # This program is free software; you can redistribute it and/or modify >@@ -10888,14 +10913,14 @@ > # ---------------------------- > # Automake X.Y traces this macro to ensure aclocal.m4 has been > # generated from the m4 files accompanying Automake X.Y. >-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) >+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) > > # AM_SET_CURRENT_AUTOMAKE_VERSION > # ------------------------------- > # Call AM_AUTOMAKE_VERSION so it can be traced. > # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. > AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], >- [AM_AUTOMAKE_VERSION([1.6.3])]) >+ [AM_AUTOMAKE_VERSION([1.7.6])]) > > # Helper functions for option handling. -*- Autoconf -*- > >@@ -11181,9 +11206,42 @@ > INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" > AC_SUBST([INSTALL_STRIP_PROGRAM])]) > >-# serial 4 -*- Autoconf -*- >+# -*- Autoconf -*- >+# Copyright (C) 2003 Free Software Foundation, Inc. >+ >+# This program is free software; you can redistribute it and/or modify >+# it under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 2, or (at your option) >+# any later version. > >-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc. >+# This program is distributed in the hope that it will be useful, >+# but WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. >+ >+# You should have received a copy of the GNU General Public License >+# along with this program; if not, write to the Free Software >+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA >+# 02111-1307, USA. >+ >+# serial 1 >+ >+# Check whether the underlying file-system supports filenames >+# with a leading dot. For instance MS-DOS doesn't. >+AC_DEFUN([AM_SET_LEADING_DOT], >+[rm -rf .tst 2>/dev/null >+mkdir .tst 2>/dev/null >+if test -d .tst; then >+ am__leading_dot=. >+else >+ am__leading_dot=_ >+fi >+rmdir .tst 2>/dev/null >+AC_SUBST([am__leading_dot])]) >+ >+# serial 5 -*- Autoconf -*- >+ >+# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. > > # This program is free software; you can redistribute it and/or modify > # it under the terms of the GNU General Public License as published by >@@ -11244,18 +11302,32 @@ > # using a relative directory. > cp "$am_depcomp" conftest.dir > cd conftest.dir >+ # We will build objects and dependencies in a subdirectory because >+ # it helps to detect inapplicable dependency modes. For instance >+ # both Tru64's cc and ICC support -MD to output dependencies as a >+ # side effect of compilation, but ICC will put the dependencies in >+ # the current directory while Tru64 will put them in the object >+ # directory. >+ mkdir sub > > am_cv_$1_dependencies_compiler_type=none > if test "$am_compiler_list" = ""; then > am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` > fi > for depmode in $am_compiler_list; do >+ # Setup a source with many dependencies, because some compilers >+ # like to wrap large dependency lists on column 80 (with \), and >+ # we should not choose a depcomp mode which is confused by this. >+ # > # We need to recreate these files for each test, as the compiler may > # overwrite some of them when testing with obscure command lines. > # This happens at least with the AIX C compiler. >- echo '#include "conftest.h"' > conftest.c >- echo 'int i;' > conftest.h >- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf >+ : > sub/conftest.c >+ for i in 1 2 3 4 5 6; do >+ echo '#include "conftst'$i'.h"' >> sub/conftest.c >+ : > sub/conftst$i.h >+ done >+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf > > case $depmode in > nosideeffect) >@@ -11273,13 +11345,20 @@ > # mode. It turns out that the SunPro C++ compiler does not properly > # handle `-M -o', and we need to detect this. > if depmode=$depmode \ >- source=conftest.c object=conftest.o \ >- depfile=conftest.Po tmpdepfile=conftest.TPo \ >- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && >- grep conftest.h conftest.Po > /dev/null 2>&1 && >+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ >+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ >+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >+ >/dev/null 2>conftest.err && >+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && >+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && > ${MAKE-make} -s -f confmf > /dev/null 2>&1; then >- am_cv_$1_dependencies_compiler_type=$depmode >- break >+ # icc doesn't choke on unknown options, it will just issue warnings >+ # (even with -Werror). So we grep stderr for any message >+ # that says an option was ignored. >+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else >+ am_cv_$1_dependencies_compiler_type=$depmode >+ break >+ fi > fi > done > >@@ -11290,6 +11369,9 @@ > fi > ]) > AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) >+AM_CONDITIONAL([am__fastdep$1], [ >+ test "x$enable_dependency_tracking" != xno \ >+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) > ]) > > >@@ -11298,16 +11380,8 @@ > # Choose a directory name for dependency files. > # This macro is AC_REQUIREd in _AM_DEPENDENCIES > AC_DEFUN([AM_SET_DEPDIR], >-[rm -f .deps 2>/dev/null >-mkdir .deps 2>/dev/null >-if test -d .deps; then >- DEPDIR=.deps >-else >- # MS-DOS does not allow filenames that begin with a dot. >- DEPDIR=_deps >-fi >-rmdir .deps 2>/dev/null >-AC_SUBST([DEPDIR]) >+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl >+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl > ]) > > >@@ -11409,7 +11483,9 @@ > [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) > ]) > >-# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- >+# Check to see how 'make' treats includes. -*- Autoconf -*- >+ >+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. > > # This program is free software; you can redistribute it and/or modify > # it under the terms of the GNU General Public License as published by >@@ -11434,8 +11510,9 @@ > AC_DEFUN([AM_MAKE_INCLUDE], > [am_make=${MAKE-make} > cat > confinc << 'END' >-doit: >+am__doit: > @echo done >+.PHONY: am__doit > END > # If we don't find an include directive, just comment out the code. > AC_MSG_CHECKING([for style of include used by $am_make]) >@@ -11449,7 +11526,7 @@ > # In particular we don't look at `^make:' because GNU make might > # be invoked under some other name (usually "gmake"), in which > # case it prints its new name instead of `make'. >-if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then >+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then > am__include=include > am__quote= > _am_result=GNU >@@ -11463,9 +11540,9 @@ > _am_result=BSD > fi > fi >-AC_SUBST(am__include) >-AC_SUBST(am__quote) >-AC_MSG_RESULT($_am_result) >+AC_SUBST([am__include]) >+AC_SUBST([am__quote]) >+AC_MSG_RESULT([$_am_result]) > rm -f confinc confmf > ]) > >@@ -11509,7 +11586,7 @@ > fi > AC_CONFIG_COMMANDS_PRE( > [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then >- AC_MSG_ERROR([conditional \"$1\" was never defined. >+ AC_MSG_ERROR([conditional "$1" was never defined. > Usually this means the macro was only invoked conditionally.]) > fi])]) > >@@ -11586,60 +11663,8 @@ > > # serial 6 > >-# When config.status generates a header, we must update the stamp-h file. >-# This file resides in the same directory as the config header >-# that is generated. We must strip everything past the first ":", >-# and everything past the last "/". >- >-# _AM_DIRNAME(PATH) >-# ----------------- >-# Like AS_DIRNAME, only do it during macro expansion >-AC_DEFUN([_AM_DIRNAME], >- [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, >- m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, >- m4_if(regexp([$1], [^/.*]), -1, >- [.], >- patsubst([$1], [^\(/\).*], [\1])), >- patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), >- patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl >-])# _AM_DIRNAME >- >- >-# The stamp files are numbered to have different names. >-# We could number them on a directory basis, but that's additional >-# complications, let's have a unique counter. >-m4_define([_AM_STAMP_Count], [0]) >- >- >-# _AM_STAMP(HEADER) >-# ----------------- >-# The name of the stamp file for HEADER. >-AC_DEFUN([_AM_STAMP], >-[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl >-AS_ESCAPE(_AM_DIRNAME(patsubst([$1], >- [:.*])))/stamp-h[]_AM_STAMP_Count]) >- >- >-# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS) >-# ------------------------------------------------------------ >-# We used to try to get a real timestamp in stamp-h. But the fear is that >-# that will cause unnecessary cvs conflicts. >-AC_DEFUN([_AM_CONFIG_HEADER], >-[# Add the stamp file to the list of files AC keeps track of, >-# along with our hook. >-AC_CONFIG_HEADERS([$1], >- [# update the timestamp >-echo 'timestamp for $1' >"_AM_STAMP([$1])" >-$2], >- [$3]) >-])# _AM_CONFIG_HEADER >- >- >-# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) >-# -------------------------------------------------------------- >-AC_DEFUN([AM_CONFIG_HEADER], >-[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) >-])# AM_CONFIG_HEADER >+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. >+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) > > # Configure paths for GTK+ > # Owen Taylor 97-11-3 >diff -urN celestia-1.3.1-old/admin/CVS/Root celestia-1.3.1/admin/CVS/Root >--- celestia-1.3.1-old/admin/CVS/Root 2003-08-20 13:07:07.000000000 -0700 >+++ celestia-1.3.1/admin/CVS/Root 2003-12-23 14:36:53.000000000 -0800 >@@ -1 +1 @@ >-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/celestia >+:ext:christey@cvs.sourceforge.net:/cvsroot/celestia >diff -urN celestia-1.3.1-old/admin/cvs.sh celestia-1.3.1/admin/cvs.sh >--- celestia-1.3.1-old/admin/cvs.sh 2003-10-28 13:07:32.000000000 -0800 >+++ celestia-1.3.1/admin/cvs.sh 2003-04-14 12:15:32.000000000 -0700 >@@ -109,7 +109,7 @@ > fi > > echo "*** Creating aclocal.m4" >-$ACLOCAL -I macros || exit 1 >+$ACLOCAL || exit 1 > echo "*** Creating configure" > call_and_fix_autoconf > >diff -urN celestia-1.3.1-old/configure celestia-1.3.1/configure >--- celestia-1.3.1-old/configure 2003-12-25 00:14:54.000000000 -0800 >+++ celestia-1.3.1/configure 2003-12-25 11:35:22.000000000 -0800 >@@ -1,168 +1,11 @@ > #! /bin/sh > # Guess values for system-dependent variables and create Makefiles. >-# Generated by GNU Autoconf 2.53. >+# Generated by GNU Autoconf 2.57. > # > # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 > # Free Software Foundation, Inc. > # This configure script is free software; the Free Software Foundation > # gives unlimited permission to copy, distribute and modify it. >- >- >-# Check that we are running under the correct shell. >-SHELL=${CONFIG_SHELL-/bin/sh} >- >-case X$ECHO in >-X*--fallback-echo) >- # Remove one level of quotation (which was required for Make). >- ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` >- ;; >-esac >- >-echo=${ECHO-echo} >-if test "X$1" = X--no-reexec; then >- # Discard the --no-reexec flag, and continue. >- shift >-elif test "X$1" = X--fallback-echo; then >- # Avoid inline document here, it may be left over >- : >-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then >- # Yippee, $echo works! >- : >-else >- # Restart under the correct shell. >- exec $SHELL "$0" --no-reexec ${1+"$@"} >-fi >- >-if test "X$1" = X--fallback-echo; then >- # used as fallback echo >- shift >- cat <<EOF >-$* >-EOF >- exit 0 >-fi >- >-# The HP-UX ksh and POSIX shell print the target directory to stdout >-# if CDPATH is set. >-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi >- >-if test -z "$ECHO"; then >-if test "X${echo_test_string+set}" != Xset; then >-# find a string as large as possible, as long as the shell can cope with it >- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do >- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... >- if (echo_test_string="`eval $cmd`") 2>/dev/null && >- echo_test_string="`eval $cmd`" && >- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null >- then >- break >- fi >- done >-fi >- >-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && >- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && >- test "X$echo_testing_string" = "X$echo_test_string"; then >- : >-else >- # The Solaris, AIX, and Digital Unix default echo programs unquote >- # backslashes. This makes it impossible to quote backslashes using >- # echo "$something" | sed 's/\\/\\\\/g' >- # >- # So, first we look for a working echo in the user's PATH. >- >- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR >- for dir in $PATH /usr/ucb; do >- IFS="$lt_save_ifs" >- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && >- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && >- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && >- test "X$echo_testing_string" = "X$echo_test_string"; then >- echo="$dir/echo" >- break >- fi >- done >- IFS="$lt_save_ifs" >- >- if test "X$echo" = Xecho; then >- # We didn't find a better echo, so look for alternatives. >- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && >- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && >- test "X$echo_testing_string" = "X$echo_test_string"; then >- # This shell has a builtin print -r that does the trick. >- echo='print -r' >- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && >- test "X$CONFIG_SHELL" != X/bin/ksh; then >- # If we have ksh, try running configure again with it. >- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} >- export ORIGINAL_CONFIG_SHELL >- CONFIG_SHELL=/bin/ksh >- export CONFIG_SHELL >- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} >- else >- # Try using printf. >- echo='printf %s\n' >- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && >- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && >- test "X$echo_testing_string" = "X$echo_test_string"; then >- # Cool, printf works >- : >- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && >- test "X$echo_testing_string" = 'X\t' && >- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && >- test "X$echo_testing_string" = "X$echo_test_string"; then >- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL >- export CONFIG_SHELL >- SHELL="$CONFIG_SHELL" >- export SHELL >- echo="$CONFIG_SHELL $0 --fallback-echo" >- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && >- test "X$echo_testing_string" = 'X\t' && >- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && >- test "X$echo_testing_string" = "X$echo_test_string"; then >- echo="$CONFIG_SHELL $0 --fallback-echo" >- else >- # maybe with a smaller string... >- prev=: >- >- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do >- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null >- then >- break >- fi >- prev="$cmd" >- done >- >- if test "$prev" != 'sed 50q "$0"'; then >- echo_test_string=`eval $prev` >- export echo_test_string >- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} >- else >- # Oops. We lost completely, so just stick with echo. >- echo=echo >- fi >- fi >- fi >- fi >-fi >-fi >- >-# Copy echo and quote the copy suitably for passing to libtool from >-# the Makefile, instead of quoting the original, which is used later. >-ECHO=$echo >-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then >- ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" >-fi >- >- >- >-if expr a : '\(a\)' >/dev/null 2>&1; then >- as_expr=expr >-else >- as_expr=false >-fi >- >- > ## --------------------- ## > ## M4sh Initialization. ## > ## --------------------- ## >@@ -171,11 +14,13 @@ > if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then > emulate sh > NULLCMD=: >+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which >+ # is contrary to our usage. Disable this feature. >+ alias -g '${1+"$@"}'='"$@"' > elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then > set -o posix > fi > >-# NLS nuisances. > # Support unset when possible. > if (FOO=FOO; unset FOO) >/dev/null 2>&1; then > as_unset=unset >@@ -183,34 +28,42 @@ > as_unset=false > fi > >-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && >- { $as_unset LANG || test "${LANG+set}" != set; } || >- { LANG=C; export LANG; } >-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && >- { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || >- { LC_ALL=C; export LC_ALL; } >-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && >- { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || >- { LC_TIME=C; export LC_TIME; } >-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && >- { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || >- { LC_CTYPE=C; export LC_CTYPE; } >-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && >- { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || >- { LANGUAGE=C; export LANGUAGE; } >-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && >- { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || >- { LC_COLLATE=C; export LC_COLLATE; } >-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && >- { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || >- { LC_NUMERIC=C; export LC_NUMERIC; } >-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && >- { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || >- { LC_MESSAGES=C; export LC_MESSAGES; } >+ >+# Work around bugs in pre-3.0 UWIN ksh. >+$as_unset ENV MAIL MAILPATH >+PS1='$ ' >+PS2='> ' >+PS4='+ ' >+ >+# NLS nuisances. >+for as_var in \ >+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ >+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ >+ LC_TELEPHONE LC_TIME >+do >+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then >+ eval $as_var=C; export $as_var >+ else >+ $as_unset $as_var >+ fi >+done >+ >+# Required to use basename. >+if expr a : '\(a\)' >/dev/null 2>&1; then >+ as_expr=expr >+else >+ as_expr=false >+fi >+ >+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then >+ as_basename=basename >+else >+ as_basename=false >+fi > > > # Name of the executable. >-as_me=`(basename "$0") 2>/dev/null || >+as_me=`$as_basename "$0" || > $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ > X"$0" : 'X\(//\)$' \| \ > X"$0" : 'X\(/\)$' \| \ >@@ -221,6 +74,7 @@ > /^X\/\(\/\).*/{ s//\1/; q; } > s/.*/./; q'` > >+ > # PATH needs CR, and LINENO needs CR and PATH. > # Avoid depending upon Character Ranges. > as_cr_letters='abcdefghijklmnopqrstuvwxyz' >@@ -231,15 +85,15 @@ > > # The user is always right. > if test "${PATH_SEPARATOR+set}" != set; then >- echo "#! /bin/sh" >conftest.sh >- echo "exit 0" >>conftest.sh >- chmod +x conftest.sh >- if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then >+ echo "#! /bin/sh" >conf$$.sh >+ echo "exit 0" >>conf$$.sh >+ chmod +x conf$$.sh >+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then > PATH_SEPARATOR=';' > else > PATH_SEPARATOR=: > fi >- rm -f conftest.sh >+ rm -f conf$$.sh > fi > > >@@ -287,6 +141,8 @@ > as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` > test "x$as_lineno_1" != "x$as_lineno_2" && > test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then >+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } >+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } > CONFIG_SHELL=$as_dir/$as_base > export CONFIG_SHELL > exec "$CONFIG_SHELL" "$0" ${1+"$@"} >@@ -359,6 +215,12 @@ > fi > rm -f conf$$ conf$$.exe conf$$.file > >+if mkdir -p . 2>/dev/null; then >+ as_mkdir_p=: >+else >+ as_mkdir_p=false >+fi >+ > as_executable_p="test -f" > > # Sed expression to map a string onto a valid CPP name. >@@ -375,7 +237,156 @@ > IFS=" $as_nl" > > # CDPATH. >-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } >+$as_unset CDPATH >+ >+ >+ >+# Check that we are running under the correct shell. >+SHELL=${CONFIG_SHELL-/bin/sh} >+ >+case X$ECHO in >+X*--fallback-echo) >+ # Remove one level of quotation (which was required for Make). >+ ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` >+ ;; >+esac >+ >+echo=${ECHO-echo} >+if test "X$1" = X--no-reexec; then >+ # Discard the --no-reexec flag, and continue. >+ shift >+elif test "X$1" = X--fallback-echo; then >+ # Avoid inline document here, it may be left over >+ : >+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then >+ # Yippee, $echo works! >+ : >+else >+ # Restart under the correct shell. >+ exec $SHELL "$0" --no-reexec ${1+"$@"} >+fi >+ >+if test "X$1" = X--fallback-echo; then >+ # used as fallback echo >+ shift >+ cat <<EOF >+$* >+EOF >+ exit 0 >+fi >+ >+# The HP-UX ksh and POSIX shell print the target directory to stdout >+# if CDPATH is set. >+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi >+ >+if test -z "$ECHO"; then >+if test "X${echo_test_string+set}" != Xset; then >+# find a string as large as possible, as long as the shell can cope with it >+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do >+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... >+ if (echo_test_string="`eval $cmd`") 2>/dev/null && >+ echo_test_string="`eval $cmd`" && >+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null >+ then >+ break >+ fi >+ done >+fi >+ >+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && >+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ : >+else >+ # The Solaris, AIX, and Digital Unix default echo programs unquote >+ # backslashes. This makes it impossible to quote backslashes using >+ # echo "$something" | sed 's/\\/\\\\/g' >+ # >+ # So, first we look for a working echo in the user's PATH. >+ >+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR >+ for dir in $PATH /usr/ucb; do >+ IFS="$lt_save_ifs" >+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && >+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && >+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ echo="$dir/echo" >+ break >+ fi >+ done >+ IFS="$lt_save_ifs" >+ >+ if test "X$echo" = Xecho; then >+ # We didn't find a better echo, so look for alternatives. >+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && >+ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ # This shell has a builtin print -r that does the trick. >+ echo='print -r' >+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && >+ test "X$CONFIG_SHELL" != X/bin/ksh; then >+ # If we have ksh, try running configure again with it. >+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} >+ export ORIGINAL_CONFIG_SHELL >+ CONFIG_SHELL=/bin/ksh >+ export CONFIG_SHELL >+ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} >+ else >+ # Try using printf. >+ echo='printf %s\n' >+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && >+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ # Cool, printf works >+ : >+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && >+ test "X$echo_testing_string" = 'X\t' && >+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL >+ export CONFIG_SHELL >+ SHELL="$CONFIG_SHELL" >+ export SHELL >+ echo="$CONFIG_SHELL $0 --fallback-echo" >+ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && >+ test "X$echo_testing_string" = 'X\t' && >+ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ echo="$CONFIG_SHELL $0 --fallback-echo" >+ else >+ # maybe with a smaller string... >+ prev=: >+ >+ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do >+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null >+ then >+ break >+ fi >+ prev="$cmd" >+ done >+ >+ if test "$prev" != 'sed 50q "$0"'; then >+ echo_test_string=`eval $prev` >+ export echo_test_string >+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} >+ else >+ # Oops. We lost completely, so just stick with echo. >+ echo=echo >+ fi >+ fi >+ fi >+ fi >+fi >+fi >+ >+# Copy echo and quote the copy suitably for passing to libtool from >+# the Makefile, instead of quoting the original, which is used later. >+ECHO=$echo >+if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then >+ ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" >+fi >+ > > > # Name of the host. >@@ -389,6 +400,7 @@ > # Initializations. > # > ac_default_prefix=/usr/local >+ac_config_libobj_dir=. > cross_compiling=no > subdirs= > MFLAGS= >@@ -445,6 +457,8 @@ > # include <unistd.h> > #endif" > >+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP CXXCPP LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL GTK_CONFIG GTK_CFLAGS GTK_LIBS WOVERLOADED_VIRTUAL USE_EXCEPTIONS USE_RTTI NOOPT_CXXFLAGS NOOPT_CFLAGS REPO NOREPO KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS ENABLE_GLUT_TRUE ENABLE_GLUT_FALSE GNOME_LIBS GNOMEUI_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_LIBDIR GNOME_INCLUDEDIR GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL ORBIT_CFLAGS ORBIT_LIBS GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS cflags_set XPM_LIBS PTHREAD_LIB ENABLE_GTK_TRUE ENABLE_GTK_FALSE KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET LIBUCB LIBDL X_INCLUDES X_LDFLAGS x_libraries x_includes LIBSM LIB_X11 LIBXINERAMA QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG MEINPROC KDE_XSL_STYLESHEET kde_libs_prefix kde_libs_htmldir kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_mimedir kde_wallpaperdir kde_bindir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KSYCOCA LIB_KFILE LIB_KFM ENABLE_KDE_TRUE ENABLE_KDE_FALSE PKGDATADIR HIPDIR ENABLE_HIPPARCOS_TRUE ENABLE_HIPPARCOS_FALSE ENABLE_CELX_TRUE ENABLE_CELX_FALSE LIBOBJS LTLIBOBJS' >+ac_subst_files='' > > # Initialize some variables set by options. > ac_init_help= >@@ -868,6 +882,9 @@ > { (exit 1); exit 1; }; } > fi > fi >+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || >+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 >+ { (exit 1); exit 1; }; } > srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` > ac_env_build_alias_set=${build_alias+set} > ac_env_build_alias_value=$build_alias >@@ -1113,7 +1130,7 @@ > # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be > # absolute. > ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` >-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` >+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` > ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` > ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` > >@@ -1153,7 +1170,7 @@ > running configure, to aid debugging if configure makes a mistake. > > It was created by $as_me, which was >-generated by GNU Autoconf 2.53. Invocation command line was >+generated by GNU Autoconf 2.57. Invocation command line was > > $ $0 $@ > >@@ -1205,27 +1222,54 @@ > > # Keep a trace of the command line. > # Strip out --no-create and --no-recursion so they do not pile up. >+# Strip out --silent because we don't want to record it for future runs. > # Also quote any args containing shell meta-characters. >+# Make two passes to allow for proper duplicate-argument suppression. > ac_configure_args= >+ac_configure_args0= >+ac_configure_args1= > ac_sep= >-for ac_arg >+ac_must_keep_next=false >+for ac_pass in 1 2 > do >- case $ac_arg in >- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ >- | --no-cr | --no-c | -n ) continue ;; >- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ >- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) >- continue ;; >- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) >- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; >- esac >- case " $ac_configure_args " in >- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. >- *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" >- ac_sep=" " ;; >- esac >- # Get rid of the leading space. >+ for ac_arg >+ do >+ case $ac_arg in >+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; >+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ >+ | -silent | --silent | --silen | --sile | --sil) >+ continue ;; >+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) >+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; >+ esac >+ case $ac_pass in >+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; >+ 2) >+ ac_configure_args1="$ac_configure_args1 '$ac_arg'" >+ if test $ac_must_keep_next = true; then >+ ac_must_keep_next=false # Got value, back to normal. >+ else >+ case $ac_arg in >+ *=* | --config-cache | -C | -disable-* | --disable-* \ >+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ >+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ >+ | -with-* | --with-* | -without-* | --without-* | --x) >+ case "$ac_configure_args0 " in >+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; >+ esac >+ ;; >+ -* ) ac_must_keep_next=true ;; >+ esac >+ fi >+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" >+ # Get rid of the leading space. >+ ac_sep=" " >+ ;; >+ esac >+ done > done >+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } >+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } > > # When interrupted or exit'd, cleanup temporary files, and complete > # config.log. We remove comments because anyway the quotes in there >@@ -1236,6 +1280,7 @@ > # Save into config.log some information that might help in debugging. > { > echo >+ > cat <<\_ASBOX > ## ---------------- ## > ## Cache variables. ## >@@ -1258,6 +1303,35 @@ > esac; > } > echo >+ >+ cat <<\_ASBOX >+## ----------------- ## >+## Output variables. ## >+## ----------------- ## >+_ASBOX >+ echo >+ for ac_var in $ac_subst_vars >+ do >+ eval ac_val=$`echo $ac_var` >+ echo "$ac_var='"'"'$ac_val'"'"'" >+ done | sort >+ echo >+ >+ if test -n "$ac_subst_files"; then >+ cat <<\_ASBOX >+## ------------- ## >+## Output files. ## >+## ------------- ## >+_ASBOX >+ echo >+ for ac_var in $ac_subst_files >+ do >+ eval ac_val=$`echo $ac_var` >+ echo "$ac_var='"'"'$ac_val'"'"'" >+ done | sort >+ echo >+ fi >+ > if test -s confdefs.h; then > cat <<\_ASBOX > ## ----------- ## >@@ -1265,7 +1339,7 @@ > ## ----------- ## > _ASBOX > echo >- sed "/^$/d" confdefs.h >+ sed "/^$/d" confdefs.h | sort > echo > fi > test "$ac_signal" != 0 && >@@ -1422,6 +1496,7 @@ > > > >+ > ac_aux_dir= > for ac_dir in admin $srcdir/admin; do > if test -f $ac_dir/install-sh; then >@@ -1564,7 +1639,7 @@ > rm conftest.sed > > >-am__api_version="1.6" >+am__api_version="1.7" > > > test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL >@@ -1774,15 +1849,15 @@ > test -n "$AWK" && break > done > >-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 >-echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 >+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 >+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 > set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` > if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then > echo $ECHO_N "(cached) $ECHO_C" >&6 > else > cat >conftest.make <<\_ACEOF > all: >- @echo 'ac_maketemp="${MAKE}"' >+ @echo 'ac_maketemp="$(MAKE)"' > _ACEOF > # GNU make sometimes prints "make[1]: Entering...", which would confuse us. > eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` >@@ -1803,6 +1878,15 @@ > SET_MAKE="MAKE=${MAKE-make}" > fi > >+rm -rf .tst 2>/dev/null >+mkdir .tst 2>/dev/null >+if test -d .tst; then >+ am__leading_dot=. >+else >+ am__leading_dot=_ >+fi >+rmdir .tst 2>/dev/null >+ > # test to see if srcdir already configured > if test "`cd $srcdir && pwd`" != "`pwd`" && > test -f $srcdir/config.status; then >@@ -1811,6 +1895,16 @@ > { (exit 1); exit 1; }; } > fi > >+# test whether we have cygpath >+if test -z "$CYGPATH_W"; then >+ if (cygpath --version) >/dev/null 2>/dev/null; then >+ CYGPATH_W='cygpath -w' >+ else >+ CYGPATH_W=echo >+ fi >+fi >+ >+ > # Define the identity of the package. > PACKAGE=celestia > VERSION=1.3.1 >@@ -1939,11 +2033,7 @@ > > > >-# Add the stamp file to the list of files AC keeps track of, >-# along with our hook. >-ac_config_headers="$ac_config_headers config.h" >- >- >+ ac_config_headers="$ac_config_headers config.h" > > > if test "x${CFLAGS-notset}" = "xnotset" ; then >@@ -2154,9 +2244,7 @@ > # However, it has the same basename, so the bogon will be chosen > # first if we set CC to just the basename; use the full file name. > shift >- set dummy "$as_dir/$ac_word" ${1+"$@"} >- shift >- ac_cv_prog_CC="$@" >+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" > fi > fi > fi >@@ -2261,8 +2349,10 @@ > fi > > >-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 >-echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} >+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH >+See \`config.log' for more details." >&5 >+echo "$as_me: error: no acceptable C compiler found in \$PATH >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > > # Provide some information about the compiler. >@@ -2287,14 +2377,12 @@ > > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2304,7 +2392,7 @@ > } > _ACEOF > ac_clean_files_save=$ac_clean_files >-ac_clean_files="$ac_clean_files a.out a.exe" >+ac_clean_files="$ac_clean_files a.out a.exe b.out" > # Try to create an executable without -o first, disregard a.out. > # It will help us diagnose broken compilers, and finding out an intuition > # of exeext. >@@ -2323,26 +2411,39 @@ > # Be careful to initialize this variable, since it used to be cached. > # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. > ac_cv_exeext= >-for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; >- ls a.out conftest 2>/dev/null; >- ls a.* conftest.* 2>/dev/null`; do >+# b.out is created by i960 compilers. >+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out >+do >+ test -f "$ac_file" || continue > case $ac_file in >- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; >- a.out ) # We found the default executable, but exeext='' is most >- # certainly right. >- break;; >- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` >- # FIXME: I believe we export ac_cv_exeext for Libtool --akim. >- export ac_cv_exeext >- break;; >- * ) break;; >+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) >+ ;; >+ conftest.$ac_ext ) >+ # This is the source file. >+ ;; >+ [ab].out ) >+ # We found the default executable, but exeext='' is most >+ # certainly right. >+ break;; >+ *.* ) >+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` >+ # FIXME: I believe we export ac_cv_exeext for Libtool, >+ # but it would be cool to find out if it's true. Does anybody >+ # maintain Libtool? --akim. >+ export ac_cv_exeext >+ break;; >+ * ) >+ break;; > esac > done > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 >-echo "$as_me: error: C compiler cannot create executables" >&2;} >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables >+See \`config.log' for more details." >&5 >+echo "$as_me: error: C compiler cannot create executables >+See \`config.log' for more details." >&2;} > { (exit 77); exit 77; }; } > fi > >@@ -2369,9 +2470,11 @@ > cross_compiling=yes > else > { { echo "$as_me:$LINENO: error: cannot run C compiled programs. >-If you meant to cross compile, use \`--host'." >&5 >+If you meant to cross compile, use \`--host'. >+See \`config.log' for more details." >&5 > echo "$as_me: error: cannot run C compiled programs. >-If you meant to cross compile, use \`--host'." >&2;} >+If you meant to cross compile, use \`--host'. >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi > fi >@@ -2379,7 +2482,7 @@ > echo "$as_me:$LINENO: result: yes" >&5 > echo "${ECHO_T}yes" >&6 > >-rm -f a.out a.exe conftest$ac_cv_exeext >+rm -f a.out a.exe conftest$ac_cv_exeext b.out > ac_clean_files=$ac_clean_files_save > # Check the compiler produces executables we can run. If not, either > # the compiler is broken, or we cross compile. >@@ -2399,9 +2502,10 @@ > # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will > # work properly (i.e., refer to `conftest.exe'), while it won't with > # `rm'. >-for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do >+for ac_file in conftest.exe conftest conftest.*; do >+ test -f "$ac_file" || continue > case $ac_file in >- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; >+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; > *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` > export ac_cv_exeext > break;; >@@ -2409,8 +2513,10 @@ > esac > done > else >- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 >-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} >+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi > >@@ -2428,14 +2534,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2452,16 +2556,19 @@ > (exit $ac_status); }; then > for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do > case $ac_file in >- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; >+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; > *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` > break;; > esac > done > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 >-echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot compute suffix of object files: cannot compile >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi > >@@ -2478,14 +2585,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2512,7 +2617,8 @@ > ac_compiler_gnu=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_compiler_gnu=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -2532,14 +2638,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2563,7 +2667,8 @@ > ac_cv_prog_cc_g=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_prog_cc_g=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -2585,6 +2690,102 @@ > CFLAGS= > fi > fi >+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 >+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 >+if test "${ac_cv_prog_cc_stdc+set}" = set; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 >+else >+ ac_cv_prog_cc_stdc=no >+ac_save_CC=$CC >+cat >conftest.$ac_ext <<_ACEOF >+#line $LINENO "configure" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#include <stdarg.h> >+#include <stdio.h> >+#include <sys/types.h> >+#include <sys/stat.h> >+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ >+struct buf { int x; }; >+FILE * (*rcsopen) (struct buf *, struct stat *, int); >+static char *e (p, i) >+ char **p; >+ int i; >+{ >+ return p[i]; >+} >+static char *f (char * (*g) (char **, int), char **p, ...) >+{ >+ char *s; >+ va_list v; >+ va_start (v,p); >+ s = g (p, va_arg (v,int)); >+ va_end (v); >+ return s; >+} >+int test (int i, double x); >+struct s1 {int (*f) (int a);}; >+struct s2 {int (*f) (double a);}; >+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); >+int argc; >+char **argv; >+int >+main () >+{ >+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; >+ ; >+ return 0; >+} >+_ACEOF >+# Don't try gcc -ansi; that turns off useful extensions and >+# breaks some systems' header files. >+# AIX -qlanglvl=ansi >+# Ultrix and OSF/1 -std1 >+# HP-UX 10.20 and later -Ae >+# HP-UX older versions -Aa -D_HPUX_SOURCE >+# SVR4 -Xc -D__EXTENSIONS__ >+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" >+do >+ CC="$ac_save_CC $ac_arg" >+ rm -f conftest.$ac_objext >+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >+ (eval $ac_compile) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); } && >+ { ac_try='test -s conftest.$ac_objext' >+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >+ (eval $ac_try) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); }; }; then >+ ac_cv_prog_cc_stdc=$ac_arg >+break >+else >+ echo "$as_me: failed program was:" >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+fi >+rm -f conftest.$ac_objext >+done >+rm -f conftest.$ac_ext conftest.$ac_objext >+CC=$ac_save_CC >+ >+fi >+ >+case "x$ac_cv_prog_cc_stdc" in >+ x|xno) >+ echo "$as_me:$LINENO: result: none needed" >&5 >+echo "${ECHO_T}none needed" >&6 ;; >+ *) >+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 >+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 >+ CC="$CC $ac_cv_prog_cc_stdc" ;; >+esac >+ > # Some people use a C++ compiler to compile C. Since we use `exit', > # in C++ we need to declare it. In case someone uses the same compiler > # for both compiling C and C++ we need to have the C++ compiler decide >@@ -2617,15 +2818,13 @@ > do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdlib.h> > $ac_declaration >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2649,20 +2848,19 @@ > : > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > continue > fi > rm -f conftest.$ac_objext conftest.$ac_ext > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_declaration >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2686,7 +2884,8 @@ > break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest.$ac_ext > done >@@ -2699,7 +2898,8 @@ > > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest.$ac_ext > ac_ext=c >@@ -2707,24 +2907,16 @@ > ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' > ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' > ac_compiler_gnu=$ac_cv_c_compiler_gnu >-rm -f .deps 2>/dev/null >-mkdir .deps 2>/dev/null >-if test -d .deps; then >- DEPDIR=.deps >-else >- # MS-DOS does not allow filenames that begin with a dot. >- DEPDIR=_deps >-fi >-rmdir .deps 2>/dev/null >- >+DEPDIR="${am__leading_dot}deps" > >-ac_config_commands="$ac_config_commands depfiles" >+ ac_config_commands="$ac_config_commands depfiles" > > > am_make=${MAKE-make} > cat > confinc << 'END' >-doit: >+am__doit: > @echo done >+.PHONY: am__doit > END > # If we don't find an include directive, just comment out the code. > echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 >@@ -2739,7 +2931,7 @@ > # In particular we don't look at `^make:' because GNU make might > # be invoked under some other name (usually "gmake"), in which > # case it prints its new name instead of `make'. >-if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then >+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then > am__include=include > am__quote= > _am_result=GNU >@@ -2799,18 +2991,32 @@ > # using a relative directory. > cp "$am_depcomp" conftest.dir > cd conftest.dir >+ # We will build objects and dependencies in a subdirectory because >+ # it helps to detect inapplicable dependency modes. For instance >+ # both Tru64's cc and ICC support -MD to output dependencies as a >+ # side effect of compilation, but ICC will put the dependencies in >+ # the current directory while Tru64 will put them in the object >+ # directory. >+ mkdir sub > > am_cv_CC_dependencies_compiler_type=none > if test "$am_compiler_list" = ""; then > am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` > fi > for depmode in $am_compiler_list; do >+ # Setup a source with many dependencies, because some compilers >+ # like to wrap large dependency lists on column 80 (with \), and >+ # we should not choose a depcomp mode which is confused by this. >+ # > # We need to recreate these files for each test, as the compiler may > # overwrite some of them when testing with obscure command lines. > # This happens at least with the AIX C compiler. >- echo '#include "conftest.h"' > conftest.c >- echo 'int i;' > conftest.h >- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf >+ : > sub/conftest.c >+ for i in 1 2 3 4 5 6; do >+ echo '#include "conftst'$i'.h"' >> sub/conftest.c >+ : > sub/conftst$i.h >+ done >+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf > > case $depmode in > nosideeffect) >@@ -2828,13 +3034,20 @@ > # mode. It turns out that the SunPro C++ compiler does not properly > # handle `-M -o', and we need to detect this. > if depmode=$depmode \ >- source=conftest.c object=conftest.o \ >- depfile=conftest.Po tmpdepfile=conftest.TPo \ >- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && >- grep conftest.h conftest.Po > /dev/null 2>&1 && >+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ >+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ >+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >+ >/dev/null 2>conftest.err && >+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && >+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && > ${MAKE-make} -s -f confmf > /dev/null 2>&1; then >- am_cv_CC_dependencies_compiler_type=$depmode >- break >+ # icc doesn't choke on unknown options, it will just issue warnings >+ # (even with -Werror). So we grep stderr for any message >+ # that says an option was ignored. >+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else >+ am_cv_CC_dependencies_compiler_type=$depmode >+ break >+ fi > fi > done > >@@ -2851,6 +3064,18 @@ > > > >+if >+ test "x$enable_dependency_tracking" != xno \ >+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then >+ am__fastdepCC_TRUE= >+ am__fastdepCC_FALSE='#' >+else >+ am__fastdepCC_TRUE='#' >+ am__fastdepCC_FALSE= >+fi >+ >+ >+ > if test "x${CXXFLAGS-notset}" = "xnotset" ; then > export CXXFLAGS > CXXFLAGS="" >@@ -2975,14 +3200,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -3009,7 +3232,8 @@ > ac_compiler_gnu=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_compiler_gnu=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -3029,14 +3253,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -3060,7 +3282,8 @@ > ac_cv_prog_cxx_g=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_prog_cxx_g=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -3093,15 +3316,13 @@ > do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdlib.h> > $ac_declaration >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -3125,20 +3346,19 @@ > : > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > continue > fi > rm -f conftest.$ac_objext conftest.$ac_ext > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_declaration >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -3162,7 +3382,8 @@ > break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest.$ac_ext > done >@@ -3197,18 +3418,32 @@ > # using a relative directory. > cp "$am_depcomp" conftest.dir > cd conftest.dir >+ # We will build objects and dependencies in a subdirectory because >+ # it helps to detect inapplicable dependency modes. For instance >+ # both Tru64's cc and ICC support -MD to output dependencies as a >+ # side effect of compilation, but ICC will put the dependencies in >+ # the current directory while Tru64 will put them in the object >+ # directory. >+ mkdir sub > > am_cv_CXX_dependencies_compiler_type=none > if test "$am_compiler_list" = ""; then > am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` > fi > for depmode in $am_compiler_list; do >+ # Setup a source with many dependencies, because some compilers >+ # like to wrap large dependency lists on column 80 (with \), and >+ # we should not choose a depcomp mode which is confused by this. >+ # > # We need to recreate these files for each test, as the compiler may > # overwrite some of them when testing with obscure command lines. > # This happens at least with the AIX C compiler. >- echo '#include "conftest.h"' > conftest.c >- echo 'int i;' > conftest.h >- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf >+ : > sub/conftest.c >+ for i in 1 2 3 4 5 6; do >+ echo '#include "conftst'$i'.h"' >> sub/conftest.c >+ : > sub/conftst$i.h >+ done >+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf > > case $depmode in > nosideeffect) >@@ -3226,13 +3461,20 @@ > # mode. It turns out that the SunPro C++ compiler does not properly > # handle `-M -o', and we need to detect this. > if depmode=$depmode \ >- source=conftest.c object=conftest.o \ >- depfile=conftest.Po tmpdepfile=conftest.TPo \ >- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && >- grep conftest.h conftest.Po > /dev/null 2>&1 && >+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ >+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ >+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >+ >/dev/null 2>conftest.err && >+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && >+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && > ${MAKE-make} -s -f confmf > /dev/null 2>&1; then >- am_cv_CXX_dependencies_compiler_type=$depmode >- break >+ # icc doesn't choke on unknown options, it will just issue warnings >+ # (even with -Werror). So we grep stderr for any message >+ # that says an option was ignored. >+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else >+ am_cv_CXX_dependencies_compiler_type=$depmode >+ break >+ fi > fi > done > >@@ -3249,6 +3491,18 @@ > > > >+if >+ test "x$enable_dependency_tracking" != xno \ >+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then >+ am__fastdepCXX_TRUE= >+ am__fastdepCXX_FALSE='#' >+else >+ am__fastdepCXX_TRUE='#' >+ am__fastdepCXX_FALSE= >+fi >+ >+ >+ > > ac_ext=c > ac_cpp='$CPP $CPPFLAGS' >@@ -3273,18 +3527,28 @@ > do > # Use a header file that comes with gcc, so configuring glibc > # with a fresh cross-compiler works. >+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ # <limits.h> exists even on freestanding compilers. > # On the NeXT, cc -E runs the code through the compiler's parser, > # not just through cpp. "Syntax error" is here to catch this case. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >-#include <assert.h> >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > Syntax error > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -3301,7 +3565,8 @@ > : > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Broken: fails on valid input. > continue > fi >@@ -3311,13 +3576,17 @@ > # can be detected and how. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ac_nonexistent.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -3335,7 +3604,8 @@ > continue > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Passes both tests. > ac_preproc_ok=: > break >@@ -3364,18 +3634,28 @@ > do > # Use a header file that comes with gcc, so configuring glibc > # with a fresh cross-compiler works. >+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ # <limits.h> exists even on freestanding compilers. > # On the NeXT, cc -E runs the code through the compiler's parser, > # not just through cpp. "Syntax error" is here to catch this case. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >-#include <assert.h> >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > Syntax error > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -3392,7 +3672,8 @@ > : > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Broken: fails on valid input. > continue > fi >@@ -3402,13 +3683,17 @@ > # can be detected and how. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ac_nonexistent.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -3426,7 +3711,8 @@ > continue > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Passes both tests. > ac_preproc_ok=: > break >@@ -3439,8 +3725,10 @@ > if $ac_preproc_ok; then > : > else >- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 >-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} >+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check >+See \`config.log' for more details." >&5 >+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi > >@@ -3469,18 +3757,28 @@ > do > # Use a header file that comes with gcc, so configuring glibc > # with a fresh cross-compiler works. >+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ # <limits.h> exists even on freestanding compilers. > # On the NeXT, cc -E runs the code through the compiler's parser, > # not just through cpp. "Syntax error" is here to catch this case. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >-#include <assert.h> >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > Syntax error > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -3497,7 +3795,8 @@ > : > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Broken: fails on valid input. > continue > fi >@@ -3507,13 +3806,17 @@ > # can be detected and how. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ac_nonexistent.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -3531,7 +3834,8 @@ > continue > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Passes both tests. > ac_preproc_ok=: > break >@@ -3560,18 +3864,28 @@ > do > # Use a header file that comes with gcc, so configuring glibc > # with a fresh cross-compiler works. >+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ # <limits.h> exists even on freestanding compilers. > # On the NeXT, cc -E runs the code through the compiler's parser, > # not just through cpp. "Syntax error" is here to catch this case. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >-#include <assert.h> >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > Syntax error > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -3588,7 +3902,8 @@ > : > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Broken: fails on valid input. > continue > fi >@@ -3598,13 +3913,17 @@ > # can be detected and how. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ac_nonexistent.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -3622,7 +3941,8 @@ > continue > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Passes both tests. > ac_preproc_ok=: > break >@@ -3635,8 +3955,10 @@ > if $ac_preproc_ok; then > : > else >- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 >-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} >+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check >+See \`config.log' for more details." >&5 >+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi > >@@ -4278,7 +4600,7 @@ > ;; > *-*-irix6*) > # Find out which ABI we are using. >- echo '#line 4281 "configure"' > conftest.$ac_ext >+ echo '#line 4603 "configure"' > conftest.$ac_ext > if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 > (eval $ac_compile) 2>&5 > ac_status=$? >@@ -4336,14 +4658,12 @@ > > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -4367,7 +4687,8 @@ > lt_cv_cc_needs_belf=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > lt_cv_cc_needs_belf=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -4392,6 +4713,21 @@ > > > >+echo "$as_me:$LINENO: checking for egrep" >&5 >+echo $ECHO_N "checking for egrep... $ECHO_C" >&6 >+if test "${ac_cv_prog_egrep+set}" = set; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 >+else >+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1 >+ then ac_cv_prog_egrep='grep -E' >+ else ac_cv_prog_egrep='egrep' >+ fi >+fi >+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 >+echo "${ECHO_T}$ac_cv_prog_egrep" >&6 >+ EGREP=$ac_cv_prog_egrep >+ >+ > echo "$as_me:$LINENO: checking for ANSI C header files" >&5 > echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 > if test "${ac_cv_header_stdc+set}" = set; then >@@ -4399,48 +4735,59 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdlib.h> > #include <stdarg.h> > #include <string.h> > #include <float.h> > >+int >+main () >+{ >+ >+ ; >+ return 0; >+} > _ACEOF >-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 >- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 >+rm -f conftest.$ac_objext >+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >+ (eval $ac_compile) 2>&5 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >- rm -f conftest.er1 >- cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } >/dev/null; then >- if test -s conftest.err; then >- ac_cpp_err=$ac_c_preproc_warn_flag >- else >- ac_cpp_err= >- fi >-else >- ac_cpp_err=yes >-fi >-if test -z "$ac_cpp_err"; then >+ (exit $ac_status); } && >+ { ac_try='test -s conftest.$ac_objext' >+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >+ (eval $ac_try) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); }; }; then > ac_cv_header_stdc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >- ac_cv_header_stdc=no >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+ac_cv_header_stdc=no > fi >-rm -f conftest.err conftest.$ac_ext >+rm -f conftest.$ac_objext conftest.$ac_ext > > if test $ac_cv_header_stdc = yes; then > # SunOS 4.x string.h does not declare mem*, contrary to ANSI. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <string.h> > > _ACEOF > if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | >- egrep "memchr" >/dev/null 2>&1; then >+ $EGREP "memchr" >/dev/null 2>&1; then > : > else > ac_cv_header_stdc=no >@@ -4453,12 +4800,16 @@ > # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdlib.h> > > _ACEOF > if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | >- egrep "free" >/dev/null 2>&1; then >+ $EGREP "free" >/dev/null 2>&1; then > : > else > ac_cv_header_stdc=no >@@ -4474,13 +4825,18 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ctype.h> > #if ((' ' & 0x0FF) == 0x020) > # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') > # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) > #else >-# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ >+# define ISLOWER(c) \ >+ (('a' <= (c) && (c) <= 'i') \ > || ('j' <= (c) && (c) <= 'r') \ > || ('s' <= (c) && (c) <= 'z')) > # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) >@@ -4513,11 +4869,12 @@ > else > echo "$as_me: program exited with status $ac_status" >&5 > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ( exit $ac_status ) > ac_cv_header_stdc=no > fi >-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext >+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext > fi > fi > fi >@@ -4552,7 +4909,11 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > > #include <$ac_header> >@@ -4572,7 +4933,8 @@ > eval "$as_ac_Header=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > eval "$as_ac_Header=no" > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -4607,7 +4969,11 @@ > echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <$ac_header> > _ACEOF >@@ -4626,7 +4992,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -4638,13 +5005,17 @@ > echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <$ac_header> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -4661,7 +5032,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -4674,14 +5046,32 @@ > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 > echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for $ac_header" >&5 > echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >@@ -6127,14 +6517,12 @@ > # Determine the default libpath from the value encoded in an empty executable. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -6163,7 +6551,8 @@ > }'`; fi > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi >@@ -6180,14 +6569,12 @@ > # Determine the default libpath from the value encoded in an empty executable. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -6216,7 +6603,8 @@ > }'`; fi > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi >@@ -7171,37 +7559,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char shl_load (); below. */ >-#include <assert.h> >+ which can conflict with char shl_load (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char shl_load (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_shl_load) || defined (__stub___shl_load) > choke me > #else >-f = shl_load; >+char (*f) () = shl_load; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != shl_load; > ; > return 0; > } >@@ -7221,7 +7616,8 @@ > ac_cv_func_shl_load=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_shl_load=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -7240,7 +7636,11 @@ > LIBS="-ldld $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -7249,12 +7649,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char shl_load (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -7278,7 +7672,8 @@ > ac_cv_lib_dld_shl_load=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dld_shl_load=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -7296,37 +7691,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char dlopen (); below. */ >-#include <assert.h> >+ which can conflict with char dlopen (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dlopen (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_dlopen) || defined (__stub___dlopen) > choke me > #else >-f = dlopen; >+char (*f) () = dlopen; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != dlopen; > ; > return 0; > } >@@ -7346,7 +7748,8 @@ > ac_cv_func_dlopen=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_dlopen=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -7365,7 +7768,11 @@ > LIBS="-ldl $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -7374,12 +7781,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dlopen (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -7403,7 +7804,8 @@ > ac_cv_lib_dl_dlopen=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dl_dlopen=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -7423,7 +7825,11 @@ > LIBS="-lsvld $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -7432,12 +7838,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dlopen (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -7461,7 +7861,8 @@ > ac_cv_lib_svld_dlopen=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_svld_dlopen=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -7481,7 +7882,11 @@ > LIBS="-ldld $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -7490,12 +7895,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dld_link (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -7519,7 +7918,8 @@ > ac_cv_lib_dld_dld_link=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dld_dld_link=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -7577,7 +7977,7 @@ > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<EOF >-#line 7580 "configure" >+#line 7980 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H >@@ -7675,7 +8075,7 @@ > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<EOF >-#line 7678 "configure" >+#line 8078 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H >@@ -8696,14 +9096,12 @@ > # Determine the default libpath from the value encoded in an empty executable. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -8732,7 +9130,8 @@ > }'`; fi > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi >@@ -8750,14 +9149,12 @@ > # Determine the default libpath from the value encoded in an empty executable. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -8786,7 +9183,8 @@ > }'`; fi > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi >@@ -10372,37 +10770,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char shl_load (); below. */ >-#include <assert.h> >+ which can conflict with char shl_load (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char shl_load (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_shl_load) || defined (__stub___shl_load) > choke me > #else >-f = shl_load; >+char (*f) () = shl_load; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != shl_load; > ; > return 0; > } >@@ -10422,7 +10827,8 @@ > ac_cv_func_shl_load=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_shl_load=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -10441,7 +10847,11 @@ > LIBS="-ldld $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -10450,12 +10860,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char shl_load (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -10479,7 +10883,8 @@ > ac_cv_lib_dld_shl_load=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dld_shl_load=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -10497,37 +10902,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char dlopen (); below. */ >-#include <assert.h> >+ which can conflict with char dlopen (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dlopen (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_dlopen) || defined (__stub___dlopen) > choke me > #else >-f = dlopen; >+char (*f) () = dlopen; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != dlopen; > ; > return 0; > } >@@ -10547,7 +10959,8 @@ > ac_cv_func_dlopen=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_dlopen=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -10566,7 +10979,11 @@ > LIBS="-ldl $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -10575,12 +10992,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dlopen (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -10604,7 +11015,8 @@ > ac_cv_lib_dl_dlopen=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dl_dlopen=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -10624,7 +11036,11 @@ > LIBS="-lsvld $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -10633,12 +11049,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dlopen (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -10662,7 +11072,8 @@ > ac_cv_lib_svld_dlopen=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_svld_dlopen=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -10682,7 +11093,11 @@ > LIBS="-ldld $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -10691,12 +11106,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dld_link (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -10720,7 +11129,8 @@ > ac_cv_lib_dld_dld_link=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dld_dld_link=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -10778,7 +11188,7 @@ > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<EOF >-#line 10781 "configure" >+#line 11191 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H >@@ -10876,7 +11286,7 @@ > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<EOF >-#line 10879 "configure" >+#line 11289 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H >@@ -12050,14 +12460,12 @@ > # Determine the default libpath from the value encoded in an empty executable. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -12086,7 +12494,8 @@ > }'`; fi > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi >@@ -12103,14 +12512,12 @@ > # Determine the default libpath from the value encoded in an empty executable. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -12139,7 +12546,8 @@ > }'`; fi > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi >@@ -13094,37 +13502,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char shl_load (); below. */ >-#include <assert.h> >+ which can conflict with char shl_load (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char shl_load (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_shl_load) || defined (__stub___shl_load) > choke me > #else >-f = shl_load; >+char (*f) () = shl_load; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != shl_load; > ; > return 0; > } >@@ -13144,7 +13559,8 @@ > ac_cv_func_shl_load=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_shl_load=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -13163,7 +13579,11 @@ > LIBS="-ldld $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -13172,12 +13592,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char shl_load (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -13201,7 +13615,8 @@ > ac_cv_lib_dld_shl_load=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dld_shl_load=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -13219,37 +13634,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char dlopen (); below. */ >-#include <assert.h> >+ which can conflict with char dlopen (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dlopen (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_dlopen) || defined (__stub___dlopen) > choke me > #else >-f = dlopen; >+char (*f) () = dlopen; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != dlopen; > ; > return 0; > } >@@ -13269,7 +13691,8 @@ > ac_cv_func_dlopen=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_dlopen=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -13288,7 +13711,11 @@ > LIBS="-ldl $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -13297,12 +13724,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dlopen (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -13326,7 +13747,8 @@ > ac_cv_lib_dl_dlopen=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dl_dlopen=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -13346,7 +13768,11 @@ > LIBS="-lsvld $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -13355,12 +13781,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dlopen (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -13384,7 +13804,8 @@ > ac_cv_lib_svld_dlopen=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_svld_dlopen=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -13404,7 +13825,11 @@ > LIBS="-ldld $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -13413,12 +13838,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dld_link (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -13442,7 +13861,8 @@ > ac_cv_lib_dld_dld_link=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dld_dld_link=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -13500,7 +13920,7 @@ > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<EOF >-#line 13503 "configure" >+#line 13923 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H >@@ -13598,7 +14018,7 @@ > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<EOF >-#line 13601 "configure" >+#line 14021 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H >@@ -14805,7 +15225,11 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > #include <gtk/gtk.h> > #include <stdio.h> >@@ -14897,11 +15321,12 @@ > else > echo "$as_me: program exited with status $ac_status" >&5 > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ( exit $ac_status ) > no_gtk=yes > fi >-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext >+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext > fi > CFLAGS="$ac_save_CFLAGS" > LIBS="$ac_save_LIBS" >@@ -14928,17 +15353,15 @@ > LIBS="$LIBS $GTK_LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > #include <gtk/gtk.h> > #include <stdio.h> > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -14975,7 +15398,8 @@ > echo "*** rpm --erase --nodeps gtk gtk-devel" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > echo "*** The test program failed to compile or link. See the file config.log for the" > echo "*** exact error that occured. This usually means GTK was incorrectly installed" > echo "*** or that you have moved GTK since it was installed. In the latter case, you" >@@ -15293,9 +15717,7 @@ > # However, it has the same basename, so the bogon will be chosen > # first if we set CC to just the basename; use the full file name. > shift >- set dummy "$as_dir/$ac_word" ${1+"$@"} >- shift >- ac_cv_prog_CC="$@" >+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" > fi > fi > fi >@@ -15400,8 +15822,10 @@ > fi > > >-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 >-echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} >+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH >+See \`config.log' for more details." >&5 >+echo "$as_me: error: no acceptable C compiler found in \$PATH >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > > # Provide some information about the compiler. >@@ -15431,14 +15855,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -15465,7 +15887,8 @@ > ac_compiler_gnu=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_compiler_gnu=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -15485,14 +15908,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -15516,7 +15937,8 @@ > ac_cv_prog_cc_g=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_prog_cc_g=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -15538,6 +15960,102 @@ > CFLAGS= > fi > fi >+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 >+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 >+if test "${ac_cv_prog_cc_stdc+set}" = set; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 >+else >+ ac_cv_prog_cc_stdc=no >+ac_save_CC=$CC >+cat >conftest.$ac_ext <<_ACEOF >+#line $LINENO "configure" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#include <stdarg.h> >+#include <stdio.h> >+#include <sys/types.h> >+#include <sys/stat.h> >+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ >+struct buf { int x; }; >+FILE * (*rcsopen) (struct buf *, struct stat *, int); >+static char *e (p, i) >+ char **p; >+ int i; >+{ >+ return p[i]; >+} >+static char *f (char * (*g) (char **, int), char **p, ...) >+{ >+ char *s; >+ va_list v; >+ va_start (v,p); >+ s = g (p, va_arg (v,int)); >+ va_end (v); >+ return s; >+} >+int test (int i, double x); >+struct s1 {int (*f) (int a);}; >+struct s2 {int (*f) (double a);}; >+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); >+int argc; >+char **argv; >+int >+main () >+{ >+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; >+ ; >+ return 0; >+} >+_ACEOF >+# Don't try gcc -ansi; that turns off useful extensions and >+# breaks some systems' header files. >+# AIX -qlanglvl=ansi >+# Ultrix and OSF/1 -std1 >+# HP-UX 10.20 and later -Ae >+# HP-UX older versions -Aa -D_HPUX_SOURCE >+# SVR4 -Xc -D__EXTENSIONS__ >+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" >+do >+ CC="$ac_save_CC $ac_arg" >+ rm -f conftest.$ac_objext >+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >+ (eval $ac_compile) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); } && >+ { ac_try='test -s conftest.$ac_objext' >+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >+ (eval $ac_try) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); }; }; then >+ ac_cv_prog_cc_stdc=$ac_arg >+break >+else >+ echo "$as_me: failed program was:" >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+fi >+rm -f conftest.$ac_objext >+done >+rm -f conftest.$ac_ext conftest.$ac_objext >+CC=$ac_save_CC >+ >+fi >+ >+case "x$ac_cv_prog_cc_stdc" in >+ x|xno) >+ echo "$as_me:$LINENO: result: none needed" >&5 >+echo "${ECHO_T}none needed" >&6 ;; >+ *) >+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 >+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 >+ CC="$CC $ac_cv_prog_cc_stdc" ;; >+esac >+ > # Some people use a C++ compiler to compile C. Since we use `exit', > # in C++ we need to declare it. In case someone uses the same compiler > # for both compiling C and C++ we need to have the C++ compiler decide >@@ -15570,15 +16088,13 @@ > do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdlib.h> > $ac_declaration >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -15602,20 +16118,19 @@ > : > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > continue > fi > rm -f conftest.$ac_objext conftest.$ac_ext > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_declaration >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -15639,7 +16154,8 @@ > break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest.$ac_ext > done >@@ -15652,7 +16168,8 @@ > > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest.$ac_ext > ac_ext=c >@@ -15679,18 +16196,32 @@ > # using a relative directory. > cp "$am_depcomp" conftest.dir > cd conftest.dir >+ # We will build objects and dependencies in a subdirectory because >+ # it helps to detect inapplicable dependency modes. For instance >+ # both Tru64's cc and ICC support -MD to output dependencies as a >+ # side effect of compilation, but ICC will put the dependencies in >+ # the current directory while Tru64 will put them in the object >+ # directory. >+ mkdir sub > > am_cv_CC_dependencies_compiler_type=none > if test "$am_compiler_list" = ""; then > am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` > fi > for depmode in $am_compiler_list; do >+ # Setup a source with many dependencies, because some compilers >+ # like to wrap large dependency lists on column 80 (with \), and >+ # we should not choose a depcomp mode which is confused by this. >+ # > # We need to recreate these files for each test, as the compiler may > # overwrite some of them when testing with obscure command lines. > # This happens at least with the AIX C compiler. >- echo '#include "conftest.h"' > conftest.c >- echo 'int i;' > conftest.h >- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf >+ : > sub/conftest.c >+ for i in 1 2 3 4 5 6; do >+ echo '#include "conftst'$i'.h"' >> sub/conftest.c >+ : > sub/conftst$i.h >+ done >+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf > > case $depmode in > nosideeffect) >@@ -15708,13 +16239,20 @@ > # mode. It turns out that the SunPro C++ compiler does not properly > # handle `-M -o', and we need to detect this. > if depmode=$depmode \ >- source=conftest.c object=conftest.o \ >- depfile=conftest.Po tmpdepfile=conftest.TPo \ >- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && >- grep conftest.h conftest.Po > /dev/null 2>&1 && >+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ >+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ >+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >+ >/dev/null 2>conftest.err && >+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && >+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && > ${MAKE-make} -s -f confmf > /dev/null 2>&1; then >- am_cv_CC_dependencies_compiler_type=$depmode >- break >+ # icc doesn't choke on unknown options, it will just issue warnings >+ # (even with -Werror). So we grep stderr for any message >+ # that says an option was ignored. >+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else >+ am_cv_CC_dependencies_compiler_type=$depmode >+ break >+ fi > fi > done > >@@ -15731,6 +16269,18 @@ > > > >+if >+ test "x$enable_dependency_tracking" != xno \ >+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then >+ am__fastdepCC_TRUE= >+ am__fastdepCC_FALSE='#' >+else >+ am__fastdepCC_TRUE='#' >+ am__fastdepCC_FALSE= >+fi >+ >+ >+ > ac_ext=c > ac_cpp='$CPP $CPPFLAGS' > ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' >@@ -15754,18 +16304,28 @@ > do > # Use a header file that comes with gcc, so configuring glibc > # with a fresh cross-compiler works. >+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ # <limits.h> exists even on freestanding compilers. > # On the NeXT, cc -E runs the code through the compiler's parser, > # not just through cpp. "Syntax error" is here to catch this case. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >-#include <assert.h> >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > Syntax error > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -15782,7 +16342,8 @@ > : > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Broken: fails on valid input. > continue > fi >@@ -15792,13 +16353,17 @@ > # can be detected and how. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ac_nonexistent.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -15816,7 +16381,8 @@ > continue > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Passes both tests. > ac_preproc_ok=: > break >@@ -15845,18 +16411,28 @@ > do > # Use a header file that comes with gcc, so configuring glibc > # with a fresh cross-compiler works. >+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ # <limits.h> exists even on freestanding compilers. > # On the NeXT, cc -E runs the code through the compiler's parser, > # not just through cpp. "Syntax error" is here to catch this case. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >-#include <assert.h> >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > Syntax error > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -15873,7 +16449,8 @@ > : > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Broken: fails on valid input. > continue > fi >@@ -15883,13 +16460,17 @@ > # can be detected and how. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ac_nonexistent.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -15907,7 +16488,8 @@ > continue > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Passes both tests. > ac_preproc_ok=: > break >@@ -15920,8 +16502,10 @@ > if $ac_preproc_ok; then > : > else >- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 >-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} >+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check >+See \`config.log' for more details." >&5 >+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi > >@@ -16080,14 +16664,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -16114,7 +16696,8 @@ > ac_compiler_gnu=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_compiler_gnu=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -16134,14 +16717,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -16165,7 +16746,8 @@ > ac_cv_prog_cxx_g=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_prog_cxx_g=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -16198,15 +16780,13 @@ > do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdlib.h> > $ac_declaration >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -16230,20 +16810,19 @@ > : > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > continue > fi > rm -f conftest.$ac_objext conftest.$ac_ext > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_declaration >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -16267,7 +16846,8 @@ > break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest.$ac_ext > done >@@ -16302,18 +16882,32 @@ > # using a relative directory. > cp "$am_depcomp" conftest.dir > cd conftest.dir >+ # We will build objects and dependencies in a subdirectory because >+ # it helps to detect inapplicable dependency modes. For instance >+ # both Tru64's cc and ICC support -MD to output dependencies as a >+ # side effect of compilation, but ICC will put the dependencies in >+ # the current directory while Tru64 will put them in the object >+ # directory. >+ mkdir sub > > am_cv_CXX_dependencies_compiler_type=none > if test "$am_compiler_list" = ""; then > am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` > fi > for depmode in $am_compiler_list; do >+ # Setup a source with many dependencies, because some compilers >+ # like to wrap large dependency lists on column 80 (with \), and >+ # we should not choose a depcomp mode which is confused by this. >+ # > # We need to recreate these files for each test, as the compiler may > # overwrite some of them when testing with obscure command lines. > # This happens at least with the AIX C compiler. >- echo '#include "conftest.h"' > conftest.c >- echo 'int i;' > conftest.h >- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf >+ : > sub/conftest.c >+ for i in 1 2 3 4 5 6; do >+ echo '#include "conftst'$i'.h"' >> sub/conftest.c >+ : > sub/conftst$i.h >+ done >+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf > > case $depmode in > nosideeffect) >@@ -16331,13 +16925,20 @@ > # mode. It turns out that the SunPro C++ compiler does not properly > # handle `-M -o', and we need to detect this. > if depmode=$depmode \ >- source=conftest.c object=conftest.o \ >- depfile=conftest.Po tmpdepfile=conftest.TPo \ >- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && >- grep conftest.h conftest.Po > /dev/null 2>&1 && >+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ >+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ >+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >+ >/dev/null 2>conftest.err && >+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && >+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && > ${MAKE-make} -s -f confmf > /dev/null 2>&1; then >- am_cv_CXX_dependencies_compiler_type=$depmode >- break >+ # icc doesn't choke on unknown options, it will just issue warnings >+ # (even with -Werror). So we grep stderr for any message >+ # that says an option was ignored. >+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else >+ am_cv_CXX_dependencies_compiler_type=$depmode >+ break >+ fi > fi > done > >@@ -16354,6 +16955,18 @@ > > > >+if >+ test "x$enable_dependency_tracking" != xno \ >+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then >+ am__fastdepCXX_TRUE= >+ am__fastdepCXX_FALSE='#' >+else >+ am__fastdepCXX_TRUE='#' >+ am__fastdepCXX_FALSE= >+fi >+ >+ >+ > if test "$GXX" = "yes" || test "$CXX" = "KCC"; then > if test "$kde_use_debug_code" != "no"; then > if test "$CXX" = "KCC"; then >@@ -16390,14 +17003,12 @@ > CXXFLAGS="$CXXFLAGS -fno-builtin" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -16421,7 +17032,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -16470,14 +17082,12 @@ > CXXFLAGS="$CXXFLAGS -Woverloaded-virtual" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -16501,7 +17111,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -16564,14 +17175,12 @@ > CXXFLAGS="$CXXFLAGS -pg" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -16595,7 +17204,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -16649,14 +17259,12 @@ > CXXFLAGS="$CXXFLAGS -fprofile-arcs" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -16680,7 +17288,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -16742,14 +17351,12 @@ > CXXFLAGS="$CXXFLAGS -Wundef" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -16773,7 +17380,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -16821,14 +17429,12 @@ > CXXFLAGS="$CXXFLAGS -Wno-long-long" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -16852,7 +17458,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -16900,14 +17507,12 @@ > CXXFLAGS="$CXXFLAGS -Wnon-virtual-dtor" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -16931,7 +17536,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -16987,14 +17593,12 @@ > CXXFLAGS="$CXXFLAGS -fno-exceptions" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -17018,7 +17622,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -17066,14 +17671,12 @@ > CXXFLAGS="$CXXFLAGS -fno-check-new" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -17097,7 +17700,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -17145,14 +17749,12 @@ > CXXFLAGS="$CXXFLAGS -fexceptions" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -17176,7 +17778,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -17238,14 +17841,12 @@ > CXXFLAGS="$CXXFLAGS --pch" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -17269,7 +17870,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -17318,14 +17920,12 @@ > CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -17349,7 +17949,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -17397,14 +17998,12 @@ > CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -17428,7 +18027,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -17476,14 +18076,12 @@ > CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -17507,7 +18105,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -17555,14 +18154,12 @@ > CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -17586,7 +18183,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -17634,14 +18232,12 @@ > CXXFLAGS="$CXXFLAGS --one_per" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -17665,7 +18261,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -17811,18 +18408,28 @@ > do > # Use a header file that comes with gcc, so configuring glibc > # with a fresh cross-compiler works. >+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ # <limits.h> exists even on freestanding compilers. > # On the NeXT, cc -E runs the code through the compiler's parser, > # not just through cpp. "Syntax error" is here to catch this case. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >-#include <assert.h> >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > Syntax error > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -17839,7 +18446,8 @@ > : > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Broken: fails on valid input. > continue > fi >@@ -17849,13 +18457,17 @@ > # can be detected and how. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ac_nonexistent.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -17873,7 +18485,8 @@ > continue > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Passes both tests. > ac_preproc_ok=: > break >@@ -17902,18 +18515,28 @@ > do > # Use a header file that comes with gcc, so configuring glibc > # with a fresh cross-compiler works. >+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ # <limits.h> exists even on freestanding compilers. > # On the NeXT, cc -E runs the code through the compiler's parser, > # not just through cpp. "Syntax error" is here to catch this case. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >-#include <assert.h> >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > Syntax error > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -17930,7 +18553,8 @@ > : > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Broken: fails on valid input. > continue > fi >@@ -17940,13 +18564,17 @@ > # can be detected and how. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ac_nonexistent.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -17964,7 +18592,8 @@ > continue > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Passes both tests. > ac_preproc_ok=: > break >@@ -17977,8 +18606,10 @@ > if $ac_preproc_ok; then > : > else >- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 >-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} >+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check >+See \`config.log' for more details." >&5 >+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi > >@@ -18033,14 +18664,12 @@ > CXXFLAGS="$CXXFLAGS -frepo" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -18064,7 +18693,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -18117,14 +18747,12 @@ > CXXFLAGS="$CXXFLAGS -instances=explicit" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -18148,7 +18776,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -18323,13 +18952,17 @@ > # First, try using that file with no special directory specified. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <X11/Intrinsic.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -18347,7 +18980,8 @@ > ac_x_includes= > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > for ac_dir in $ac_x_header_dirs; do > if test -r "$ac_dir/X11/Intrinsic.h"; then > ac_x_includes=$ac_dir >@@ -18366,14 +19000,12 @@ > LIBS="-lXt $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <X11/Intrinsic.h> >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -18399,7 +19031,8 @@ > ac_x_libraries= > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > LIBS=$ac_save_LIBS > for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` > do >@@ -18469,14 +19102,12 @@ > ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -18500,7 +19131,8 @@ > ac_R_nospace=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_R_nospace=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -18512,14 +19144,12 @@ > LIBS="$ac_xsave_LIBS -R $x_libraries" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -18543,7 +19173,8 @@ > ac_R_space=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_R_space=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -18573,7 +19204,11 @@ > ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -18582,12 +19217,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char XOpenDisplay (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -18611,7 +19240,8 @@ > : > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 > echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 > if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then >@@ -18621,7 +19251,11 @@ > LIBS="-ldnet $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -18630,12 +19264,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dnet_ntoa (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -18659,7 +19287,8 @@ > ac_cv_lib_dnet_dnet_ntoa=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dnet_dnet_ntoa=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -18681,7 +19310,11 @@ > LIBS="-ldnet_stub $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -18690,12 +19323,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dnet_ntoa (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -18719,7 +19346,8 @@ > ac_cv_lib_dnet_stub_dnet_ntoa=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dnet_stub_dnet_ntoa=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -18751,37 +19379,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char gethostbyname (); below. */ >-#include <assert.h> >+ which can conflict with char gethostbyname (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char gethostbyname (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) > choke me > #else >-f = gethostbyname; >+char (*f) () = gethostbyname; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != gethostbyname; > ; > return 0; > } >@@ -18801,7 +19436,8 @@ > ac_cv_func_gethostbyname=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_gethostbyname=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -18819,7 +19455,11 @@ > LIBS="-lnsl $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -18828,12 +19468,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char gethostbyname (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -18857,7 +19491,8 @@ > ac_cv_lib_nsl_gethostbyname=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_nsl_gethostbyname=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -18879,7 +19514,11 @@ > LIBS="-lbsd $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -18888,12 +19527,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char gethostbyname (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -18917,7 +19550,8 @@ > ac_cv_lib_bsd_gethostbyname=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_bsd_gethostbyname=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -18936,7 +19570,7 @@ > # socket/setsockopt and other routines are undefined under SCO ODT > # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary > # on later versions), says Simon Leinen: it contains gethostby* >- # variants that don't use the nameserver (or something). -lsocket >+ # variants that don't use the name server (or something). -lsocket > # must be given before -lnsl if both are needed. We assume that > # if connect needs -lnsl, so does gethostbyname. > echo "$as_me:$LINENO: checking for connect" >&5 >@@ -18946,37 +19580,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char connect (); below. */ >-#include <assert.h> >+ which can conflict with char connect (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char connect (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_connect) || defined (__stub___connect) > choke me > #else >-f = connect; >+char (*f) () = connect; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != connect; > ; > return 0; > } >@@ -18996,7 +19637,8 @@ > ac_cv_func_connect=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_connect=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -19014,7 +19656,11 @@ > LIBS="-lsocket $X_EXTRA_LIBS $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -19023,12 +19669,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char connect (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -19052,7 +19692,8 @@ > ac_cv_lib_socket_connect=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_socket_connect=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -19074,37 +19715,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char remove (); below. */ >-#include <assert.h> >+ which can conflict with char remove (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char remove (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_remove) || defined (__stub___remove) > choke me > #else >-f = remove; >+char (*f) () = remove; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != remove; > ; > return 0; > } >@@ -19124,7 +19772,8 @@ > ac_cv_func_remove=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_remove=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -19142,7 +19791,11 @@ > LIBS="-lposix $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -19151,12 +19804,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char remove (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -19180,7 +19827,8 @@ > ac_cv_lib_posix_remove=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_posix_remove=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -19202,37 +19850,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char shmat (); below. */ >-#include <assert.h> >+ which can conflict with char shmat (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char shmat (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_shmat) || defined (__stub___shmat) > choke me > #else >-f = shmat; >+char (*f) () = shmat; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != shmat; > ; > return 0; > } >@@ -19252,7 +19907,8 @@ > ac_cv_func_shmat=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_shmat=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -19270,7 +19926,11 @@ > LIBS="-lipc $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -19279,12 +19939,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char shmat (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -19308,7 +19962,8 @@ > ac_cv_lib_ipc_shmat=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_ipc_shmat=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -19341,7 +19996,11 @@ > LIBS="-lICE $X_EXTRA_LIBS $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -19350,12 +20009,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char IceConnectionNumber (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -19379,7 +20032,8 @@ > ac_cv_lib_ICE_IceConnectionNumber=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_ICE_IceConnectionNumber=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -19419,7 +20073,11 @@ > echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <$ac_header> > _ACEOF >@@ -19438,7 +20096,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -19450,13 +20109,17 @@ > echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <$ac_header> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -19473,7 +20136,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -19486,14 +20150,32 @@ > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 > echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for $ac_header" >&5 > echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >@@ -19531,7 +20213,11 @@ > LIBS="-lGL $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -19540,12 +20226,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char glNewList (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -19569,7 +20249,8 @@ > ac_cv_lib_GL_glNewList=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_GL_glNewList=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -19598,7 +20279,11 @@ > LIBS="-lMesaGL $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -19607,12 +20292,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char glNewList (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -19636,7 +20315,8 @@ > ac_cv_lib_MesaGL_glNewList=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_MesaGL_glNewList=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -19677,7 +20357,11 @@ > echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <$ac_header> > _ACEOF >@@ -19696,7 +20380,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -19708,13 +20393,17 @@ > echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <$ac_header> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -19731,7 +20420,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -19744,14 +20434,32 @@ > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 > echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for $ac_header" >&5 > echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >@@ -19787,7 +20495,11 @@ > LIBS="-lGLU $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -19796,12 +20508,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char gluLookAt (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -19825,7 +20531,8 @@ > ac_cv_lib_GLU_gluLookAt=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_GLU_gluLookAt=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -19854,7 +20561,11 @@ > LIBS="-lMesaGLU $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -19863,12 +20574,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char gluLookAt (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -19892,7 +20597,8 @@ > ac_cv_lib_MesaGLU_gluLookAt=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_MesaGLU_gluLookAt=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -19935,7 +20641,11 @@ > echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <$ac_header> > _ACEOF >@@ -19954,7 +20664,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -19966,13 +20677,17 @@ > echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <$ac_header> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -19989,7 +20704,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -20002,14 +20718,32 @@ > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 > echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for $ac_header" >&5 > echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >@@ -20046,7 +20780,11 @@ > LIBS="-lglut $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -20055,12 +20793,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char glutKeyboardUpFunc (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -20084,7 +20816,8 @@ > ac_cv_lib_glut_glutKeyboardUpFunc=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_glut_glutKeyboardUpFunc=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -20130,7 +20863,11 @@ > LIBS="-lgtkgl $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -20139,12 +20876,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char gdk_gl_query (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -20168,7 +20899,8 @@ > ac_cv_lib_gtkgl_gdk_gl_query=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_gtkgl_gdk_gl_query=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -20590,7 +21322,11 @@ > LIBS="-lpthread $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -20599,12 +21335,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char pthread_create (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -20628,7 +21358,8 @@ > ac_cv_lib_pthread_pthread_create=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_pthread_pthread_create=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -20648,7 +21379,11 @@ > LIBS="-lpthreads $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -20657,12 +21392,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char pthread_create (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -20686,7 +21415,8 @@ > ac_cv_lib_pthreads_pthread_create=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_pthreads_pthread_create=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -20706,7 +21436,11 @@ > LIBS="-lc_r $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -20715,12 +21449,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char pthread_create (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -20744,7 +21472,8 @@ > ac_cv_lib_c_r_pthread_create=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_c_r_pthread_create=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -20762,37 +21491,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char pthread_create (); below. */ >-#include <assert.h> >+ which can conflict with char pthread_create (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char pthread_create (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_pthread_create) || defined (__stub___pthread_create) > choke me > #else >-f = pthread_create; >+char (*f) () = pthread_create; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != pthread_create; > ; > return 0; > } >@@ -20812,7 +21548,8 @@ > ac_cv_func_pthread_create=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_pthread_create=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -20945,7 +21682,11 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > #include <gtk/gtk.h> > #include <stdio.h> >@@ -21037,11 +21778,12 @@ > else > echo "$as_me: program exited with status $ac_status" >&5 > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ( exit $ac_status ) > no_gtk=yes > fi >-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext >+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext > fi > CFLAGS="$ac_save_CFLAGS" > LIBS="$ac_save_LIBS" >@@ -21068,17 +21810,15 @@ > LIBS="$LIBS $GTK_LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > #include <gtk/gtk.h> > #include <stdio.h> > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -21115,7 +21855,8 @@ > echo "*** rpm --erase --nodeps gtk gtk-devel" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > echo "*** The test program failed to compile or link. See the file config.log for the" > echo "*** exact error that occured. This usually means GTK was incorrectly installed" > echo "*** or that you have moved GTK since it was installed. In the latter case, you" >@@ -21165,7 +21906,11 @@ > LIBS="-lSM $x_libs -lICE $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -21174,12 +21919,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char SmcSaveYourselfDone (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -21203,7 +21942,8 @@ > ac_cv_lib_SM_SmcSaveYourselfDone=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_SM_SmcSaveYourselfDone=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -21239,7 +21979,11 @@ > echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <$ac_header> > _ACEOF >@@ -21258,7 +22002,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -21270,13 +22015,17 @@ > echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <$ac_header> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -21293,7 +22042,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -21306,14 +22056,32 @@ > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 > echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for $ac_header" >&5 > echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >@@ -21356,7 +22124,11 @@ > LIBS="-lXpm $x_libs $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -21365,12 +22137,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char XpmFreeXpmImage (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -21394,7 +22160,8 @@ > ac_cv_lib_Xpm_XpmFreeXpmImage=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_Xpm_XpmFreeXpmImage=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -21740,15 +22507,13 @@ > LIBS="-lutil $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -21772,7 +22537,8 @@ > ac_cv_lib_util_main=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_util_main=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -21793,15 +22559,13 @@ > LIBS="-lcompat $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -21825,7 +22589,8 @@ > ac_cv_lib_compat_main=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_compat_main=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -21847,7 +22612,11 @@ > LIBS="-lcrypt $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -21856,12 +22625,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char crypt (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -21885,7 +22648,8 @@ > ac_cv_lib_crypt_crypt=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_crypt_crypt=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -21905,7 +22669,11 @@ > LIBS="-lc $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -21914,12 +22682,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char crypt (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -21943,7 +22705,8 @@ > ac_cv_lib_c_crypt=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_c_crypt=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -21995,17 +22758,15 @@ > > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > #include <sys/types.h> > #include <sys/socket.h> > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -22032,20 +22793,19 @@ > ac_cv_socklen_t=socklen_t > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > #include <sys/types.h> > #include <sys/socket.h> > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -22072,7 +22832,8 @@ > ac_cv_socklen_t=int > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_socklen_t=size_t > > fi >@@ -22121,7 +22882,11 @@ > LIBS="-ldnet $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -22130,12 +22895,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dnet_ntoa (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -22159,7 +22918,8 @@ > ac_cv_lib_dnet_dnet_ntoa=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dnet_dnet_ntoa=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -22181,7 +22941,11 @@ > LIBS="-ldnet_stub $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -22190,12 +22954,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dnet_ntoa (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -22219,7 +22977,8 @@ > ac_cv_lib_dnet_stub_dnet_ntoa=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dnet_stub_dnet_ntoa=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -22239,37 +22998,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char inet_ntoa (); below. */ >-#include <assert.h> >+ which can conflict with char inet_ntoa (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char inet_ntoa (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa) > choke me > #else >-f = inet_ntoa; >+char (*f) () = inet_ntoa; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != inet_ntoa; > ; > return 0; > } >@@ -22289,7 +23055,8 @@ > ac_cv_func_inet_ntoa=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_inet_ntoa=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -22307,7 +23074,11 @@ > LIBS="-lnsl $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -22316,12 +23087,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char inet_ntoa (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -22345,7 +23110,8 @@ > ac_cv_lib_nsl_inet_ntoa=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_nsl_inet_ntoa=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -22365,37 +23131,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char connect (); below. */ >-#include <assert.h> >+ which can conflict with char connect (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char connect (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_connect) || defined (__stub___connect) > choke me > #else >-f = connect; >+char (*f) () = connect; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != connect; > ; > return 0; > } >@@ -22415,7 +23188,8 @@ > ac_cv_func_connect=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_connect=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -22433,7 +23207,11 @@ > LIBS="-lsocket $X_EXTRA_LIBS $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -22442,12 +23220,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char connect (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -22471,7 +23243,8 @@ > ac_cv_lib_socket_connect=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_socket_connect=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -22492,37 +23265,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char remove (); below. */ >-#include <assert.h> >+ which can conflict with char remove (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char remove (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_remove) || defined (__stub___remove) > choke me > #else >-f = remove; >+char (*f) () = remove; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != remove; > ; > return 0; > } >@@ -22542,7 +23322,8 @@ > ac_cv_func_remove=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_remove=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -22560,7 +23341,11 @@ > LIBS="-lposix $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -22569,12 +23354,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char remove (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -22598,7 +23377,8 @@ > ac_cv_lib_posix_remove=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_posix_remove=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -22620,37 +23400,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char shmat (); below. */ >-#include <assert.h> >+ which can conflict with char shmat (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char shmat (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_shmat) || defined (__stub___shmat) > choke me > #else >-f = shmat; >+char (*f) () = shmat; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != shmat; > ; > return 0; > } >@@ -22670,7 +23457,8 @@ > ac_cv_func_shmat=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func_shmat=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -22689,7 +23477,11 @@ > LIBS="-lipc $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -22698,12 +23490,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char shmat (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -22727,7 +23513,8 @@ > ac_cv_lib_ipc_shmat=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_ipc_shmat=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -22761,7 +23548,11 @@ > echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <$ac_header> > _ACEOF >@@ -22780,7 +23571,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -22792,13 +23584,17 @@ > echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <$ac_header> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -22815,7 +23611,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -22828,14 +23625,32 @@ > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 > echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for $ac_header" >&5 > echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >@@ -22864,37 +23679,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char _NSGetEnviron (); below. */ >-#include <assert.h> >+ which can conflict with char _NSGetEnviron (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char _NSGetEnviron (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron) > choke me > #else >-f = _NSGetEnviron; >+char (*f) () = _NSGetEnviron; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != _NSGetEnviron; > ; > return 0; > } >@@ -22914,7 +23736,8 @@ > ac_cv_func__NSGetEnviron=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_func__NSGetEnviron=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -22950,7 +23773,11 @@ > echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <$ac_header> > _ACEOF >@@ -22969,7 +23796,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -22981,13 +23809,17 @@ > echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <$ac_header> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -23004,7 +23836,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -23017,14 +23850,32 @@ > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 > echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for $ac_header" >&5 > echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >@@ -23057,7 +23908,11 @@ > LIBS="-lpoll $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -23066,12 +23921,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char poll (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23095,7 +23944,8 @@ > ac_cv_lib_poll_poll=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_poll_poll=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -23123,7 +23973,11 @@ > echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <CoreAudio/CoreAudio.h> > _ACEOF >@@ -23142,7 +23996,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -23154,13 +24009,17 @@ > echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <CoreAudio/CoreAudio.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -23177,7 +24036,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -23190,14 +24050,32 @@ > { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5 > echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 > echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6 >@@ -23230,19 +24108,17 @@ > LIBS="$LIBS $X_EXTRA_LIBS -lresolv" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > #include <sys/types.h> > #include <netinet/in.h> > #include <arpa/nameser.h> > #include <resolv.h> > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23277,7 +24153,8 @@ > > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > echo "$as_me:$LINENO: result: no" >&5 > echo "${ECHO_T}no" >&6 > >@@ -23290,19 +24167,17 @@ > echo $ECHO_N "checking if res_init is available... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > #include <sys/types.h> > #include <netinet/in.h> > #include <arpa/nameser.h> > #include <resolv.h> > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23336,7 +24211,8 @@ > > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > echo "$as_me:$LINENO: result: no" >&5 > echo "${ECHO_T}no" >&6 > >@@ -23357,7 +24233,11 @@ > LIBS="-lucb $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -23366,12 +24246,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char killpg (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23395,7 +24269,8 @@ > ac_cv_lib_ucb_killpg=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_ucb_killpg=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -23423,7 +24298,11 @@ > LIBS="-lbsd $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -23432,12 +24311,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char gethostbyname (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23461,7 +24334,8 @@ > ac_cv_lib_bsd_gethostbyname=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_bsd_gethostbyname=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -23482,14 +24356,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23516,7 +24388,8 @@ > ac_cv_type_int=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_type_int=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -23538,14 +24411,12 @@ > # Depending upon the size, compute the lo and hi bounds. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23572,14 +24443,12 @@ > while :; do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23605,7 +24474,8 @@ > ac_hi=$ac_mid; break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_lo=`expr $ac_mid + 1` > if test $ac_lo -le $ac_mid; then > ac_lo= ac_hi= >@@ -23617,17 +24487,16 @@ > done > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23654,14 +24523,12 @@ > while :; do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23687,7 +24554,8 @@ > ac_lo=$ac_mid; break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_hi=`expr '(' $ac_mid ')' - 1` > if test $ac_mid -le $ac_hi; then > ac_lo= ac_hi= >@@ -23699,7 +24567,8 @@ > done > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_lo= ac_hi= > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -23710,14 +24579,12 @@ > ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23743,37 +24610,40 @@ > ac_hi=$ac_mid > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_lo=`expr '(' $ac_mid ')' + 1` > fi > rm -f conftest.$ac_objext conftest.$ac_ext > done > case $ac_lo in > ?*) ac_cv_sizeof_int=$ac_lo;; >-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5 >-echo "$as_me: error: cannot compute sizeof (int), 77" >&2;} >+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot compute sizeof (int), 77 >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } ;; > esac > else > if test "$cross_compiling" = yes; then >- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 >-echo "$as_me: error: cannot run test program while cross compiling" >&2;} >+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot run test program while cross compiling >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > long longval () { return (long) (sizeof (int)); } > unsigned long ulongval () { return (long) (sizeof (int)); } > #include <stdio.h> > #include <stdlib.h> >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23816,13 +24686,16 @@ > else > echo "$as_me: program exited with status $ac_status" >&5 > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ( exit $ac_status ) >-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5 >-echo "$as_me: error: cannot compute sizeof (int), 77" >&2;} >+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot compute sizeof (int), 77 >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi >-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext >+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext > fi > fi > rm -f conftest.val >@@ -23843,14 +24716,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23877,7 +24748,8 @@ > ac_cv_type_long=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_type_long=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -23899,14 +24771,12 @@ > # Depending upon the size, compute the lo and hi bounds. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23933,14 +24803,12 @@ > while :; do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -23966,7 +24834,8 @@ > ac_hi=$ac_mid; break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_lo=`expr $ac_mid + 1` > if test $ac_lo -le $ac_mid; then > ac_lo= ac_hi= >@@ -23978,17 +24847,16 @@ > done > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24015,14 +24883,12 @@ > while :; do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24048,7 +24914,8 @@ > ac_lo=$ac_mid; break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_hi=`expr '(' $ac_mid ')' - 1` > if test $ac_mid -le $ac_hi; then > ac_lo= ac_hi= >@@ -24060,7 +24927,8 @@ > done > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_lo= ac_hi= > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -24071,14 +24939,12 @@ > ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24104,37 +24970,40 @@ > ac_hi=$ac_mid > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_lo=`expr '(' $ac_mid ')' + 1` > fi > rm -f conftest.$ac_objext conftest.$ac_ext > done > case $ac_lo in > ?*) ac_cv_sizeof_long=$ac_lo;; >-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5 >-echo "$as_me: error: cannot compute sizeof (long), 77" >&2;} >+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot compute sizeof (long), 77 >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } ;; > esac > else > if test "$cross_compiling" = yes; then >- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 >-echo "$as_me: error: cannot run test program while cross compiling" >&2;} >+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot run test program while cross compiling >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > long longval () { return (long) (sizeof (long)); } > unsigned long ulongval () { return (long) (sizeof (long)); } > #include <stdio.h> > #include <stdlib.h> >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24177,13 +25046,16 @@ > else > echo "$as_me: program exited with status $ac_status" >&5 > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ( exit $ac_status ) >-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5 >-echo "$as_me: error: cannot compute sizeof (long), 77" >&2;} >+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot compute sizeof (long), 77 >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi >-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext >+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext > fi > fi > rm -f conftest.val >@@ -24204,14 +25076,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24238,7 +25108,8 @@ > ac_cv_type_char_p=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_type_char_p=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -24260,14 +25131,12 @@ > # Depending upon the size, compute the lo and hi bounds. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24294,14 +25163,12 @@ > while :; do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24327,7 +25194,8 @@ > ac_hi=$ac_mid; break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_lo=`expr $ac_mid + 1` > if test $ac_lo -le $ac_mid; then > ac_lo= ac_hi= >@@ -24339,17 +25207,16 @@ > done > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24376,14 +25243,12 @@ > while :; do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24409,7 +25274,8 @@ > ac_lo=$ac_mid; break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_hi=`expr '(' $ac_mid ')' - 1` > if test $ac_mid -le $ac_hi; then > ac_lo= ac_hi= >@@ -24421,7 +25287,8 @@ > done > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_lo= ac_hi= > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -24432,14 +25299,12 @@ > ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24465,37 +25330,40 @@ > ac_hi=$ac_mid > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_lo=`expr '(' $ac_mid ')' + 1` > fi > rm -f conftest.$ac_objext conftest.$ac_ext > done > case $ac_lo in > ?*) ac_cv_sizeof_char_p=$ac_lo;; >-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77" >&5 >-echo "$as_me: error: cannot compute sizeof (char *), 77" >&2;} >+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot compute sizeof (char *), 77 >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } ;; > esac > else > if test "$cross_compiling" = yes; then >- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 >-echo "$as_me: error: cannot run test program while cross compiling" >&2;} >+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot run test program while cross compiling >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > long longval () { return (long) (sizeof (char *)); } > unsigned long ulongval () { return (long) (sizeof (char *)); } > #include <stdio.h> > #include <stdlib.h> >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24538,13 +25406,16 @@ > else > echo "$as_me: program exited with status $ac_status" >&5 > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ( exit $ac_status ) >-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77" >&5 >-echo "$as_me: error: cannot compute sizeof (char *), 77" >&2;} >+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot compute sizeof (char *), 77 >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi >-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext >+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext > fi > fi > rm -f conftest.val >@@ -24565,14 +25436,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24599,7 +25468,8 @@ > ac_cv_type_char=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_type_char=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -24621,14 +25491,12 @@ > # Depending upon the size, compute the lo and hi bounds. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24655,14 +25523,12 @@ > while :; do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24688,7 +25554,8 @@ > ac_hi=$ac_mid; break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_lo=`expr $ac_mid + 1` > if test $ac_lo -le $ac_mid; then > ac_lo= ac_hi= >@@ -24700,17 +25567,16 @@ > done > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24737,14 +25603,12 @@ > while :; do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24770,7 +25634,8 @@ > ac_lo=$ac_mid; break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_hi=`expr '(' $ac_mid ')' - 1` > if test $ac_mid -le $ac_hi; then > ac_lo= ac_hi= >@@ -24782,7 +25647,8 @@ > done > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_lo= ac_hi= > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -24793,14 +25659,12 @@ > ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24826,37 +25690,40 @@ > ac_hi=$ac_mid > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_lo=`expr '(' $ac_mid ')' + 1` > fi > rm -f conftest.$ac_objext conftest.$ac_ext > done > case $ac_lo in > ?*) ac_cv_sizeof_char=$ac_lo;; >-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77" >&5 >-echo "$as_me: error: cannot compute sizeof (char), 77" >&2;} >+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot compute sizeof (char), 77 >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } ;; > esac > else > if test "$cross_compiling" = yes; then >- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 >-echo "$as_me: error: cannot run test program while cross compiling" >&2;} >+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot run test program while cross compiling >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > long longval () { return (long) (sizeof (char)); } > unsigned long ulongval () { return (long) (sizeof (char)); } > #include <stdio.h> > #include <stdlib.h> >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24899,13 +25766,16 @@ > else > echo "$as_me: program exited with status $ac_status" >&5 > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ( exit $ac_status ) >-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77" >&5 >-echo "$as_me: error: cannot compute sizeof (char), 77" >&2;} >+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot compute sizeof (char), 77 >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi >-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext >+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext > fi > fi > rm -f conftest.val >@@ -24930,7 +25800,11 @@ > LIBS="-ldl $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -24939,12 +25813,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dlopen (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -24968,7 +25836,8 @@ > ac_cv_lib_dl_dlopen=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dl_dlopen=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -24993,7 +25862,11 @@ > LIBS="-ldld $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -25002,12 +25875,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char shl_unload (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -25031,7 +25898,8 @@ > ac_cv_lib_dld_shl_unload=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_dld_shl_unload=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -25065,37 +25933,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char $ac_func (); below. */ >-#include <assert.h> >+ which can conflict with char $ac_func (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char $ac_func (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_$ac_func) || defined (__stub___$ac_func) > choke me > #else >-f = $ac_func; >+char (*f) () = $ac_func; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != $ac_func; > ; > return 0; > } >@@ -25115,7 +25990,8 @@ > eval "$as_ac_var=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > eval "$as_ac_var=no" > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -25197,13 +26073,17 @@ > # First, try using that file with no special directory specified. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <$x_direct_test_include> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -25221,7 +26101,8 @@ > ac_x_includes= > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Look for the header file in a standard set of common directories. > # Check X11 before X11Rn because it is often a symlink to the current release. > for ac_dir in \ >@@ -25281,14 +26162,12 @@ > LIBS="-l$x_direct_test_library $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -25314,7 +26193,8 @@ > ac_x_libraries= > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > LIBS="$ac_save_LIBS" > # First see if replacing the include by lib works. > # Check X11 before X11Rn because it is often a symlink to the current release. >@@ -25494,7 +26374,11 @@ > LIBS="-lICE $X_EXTRA_LIBS $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -25503,12 +26387,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char IceConnectionNumber (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -25532,7 +26410,8 @@ > ac_cv_lib_ICE_IceConnectionNumber=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_ICE_IceConnectionNumber=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -25566,19 +26445,17 @@ > > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > #include <stdio.h> > #ifdef STDC_HEADERS > # include <stdlib.h> > #endif > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -25604,7 +26481,8 @@ > kde_cv_have_libXext=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > kde_cv_have_libXext=no > > fi >@@ -25661,15 +26539,13 @@ > > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <X11/Xlib.h> > #include <X11/extensions/Xinerama.h> >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -25693,7 +26569,8 @@ > ac_cv_have_xinerama="yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_have_xinerama="no" > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -25840,7 +26717,11 @@ > LIBS="-lpthread $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -25849,12 +26730,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char pthread_create (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -25878,7 +26753,8 @@ > ac_cv_lib_pthread_pthread_create=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_pthread_pthread_create=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -25924,7 +26800,11 @@ > echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <$ac_header> > _ACEOF >@@ -25943,7 +26823,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -25955,13 +26836,17 @@ > echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <$ac_header> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -25978,7 +26863,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -25991,14 +26877,32 @@ > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 > echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for $ac_header" >&5 > echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >@@ -26034,7 +26938,11 @@ > LIBS="-llthread $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -26043,12 +26951,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char pthread_join (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -26072,7 +26974,8 @@ > ac_cv_lib_lthread_pthread_join=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_lthread_pthread_join=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -26115,14 +27018,12 @@ > CXXFLAGS="$CXXFLAGS -pthread" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -26146,7 +27047,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -26201,14 +27103,12 @@ > CXXFLAGS="$CXXFLAGS -mt" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -26232,7 +27132,8 @@ > eval "kde_cv_prog_cxx_$kde_cache=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext > CXXFLAGS="$save_CXXFLAGS" >@@ -26364,16 +27265,14 @@ > CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > #include<zlib.h> > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -26397,7 +27296,8 @@ > eval "ac_cv_lib_z='-lz'" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > eval "ac_cv_lib_z=no" > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -26448,16 +27348,14 @@ > > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > #include<png.h> > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -26485,7 +27383,8 @@ > eval "ac_cv_lib_png='-lpng $LIBZ -lm'" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > eval "ac_cv_lib_png=no" > > fi >@@ -26531,7 +27430,11 @@ > CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* Override any gcc2 internal prototype to avoid an error. */ > struct jpeg_decompress_struct; > typedef struct jpeg_decompress_struct * j_decompress_ptr; >@@ -26547,12 +27450,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -26576,7 +27473,8 @@ > eval "ac_cv_lib_jpeg_6b=-ljpeg6b" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > eval "ac_cv_lib_jpeg_6b=no" > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -26612,7 +27510,11 @@ > CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* Override any gcc2 internal prototype to avoid an error. */ > struct jpeg_decompress_struct; > typedef struct jpeg_decompress_struct * j_decompress_ptr; >@@ -26628,12 +27530,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -26657,7 +27553,8 @@ > eval "ac_cv_lib_jpeg_normal=-ljpeg" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > eval "ac_cv_lib_jpeg_normal=no" > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -26693,7 +27590,7 @@ > do > for j in jpeglib.h; > do >- echo "configure: 26696: $i/$j" >&5 >+ echo "configure: 27593: $i/$j" >&5 > if test -r "$i/$j"; then > echo "taking that" >&5 > jpeg_incdir=$i >@@ -26931,7 +27828,7 @@ > do > for j in $kde_qt_header; > do >- echo "configure: 26934: $i/$j" >&5 >+ echo "configure: 27831: $i/$j" >&5 > if test -r "$i/$j"; then > echo "taking that" >&5 > qt_incdir=$i >@@ -27566,14 +28463,12 @@ > CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <qapplication.h> >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -27600,7 +28495,8 @@ > eval "kde_cv_qt_jpeg=no" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > eval "kde_cv_qt_jpeg=yes" > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -27724,7 +28620,7 @@ > do > for j in $kde_check_header; > do >- echo "configure: 27727: $i/$j" >&5 >+ echo "configure: 28623: $i/$j" >&5 > if test -r "$i/$j"; then > echo "taking that" >&5 > kde_incdir=$i >@@ -27754,7 +28650,7 @@ > do > for j in $kde_check_lib; > do >- echo "configure: 27757: $i/$j" >&5 >+ echo "configure: 28653: $i/$j" >&5 > if test -r "$i/$j"; then > echo "taking that" >&5 > kde_libdir=$i >@@ -27772,7 +28668,7 @@ > do > for j in "kde3/plugins/designer/kdewidgets.la"; > do >- echo "configure: 27775: $i/$j" >&5 >+ echo "configure: 28671: $i/$j" >&5 > if test -r "$i/$j"; then > echo "taking that" >&5 > kde_widgetdir=$i >@@ -28932,7 +29828,7 @@ > do > for j in apps/ksgmltools2/customization/kde-chunk.xsl; > do >- echo "configure: 28935: $i/$j" >&5 >+ echo "configure: 29831: $i/$j" >&5 > if test -r "$i/$j"; then > echo "taking that" >&5 > KDE_XSL_STYLESHEET=$i >@@ -29100,7 +29996,11 @@ > LIBS="-ljpeg $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -29109,12 +30009,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char jpeg_start_decompress (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -29138,7 +30032,8 @@ > ac_cv_lib_jpeg_jpeg_start_decompress=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_jpeg_jpeg_start_decompress=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -29171,7 +30066,11 @@ > LIBS="-lpng $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -29180,12 +30079,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char png_create_info_struct (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -29209,7 +30102,8 @@ > ac_cv_lib_png_png_create_info_struct=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_png_png_create_info_struct=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -29240,48 +30134,59 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdlib.h> > #include <stdarg.h> > #include <string.h> > #include <float.h> > >+int >+main () >+{ >+ >+ ; >+ return 0; >+} > _ACEOF >-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 >- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 >+rm -f conftest.$ac_objext >+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >+ (eval $ac_compile) 2>&5 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >- rm -f conftest.er1 >- cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } >/dev/null; then >- if test -s conftest.err; then >- ac_cpp_err=$ac_c_preproc_warn_flag >- else >- ac_cpp_err= >- fi >-else >- ac_cpp_err=yes >-fi >-if test -z "$ac_cpp_err"; then >+ (exit $ac_status); } && >+ { ac_try='test -s conftest.$ac_objext' >+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >+ (eval $ac_try) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); }; }; then > ac_cv_header_stdc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >- ac_cv_header_stdc=no >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+ac_cv_header_stdc=no > fi >-rm -f conftest.err conftest.$ac_ext >+rm -f conftest.$ac_objext conftest.$ac_ext > > if test $ac_cv_header_stdc = yes; then > # SunOS 4.x string.h does not declare mem*, contrary to ANSI. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <string.h> > > _ACEOF > if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | >- egrep "memchr" >/dev/null 2>&1; then >+ $EGREP "memchr" >/dev/null 2>&1; then > : > else > ac_cv_header_stdc=no >@@ -29294,12 +30199,16 @@ > # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdlib.h> > > _ACEOF > if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | >- egrep "free" >/dev/null 2>&1; then >+ $EGREP "free" >/dev/null 2>&1; then > : > else > ac_cv_header_stdc=no >@@ -29315,13 +30224,18 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ctype.h> > #if ((' ' & 0x0FF) == 0x020) > # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') > # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) > #else >-# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ >+# define ISLOWER(c) \ >+ (('a' <= (c) && (c) <= 'i') \ > || ('j' <= (c) && (c) <= 'r') \ > || ('s' <= (c) && (c) <= 'z')) > # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) >@@ -29354,11 +30268,12 @@ > else > echo "$as_me: program exited with status $ac_status" >&5 > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ( exit $ac_status ) > ac_cv_header_stdc=no > fi >-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext >+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext > fi > fi > fi >@@ -29397,7 +30312,11 @@ > echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <$ac_header> > _ACEOF >@@ -29416,7 +30335,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -29428,13 +30348,17 @@ > echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <$ac_header> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -29451,7 +30375,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -29464,14 +30389,32 @@ > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 > echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for $ac_header" >&5 > echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >@@ -29501,16 +30444,14 @@ > # See if sys/param.h defines the BYTE_ORDER macro. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <sys/types.h> > #include <sys/param.h> > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -29537,16 +30478,14 @@ > # It does; now see whether it defined to BIG_ENDIAN or not. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <sys/types.h> > #include <sys/param.h> > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -29573,32 +30512,32 @@ > ac_cv_c_bigendian=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_c_bigendian=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # It does not; compile a test program. > if test "$cross_compiling" = yes; then >- # try to guess the endianess by grep'ing values into an object file >+ # try to guess the endianness by grepping values into an object file > ac_cv_c_bigendian=unknown > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; > short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; > void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } > short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; > short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; > void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -29619,10 +30558,10 @@ > ac_status=$? > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); }; }; then >- if fgrep BIGenDianSyS conftest.$ac_objext >/dev/null ; then >+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then > ac_cv_c_bigendian=yes > fi >-if fgrep LiTTleEnDian conftest.$ac_objext >/dev/null ; then >+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then > if test "$ac_cv_c_bigendian" = unknown; then > ac_cv_c_bigendian=no > else >@@ -29632,13 +30571,18 @@ > fi > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest.$ac_ext > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > int > main () > { >@@ -29667,11 +30611,12 @@ > else > echo "$as_me: program exited with status $ac_status" >&5 > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ( exit $ac_status ) > ac_cv_c_bigendian=yes > fi >-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext >+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext > fi > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -29688,9 +30633,9 @@ > no) > ;; > *) >- { { echo "$as_me:$LINENO: error: unknown endianess >+ { { echo "$as_me:$LINENO: error: unknown endianness > presetting ac_cv_c_bigendian=no (or yes) will help" >&5 >-echo "$as_me: error: unknown endianess >+echo "$as_me: error: unknown endianness > presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} > { (exit 1); exit 1; }; } ;; > esac >@@ -29810,55 +30755,55 @@ > > > >-ac_config_files="$ac_config_files Makefile" >+ ac_config_files="$ac_config_files Makefile" > >-ac_config_files="$ac_config_files src/Makefile" >+ ac_config_files="$ac_config_files src/Makefile" > >-ac_config_files="$ac_config_files src/celutil/Makefile" >+ ac_config_files="$ac_config_files src/celutil/Makefile" > >-ac_config_files="$ac_config_files src/celmath/Makefile" >+ ac_config_files="$ac_config_files src/celmath/Makefile" > >-ac_config_files="$ac_config_files src/cel3ds/Makefile" >+ ac_config_files="$ac_config_files src/cel3ds/Makefile" > >-ac_config_files="$ac_config_files src/celtxf/Makefile" >+ ac_config_files="$ac_config_files src/celtxf/Makefile" > >-ac_config_files="$ac_config_files src/celengine/Makefile" >+ ac_config_files="$ac_config_files src/celengine/Makefile" > >-ac_config_files="$ac_config_files src/celestia/Makefile" >+ ac_config_files="$ac_config_files src/celestia/Makefile" > >-ac_config_files="$ac_config_files data/Makefile" >+ ac_config_files="$ac_config_files data/Makefile" > >-ac_config_files="$ac_config_files extras/Makefile" >+ ac_config_files="$ac_config_files extras/Makefile" > >-ac_config_files="$ac_config_files textures/Makefile" >+ ac_config_files="$ac_config_files textures/Makefile" > >-ac_config_files="$ac_config_files textures/lores/Makefile" >+ ac_config_files="$ac_config_files textures/lores/Makefile" > >-ac_config_files="$ac_config_files textures/medres/Makefile" >+ ac_config_files="$ac_config_files textures/medres/Makefile" > >-ac_config_files="$ac_config_files textures/hires/Makefile" >+ ac_config_files="$ac_config_files textures/hires/Makefile" > >-ac_config_files="$ac_config_files models/Makefile" >+ ac_config_files="$ac_config_files models/Makefile" > >-ac_config_files="$ac_config_files shaders/Makefile" >+ ac_config_files="$ac_config_files shaders/Makefile" > >-ac_config_files="$ac_config_files fonts/Makefile" >+ ac_config_files="$ac_config_files fonts/Makefile" > >-ac_config_files="$ac_config_files src/celestia/res/Makefile" >+ ac_config_files="$ac_config_files src/celestia/res/Makefile" > >-ac_config_files="$ac_config_files macros/Makefile" >+ ac_config_files="$ac_config_files macros/Makefile" > >-ac_config_files="$ac_config_files manual/Makefile" >+ ac_config_files="$ac_config_files manual/Makefile" > >-ac_config_files="$ac_config_files src/celestia/kde/Makefile" >+ ac_config_files="$ac_config_files src/celestia/kde/Makefile" > >-ac_config_files="$ac_config_files src/celestia/kde/po/Makefile" >+ ac_config_files="$ac_config_files src/celestia/kde/po/Makefile" > >-ac_config_files="$ac_config_files src/celestia/kde/data/Makefile" >+ ac_config_files="$ac_config_files src/celestia/kde/data/Makefile" > >-ac_config_files="$ac_config_files src/celestia/kde/doc/Makefile" >+ ac_config_files="$ac_config_files src/celestia/kde/doc/Makefile" > >-ac_config_files="$ac_config_files src/celestia/kde/doc/celestia/Makefile" >+ ac_config_files="$ac_config_files src/celestia/kde/doc/celestia/Makefile" > > cat >confcache <<\_ACEOF > # This file is a shell script that caches the results of configure >@@ -29870,7 +30815,7 @@ > # config.status only pays attention to the cache file if you give it > # the --recheck option to rerun configure. > # >-# `ac_cv_env_foo' variables (set or unset) will be overriden when >+# `ac_cv_env_foo' variables (set or unset) will be overridden when > # loading this file, other *unset* `ac_cv_foo' will be assigned the > # following values. > >@@ -29905,7 +30850,7 @@ > t end > /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ > : end' >>confcache >-if cmp -s $cache_file confcache; then :; else >+if diff $cache_file confcache >/dev/null 2>&1; then :; else > if test -w $cache_file; then > test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" > cat confcache >$cache_file >@@ -29936,6 +30881,21 @@ > > DEFS=-DHAVE_CONFIG_H > >+ac_libobjs= >+ac_ltlibobjs= >+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue >+ # 1. Remove the extension, and $U if already installed. >+ ac_i=`echo "$ac_i" | >+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'` >+ # 2. Add them. >+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" >+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' >+done >+LIBOBJS=$ac_libobjs >+ >+LTLIBOBJS=$ac_ltlibobjs >+ >+ > if test -z "${INSIDE_GNOME_COMMON_TRUE}" && test -z "${INSIDE_GNOME_COMMON_FALSE}"; then > { { echo "$as_me:$LINENO: error: conditional \"INSIDE_GNOME_COMMON\" was never defined. > Usually this means the macro was only invoked conditionally." >&5 >@@ -29950,6 +30910,34 @@ > Usually this means the macro was only invoked conditionally." >&2;} > { (exit 1); exit 1; }; } > fi >+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then >+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. >+Usually this means the macro was only invoked conditionally." >&5 >+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. >+Usually this means the macro was only invoked conditionally." >&2;} >+ { (exit 1); exit 1; }; } >+fi >+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then >+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. >+Usually this means the macro was only invoked conditionally." >&5 >+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. >+Usually this means the macro was only invoked conditionally." >&2;} >+ { (exit 1); exit 1; }; } >+fi >+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then >+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. >+Usually this means the macro was only invoked conditionally." >&5 >+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. >+Usually this means the macro was only invoked conditionally." >&2;} >+ { (exit 1); exit 1; }; } >+fi >+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then >+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. >+Usually this means the macro was only invoked conditionally." >&5 >+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. >+Usually this means the macro was only invoked conditionally." >&2;} >+ { (exit 1); exit 1; }; } >+fi > if test -z "${ENABLE_GLUT_TRUE}" && test -z "${ENABLE_GLUT_FALSE}"; then > { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GLUT\" was never defined. > Usually this means the macro was only invoked conditionally." >&5 >@@ -29999,11 +30987,12 @@ > # configure, is in config.log if it exists. > > debug=false >+ac_cs_recheck=false >+ac_cs_silent=false > SHELL=\${CONFIG_SHELL-$SHELL} > _ACEOF > > cat >>$CONFIG_STATUS <<\_ACEOF >- > ## --------------------- ## > ## M4sh Initialization. ## > ## --------------------- ## >@@ -30012,11 +31001,13 @@ > if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then > emulate sh > NULLCMD=: >+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which >+ # is contrary to our usage. Disable this feature. >+ alias -g '${1+"$@"}'='"$@"' > elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then > set -o posix > fi > >-# NLS nuisances. > # Support unset when possible. > if (FOO=FOO; unset FOO) >/dev/null 2>&1; then > as_unset=unset >@@ -30024,34 +31015,42 @@ > as_unset=false > fi > >-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && >- { $as_unset LANG || test "${LANG+set}" != set; } || >- { LANG=C; export LANG; } >-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && >- { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || >- { LC_ALL=C; export LC_ALL; } >-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && >- { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || >- { LC_TIME=C; export LC_TIME; } >-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && >- { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || >- { LC_CTYPE=C; export LC_CTYPE; } >-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && >- { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || >- { LANGUAGE=C; export LANGUAGE; } >-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && >- { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || >- { LC_COLLATE=C; export LC_COLLATE; } >-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && >- { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || >- { LC_NUMERIC=C; export LC_NUMERIC; } >-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && >- { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || >- { LC_MESSAGES=C; export LC_MESSAGES; } >+ >+# Work around bugs in pre-3.0 UWIN ksh. >+$as_unset ENV MAIL MAILPATH >+PS1='$ ' >+PS2='> ' >+PS4='+ ' >+ >+# NLS nuisances. >+for as_var in \ >+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ >+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ >+ LC_TELEPHONE LC_TIME >+do >+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then >+ eval $as_var=C; export $as_var >+ else >+ $as_unset $as_var >+ fi >+done >+ >+# Required to use basename. >+if expr a : '\(a\)' >/dev/null 2>&1; then >+ as_expr=expr >+else >+ as_expr=false >+fi >+ >+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then >+ as_basename=basename >+else >+ as_basename=false >+fi > > > # Name of the executable. >-as_me=`(basename "$0") 2>/dev/null || >+as_me=`$as_basename "$0" || > $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ > X"$0" : 'X\(//\)$' \| \ > X"$0" : 'X\(/\)$' \| \ >@@ -30062,6 +31061,7 @@ > /^X\/\(\/\).*/{ s//\1/; q; } > s/.*/./; q'` > >+ > # PATH needs CR, and LINENO needs CR and PATH. > # Avoid depending upon Character Ranges. > as_cr_letters='abcdefghijklmnopqrstuvwxyz' >@@ -30072,15 +31072,15 @@ > > # The user is always right. > if test "${PATH_SEPARATOR+set}" != set; then >- echo "#! /bin/sh" >conftest.sh >- echo "exit 0" >>conftest.sh >- chmod +x conftest.sh >- if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then >+ echo "#! /bin/sh" >conf$$.sh >+ echo "exit 0" >>conf$$.sh >+ chmod +x conf$$.sh >+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then > PATH_SEPARATOR=';' > else > PATH_SEPARATOR=: > fi >- rm -f conftest.sh >+ rm -f conf$$.sh > fi > > >@@ -30129,6 +31129,8 @@ > as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` > test "x$as_lineno_1" != "x$as_lineno_2" && > test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then >+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } >+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } > CONFIG_SHELL=$as_dir/$as_base > export CONFIG_SHELL > exec "$CONFIG_SHELL" "$0" ${1+"$@"} >@@ -30202,6 +31204,12 @@ > fi > rm -f conf$$ conf$$.exe conf$$.file > >+if mkdir -p . 2>/dev/null; then >+ as_mkdir_p=: >+else >+ as_mkdir_p=false >+fi >+ > as_executable_p="test -f" > > # Sed expression to map a string onto a valid CPP name. >@@ -30218,7 +31226,7 @@ > IFS=" $as_nl" > > # CDPATH. >-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } >+$as_unset CDPATH > > exec 6>&1 > >@@ -30235,7 +31243,7 @@ > cat >&5 <<_CSEOF > > This file was extended by $as_me, which was >-generated by GNU Autoconf 2.53. Invocation command line was >+generated by GNU Autoconf 2.57. Invocation command line was > > CONFIG_FILES = $CONFIG_FILES > CONFIG_HEADERS = $CONFIG_HEADERS >@@ -30275,6 +31283,7 @@ > > -h, --help print this help, then exit > -V, --version print version number, then exit >+ -q, --quiet do not print progress messages > -d, --debug don't remove temporary files > --recheck update $as_me by reconfiguring in the same conditions > --file=FILE[:TEMPLATE] >@@ -30297,7 +31306,7 @@ > cat >>$CONFIG_STATUS <<_ACEOF > ac_cs_version="\\ > config.status >-configured by $0, generated by GNU Autoconf 2.53, >+configured by $0, generated by GNU Autoconf 2.57, > with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" > > Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 >@@ -30318,25 +31327,25 @@ > --*=*) > ac_option=`expr "x$1" : 'x\([^=]*\)='` > ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` >- shift >- set dummy "$ac_option" "$ac_optarg" ${1+"$@"} >- shift >+ ac_shift=: >+ ;; >+ -*) >+ ac_option=$1 >+ ac_optarg=$2 >+ ac_shift=shift > ;; >- -*);; > *) # This is not an option, so the user has probably given explicit > # arguments. >+ ac_option=$1 > ac_need_defaults=false;; > esac > >- case $1 in >+ case $ac_option in > # Handling of the options. > _ACEOF >-cat >>$CONFIG_STATUS <<_ACEOF >- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) >- echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" >- exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; >-_ACEOF > cat >>$CONFIG_STATUS <<\_ACEOF >+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) >+ ac_cs_recheck=: ;; > --version | --vers* | -V ) > echo "$ac_cs_version"; exit 0 ;; > --he | --h) >@@ -30351,13 +31360,16 @@ > --debug | --d* | -d ) > debug=: ;; > --file | --fil | --fi | --f ) >- shift >- CONFIG_FILES="$CONFIG_FILES $1" >+ $ac_shift >+ CONFIG_FILES="$CONFIG_FILES $ac_optarg" > ac_need_defaults=false;; > --header | --heade | --head | --hea ) >- shift >- CONFIG_HEADERS="$CONFIG_HEADERS $1" >+ $ac_shift >+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" > ac_need_defaults=false;; >+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ >+ | -silent | --silent | --silen | --sile | --sil | --si | --s) >+ ac_cs_silent=: ;; > > # This is an error. > -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 >@@ -30372,6 +31384,20 @@ > shift > done > >+ac_configure_extra_args= >+ >+if $ac_cs_silent; then >+ exec 6>/dev/null >+ ac_configure_extra_args="$ac_configure_extra_args --silent" >+fi >+ >+_ACEOF >+cat >>$CONFIG_STATUS <<_ACEOF >+if \$ac_cs_recheck; then >+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 >+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion >+fi >+ > _ACEOF > > cat >>$CONFIG_STATUS <<_ACEOF >@@ -30433,6 +31459,9 @@ > test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands > fi > >+# Have a temporary directory for convenience. Make it in the build tree >+# simply because there is no reason to put it here, and in addition, >+# creating and moving files from /tmp can sometimes cause problems. > # Create a temporary directory, and hook for its removal unless debugging. > $debug || > { >@@ -30441,17 +31470,17 @@ > } > > # Create a (secure) tmp directory for tmp files. >-: ${TMPDIR=/tmp} >+ > { >- tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && >+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && > test -n "$tmp" && test -d "$tmp" > } || > { >- tmp=$TMPDIR/cs$$-$RANDOM >+ tmp=./confstat$$-$RANDOM > (umask 077 && mkdir $tmp) > } || > { >- echo "$me: cannot create a temporary directory in $TMPDIR" >&2 >+ echo "$me: cannot create a temporary directory in ." >&2 > { (exit 1); exit 1; } > } > >@@ -30516,6 +31545,7 @@ > s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t > s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t > s,@INSTALL_DATA@,$INSTALL_DATA,;t t >+s,@CYGPATH_W@,$CYGPATH_W,;t t > s,@PACKAGE@,$PACKAGE,;t t > s,@VERSION@,$VERSION,;t t > s,@ACLOCAL@,$ACLOCAL,;t t >@@ -30530,6 +31560,7 @@ > s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t > s,@AWK@,$AWK,;t t > s,@SET_MAKE@,$SET_MAKE,;t t >+s,@am__leading_dot@,$am__leading_dot,;t t > s,@CC@,$CC,;t t > s,@CFLAGS@,$CFLAGS,;t t > s,@LDFLAGS@,$LDFLAGS,;t t >@@ -30544,16 +31575,21 @@ > s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t > s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t > s,@CCDEPMODE@,$CCDEPMODE,;t t >+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t >+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t > s,@CXX@,$CXX,;t t > s,@CXXFLAGS@,$CXXFLAGS,;t t > s,@ac_ct_CXX@,$ac_ct_CXX,;t t > s,@CXXDEPMODE@,$CXXDEPMODE,;t t >+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t >+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t > s,@CPP@,$CPP,;t t > s,@CXXCPP@,$CXXCPP,;t t > s,@LN_S@,$LN_S,;t t > s,@ECHO@,$ECHO,;t t > s,@RANLIB@,$RANLIB,;t t > s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t >+s,@EGREP@,$EGREP,;t t > s,@LIBTOOL@,$LIBTOOL,;t t > s,@GTK_CONFIG@,$GTK_CONFIG,;t t > s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t >@@ -30694,6 +31730,8 @@ > s,@ENABLE_HIPPARCOS_FALSE@,$ENABLE_HIPPARCOS_FALSE,;t t > s,@ENABLE_CELX_TRUE@,$ENABLE_CELX_TRUE,;t t > s,@ENABLE_CELX_FALSE@,$ENABLE_CELX_FALSE,;t t >+s,@LIBOBJS@,$LIBOBJS,;t t >+s,@LTLIBOBJS@,$LTLIBOBJS,;t t > CEOF > > _ACEOF >@@ -30764,25 +31802,30 @@ > /^X\(\/\/\)$/{ s//\1/; q; } > /^X\(\/\).*/{ s//\1/; q; } > s/.*/./; q'` >- { case "$ac_dir" in >- [\\/]* | ?:[\\/]* ) as_incr_dir=;; >- *) as_incr_dir=.;; >-esac >-as_dummy="$ac_dir" >-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do >- case $as_mkdir_dir in >- # Skip DOS drivespec >- ?:) as_incr_dir=$as_mkdir_dir ;; >- *) >- as_incr_dir=$as_incr_dir/$as_mkdir_dir >- test -d "$as_incr_dir" || >- mkdir "$as_incr_dir" || >- { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 >-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} >- { (exit 1); exit 1; }; } >- ;; >- esac >-done; } >+ { if $as_mkdir_p; then >+ mkdir -p "$ac_dir" >+ else >+ as_dir="$ac_dir" >+ as_dirs= >+ while test ! -d "$as_dir"; do >+ as_dirs="$as_dir $as_dirs" >+ as_dir=`(dirname "$as_dir") 2>/dev/null || >+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ >+ X"$as_dir" : 'X\(//\)[^/]' \| \ >+ X"$as_dir" : 'X\(//\)$' \| \ >+ X"$as_dir" : 'X\(/\)' \| \ >+ . : '\(.\)' 2>/dev/null || >+echo X"$as_dir" | >+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } >+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } >+ /^X\(\/\/\)$/{ s//\1/; q; } >+ /^X\(\/\).*/{ s//\1/; q; } >+ s/.*/./; q'` >+ done >+ test ! -n "$as_dirs" || mkdir $as_dirs >+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 >+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} >+ { (exit 1); exit 1; }; }; } > > ac_builddir=. > >@@ -30812,7 +31855,7 @@ > # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be > # absolute. > ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` >-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` >+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` > ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` > ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` > >@@ -31002,7 +32045,7 @@ > # Break up conftest.defines because some shells have a limit on the size > # of here documents, and old seds have small limits too (100 cmds). > echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS >-echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS >+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS > echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS > echo ' :' >>$CONFIG_STATUS > rm -f conftest.tail >@@ -31026,7 +32069,7 @@ > mv conftest.tail conftest.defines > done > rm -f conftest.defines >-echo ' fi # egrep' >>$CONFIG_STATUS >+echo ' fi # grep' >>$CONFIG_STATUS > echo >>$CONFIG_STATUS > > # Break up conftest.undefs because some shells have a limit on the size >@@ -31066,7 +32109,7 @@ > cat $tmp/in >>$tmp/config.h > rm -f $tmp/in > if test x"$ac_file" != x-; then >- if cmp -s $ac_file $tmp/config.h 2>/dev/null; then >+ if diff $ac_file $tmp/config.h >/dev/null 2>&1; then > { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 > echo "$as_me: $ac_file is unchanged" >&6;} > else >@@ -31082,25 +32125,30 @@ > /^X\(\/\/\)$/{ s//\1/; q; } > /^X\(\/\).*/{ s//\1/; q; } > s/.*/./; q'` >- { case "$ac_dir" in >- [\\/]* | ?:[\\/]* ) as_incr_dir=;; >- *) as_incr_dir=.;; >-esac >-as_dummy="$ac_dir" >-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do >- case $as_mkdir_dir in >- # Skip DOS drivespec >- ?:) as_incr_dir=$as_mkdir_dir ;; >- *) >- as_incr_dir=$as_incr_dir/$as_mkdir_dir >- test -d "$as_incr_dir" || >- mkdir "$as_incr_dir" || >- { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 >-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} >- { (exit 1); exit 1; }; } >- ;; >- esac >-done; } >+ { if $as_mkdir_p; then >+ mkdir -p "$ac_dir" >+ else >+ as_dir="$ac_dir" >+ as_dirs= >+ while test ! -d "$as_dir"; do >+ as_dirs="$as_dir $as_dirs" >+ as_dir=`(dirname "$as_dir") 2>/dev/null || >+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ >+ X"$as_dir" : 'X\(//\)[^/]' \| \ >+ X"$as_dir" : 'X\(//\)$' \| \ >+ X"$as_dir" : 'X\(/\)' \| \ >+ . : '\(.\)' 2>/dev/null || >+echo X"$as_dir" | >+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } >+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } >+ /^X\(\/\/\)$/{ s//\1/; q; } >+ /^X\(\/\).*/{ s//\1/; q; } >+ s/.*/./; q'` >+ done >+ test ! -n "$as_dirs" || mkdir $as_dirs >+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 >+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} >+ { (exit 1); exit 1; }; }; } > > rm -f $ac_file > mv $tmp/config.h $ac_file >@@ -31109,13 +32157,29 @@ > cat $tmp/config.h > rm -f $tmp/config.h > fi >- # Run the commands associated with the file. >- case $ac_file in >- config.h ) # update the timestamp >-echo 'timestamp for config.h' >"./stamp-h1" >- ;; >+# Compute $ac_file's index in $config_headers. >+_am_stamp_count=1 >+for _am_header in $config_headers :; do >+ case $_am_header in >+ $ac_file | $ac_file:* ) >+ break ;; >+ * ) >+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; > esac > done >+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || >+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ >+ X$ac_file : 'X\(//\)[^/]' \| \ >+ X$ac_file : 'X\(//\)$' \| \ >+ X$ac_file : 'X\(/\)' \| \ >+ . : '\(.\)' 2>/dev/null || >+echo X$ac_file | >+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } >+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } >+ /^X\(\/\/\)$/{ s//\1/; q; } >+ /^X\(\/\).*/{ s//\1/; q; } >+ s/.*/./; q'`/stamp-h$_am_stamp_count >+done > _ACEOF > cat >>$CONFIG_STATUS <<\_ACEOF > >@@ -31165,7 +32229,7 @@ > # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be > # absolute. > ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` >-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` >+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` > ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` > ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` > >@@ -31234,25 +32298,30 @@ > /^X\(\/\/\)$/{ s//\1/; q; } > /^X\(\/\).*/{ s//\1/; q; } > s/.*/./; q'` >- { case $dirpart/$fdir in >- [\\/]* | ?:[\\/]* ) as_incr_dir=;; >- *) as_incr_dir=.;; >-esac >-as_dummy=$dirpart/$fdir >-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do >- case $as_mkdir_dir in >- # Skip DOS drivespec >- ?:) as_incr_dir=$as_mkdir_dir ;; >- *) >- as_incr_dir=$as_incr_dir/$as_mkdir_dir >- test -d "$as_incr_dir" || >- mkdir "$as_incr_dir" || >- { { echo "$as_me:$LINENO: error: cannot create $dirpart/$fdir" >&5 >-echo "$as_me: error: cannot create $dirpart/$fdir" >&2;} >- { (exit 1); exit 1; }; } >- ;; >- esac >-done; } >+ { if $as_mkdir_p; then >+ mkdir -p $dirpart/$fdir >+ else >+ as_dir=$dirpart/$fdir >+ as_dirs= >+ while test ! -d "$as_dir"; do >+ as_dirs="$as_dir $as_dirs" >+ as_dir=`(dirname "$as_dir") 2>/dev/null || >+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ >+ X"$as_dir" : 'X\(//\)[^/]' \| \ >+ X"$as_dir" : 'X\(//\)$' \| \ >+ X"$as_dir" : 'X\(/\)' \| \ >+ . : '\(.\)' 2>/dev/null || >+echo X"$as_dir" | >+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } >+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } >+ /^X\(\/\/\)$/{ s//\1/; q; } >+ /^X\(\/\).*/{ s//\1/; q; } >+ s/.*/./; q'` >+ done >+ test ! -n "$as_dirs" || mkdir $as_dirs >+ fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 >+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} >+ { (exit 1); exit 1; }; }; } > > # echo "creating $dirpart/$file" > echo '# dummy' > "$dirpart/$file" >@@ -31281,8 +32350,11 @@ > # need to make the FD available again. > if test "$no_create" != yes; then > ac_cs_success=: >+ ac_config_status_args= >+ test "$silent" = yes && >+ ac_config_status_args="$ac_config_status_args --quiet" > exec 5>/dev/null >- $SHELL $CONFIG_STATUS || ac_cs_success=false >+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false > exec 5>>config.log > # Use ||, not &&, to avoid exiting from the if with $? = 1, which > # would make configure fail if this is the last instruction. >diff -urN celestia-1.3.1-old/data/Makefile.in celestia-1.3.1/data/Makefile.in >--- celestia-1.3.1-old/data/Makefile.in 2003-12-25 00:21:20.000000000 -0800 >+++ celestia-1.3.1/data/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = .. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ > pkgdatadir = @datadir@/@PACKAGE@/data >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,14 +253,28 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ >+@ENABLE_HIPPARCOS_FALSE@HIP_DAT = > > @ENABLE_HIPPARCOS_TRUE@HIP_DAT = stars.dat >-@ENABLE_HIPPARCOS_FALSE@HIP_DAT = > > BUILT_SOURCES = $(HIP_DAT) > >@@ -284,6 +284,7 @@ > > MAINTAINERCLEANFILES = stars.dat > subdir = data >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -337,9 +338,12 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=galileo.xyz solarsys.ssc asterisms.dat extrasolar.ssc starnames.dat stars.dat solsys_locs.ssc boundaries.dat deepsky.dsc hdnames.dat world-capitals.ssc >+KDE_DIST=world-capitals.ssc deepsky.dsc boundaries.dat hdnames.dat starnames.dat stars.dat galileo.xyz solarsys.ssc asterisms.dat solsys_locs.ssc extrasolar.ssc > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -348,7 +352,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -369,13 +379,14 @@ > fi; \ > done > check-am: all-am >-check: check-am >+check: $(BUILT_SOURCES) >+ $(MAKE) $(AM_MAKEFLAGS) check-am > all-am: Makefile $(DATA) > > installdirs: > $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) >- >-install: install-am >+install: $(BUILT_SOURCES) >+ $(MAKE) $(AM_MAKEFLAGS) install-am > install-exec: install-exec-am > install-data: install-data-am > uninstall: uninstall-am >@@ -399,7 +410,8 @@ > maintainer-clean-generic: > @echo "This command is intended for maintainers to use" > @echo "it deletes files that may require special tools to rebuild." >- -test -z "$(BUILT_SOURCES)$(MAINTAINERCLEANFILES)" || rm -f $(BUILT_SOURCES) $(MAINTAINERCLEANFILES) >+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) >+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) > #>- clean: clean-am > #>+ 1 > clean: kde-rpo-clean clean-am >@@ -436,6 +448,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am uninstall-pkgdataDATA > > .PHONY: all all-am check check-am clean clean-generic clean-libtool \ >@@ -445,8 +465,8 @@ > install-info-am install-man install-pkgdataDATA install-strip \ > installcheck installcheck-am installdirs maintainer-clean \ > maintainer-clean-generic mostlyclean mostlyclean-generic \ >- mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ >- uninstall-pkgdataDATA >+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ >+ uninstall-info-am uninstall-pkgdataDATA > > > @ENABLE_HIPPARCOS_TRUE@stars.dat: @HIPDIR@/hip_main.dat >diff -urN celestia-1.3.1-old/extras/Makefile.in celestia-1.3.1/extras/Makefile.in >--- celestia-1.3.1-old/extras/Makefile.in 2003-12-25 00:21:21.000000000 -0800 >+++ celestia-1.3.1/extras/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = .. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ > pkgdatadir = @datadir@/@PACKAGE@/extras >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -277,6 +277,7 @@ > > EXTRA_DIST = $(pkgdata_DATA) > subdir = extras >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -329,9 +330,12 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=skylab.ssc comets.ssc shroxclassic.ssc shroxmars.ssc numberedmoons.ssc apollo.ssc minormoons.ssc >+KDE_DIST=apollo.ssc skylab.ssc numberedmoons.ssc shroxclassic.ssc comets.ssc minormoons.ssc shroxmars.ssc > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -340,7 +344,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -366,7 +376,6 @@ > > installdirs: > $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -427,6 +436,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am uninstall-pkgdataDATA > > .PHONY: all all-am check check-am clean clean-generic clean-libtool \ >@@ -436,8 +453,8 @@ > install-info-am install-man install-pkgdataDATA install-strip \ > installcheck installcheck-am installdirs maintainer-clean \ > maintainer-clean-generic mostlyclean mostlyclean-generic \ >- mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ >- uninstall-pkgdataDATA >+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ >+ uninstall-info-am uninstall-pkgdataDATA > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/fonts/Makefile.in celestia-1.3.1/fonts/Makefile.in >--- celestia-1.3.1-old/fonts/Makefile.in 2003-12-25 00:21:21.000000000 -0800 >+++ celestia-1.3.1/fonts/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = .. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ > pkgdatadir = @datadir@/@PACKAGE@/fonts >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -277,6 +277,7 @@ > > EXTRA_DIST = $(pkgdata_DATA) > subdir = fonts >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -329,9 +330,12 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=cleanbold16.txf sansbold20.txf helvbold24.txf cleanbold12.txf clean16.txf helvbold18.txf helvbold12.txf helv18.txf helv12.txf clean12.txf default.txf helv10.txf helv24.txf >+KDE_DIST=helv24.txf clean12.txf cleanbold16.txf cleanbold12.txf helv10.txf default.txf helvbold18.txf clean16.txf helvbold24.txf helvbold12.txf helv12.txf helv18.txf sansbold20.txf > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -340,7 +344,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -366,7 +376,6 @@ > > installdirs: > $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -427,6 +436,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am uninstall-pkgdataDATA > > .PHONY: all all-am check check-am clean clean-generic clean-libtool \ >@@ -436,8 +453,8 @@ > install-info-am install-man install-pkgdataDATA install-strip \ > installcheck installcheck-am installdirs maintainer-clean \ > maintainer-clean-generic mostlyclean mostlyclean-generic \ >- mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ >- uninstall-pkgdataDATA >+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ >+ uninstall-info-am uninstall-pkgdataDATA > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/macros/Makefile.in celestia-1.3.1/macros/Makefile.in >--- celestia-1.3.1-old/macros/Makefile.in 2003-12-25 00:21:21.000000000 -0800 >+++ celestia-1.3.1/macros/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = .. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -307,6 +307,7 @@ > @INSIDE_GNOME_COMMON_TRUE@ gnome-gettext.m4 autogen.sh > > subdir = macros >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -359,9 +360,12 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=gnome-gnorba-check.m4 gnome-objc-checks.m4 gnome.m4 linger.m4 gnome-fileutils.m4 gnome-support.m4 gnome-print-check.m4 gnome-xml-check.m4 gnome-orbit-check.m4 gnome-guile-checks.m4 gnome-vfs.m4 gnome-ghttp-check.m4 gperf-check.m4 curses.m4 gnome-libgtop-check.m4 gnome-pthread-check.m4 aclocal-include.m4 gnome-x-checks.m4 need-declaration.m4 gnome-undelfs.m4 gnome-bonobo-check.m4 compiler-flags.m4 >+KDE_DIST=gnome-orbit-check.m4 gnome-ghttp-check.m4 need-declaration.m4 curses.m4 gnome-libgtop-check.m4 gnome-xml-check.m4 gnome-bonobo-check.m4 gnome-guile-checks.m4 gnome-vfs.m4 gnome-objc-checks.m4 gnome-support.m4 gnome-x-checks.m4 compiler-flags.m4 gnome-pthread-check.m4 gnome-print-check.m4 linger.m4 gnome-fileutils.m4 gnome.m4 gperf-check.m4 aclocal-include.m4 gnome-undelfs.m4 gnome-gnorba-check.m4 > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -370,7 +374,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -396,7 +406,6 @@ > > installdirs: > $(mkinstalldirs) $(DESTDIR)$(gnome_aclocaldir) >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -458,6 +467,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-gnome_aclocalDATA uninstall-info-am > > .PHONY: all all-am check check-am clean clean-generic clean-libtool \ >@@ -467,8 +484,9 @@ > install-gnome_aclocalDATA install-info install-info-am \ > install-man install-strip installcheck installcheck-am \ > installdirs maintainer-clean maintainer-clean-generic \ >- mostlyclean mostlyclean-generic mostlyclean-libtool uninstall \ >- uninstall-am uninstall-gnome_aclocalDATA uninstall-info-am >+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ >+ ps ps-am uninstall uninstall-am uninstall-gnome_aclocalDATA \ >+ uninstall-info-am > > > macros.dep: Makefile.am >diff -urN celestia-1.3.1-old/manual/Makefile.in celestia-1.3.1/manual/Makefile.in >--- celestia-1.3.1-old/manual/Makefile.in 2003-12-25 00:21:21.000000000 -0800 >+++ celestia-1.3.1/manual/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = .. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ > pkgdatadir = @datadir@/@PACKAGE@/manual >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -277,6 +277,7 @@ > > EXTRA_DIST = $(pkgdata_DATA) > subdir = manual >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -329,9 +330,12 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=starting.html movement.html manual.css celestia.html >+KDE_DIST=manual.css movement.html starting.html celestia.html > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -340,7 +344,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -366,7 +376,6 @@ > > installdirs: > $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -427,6 +436,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am uninstall-pkgdataDATA > > .PHONY: all all-am check check-am clean clean-generic clean-libtool \ >@@ -436,8 +453,8 @@ > install-info-am install-man install-pkgdataDATA install-strip \ > installcheck installcheck-am installdirs maintainer-clean \ > maintainer-clean-generic mostlyclean mostlyclean-generic \ >- mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ >- uninstall-pkgdataDATA >+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ >+ uninstall-info-am uninstall-pkgdataDATA > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/models/Makefile.in celestia-1.3.1/models/Makefile.in >--- celestia-1.3.1-old/models/Makefile.in 2003-12-25 00:21:21.000000000 -0800 >+++ celestia-1.3.1/models/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = .. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ > pkgdatadir = @datadir@/@PACKAGE@/models >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -277,6 +277,7 @@ > > EXTRA_DIST = $(pkgdata_DATA) > subdir = models >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -329,9 +330,12 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=mir.3ds skylab.3ds toutatis.3ds gemini.3ds gaspra.3ds marsglobalsurvr.3ds eros.cms janus.3ds proteus.3ds golevka.3ds roughsphere.cms kleopatra.3ds apollo.3ds iss.3ds borrelly.cms marsodyssey.3ds geographos.3ds asteroid.cms mercury7.3ds ida.3ds ky26.3ds phobos.3ds proteus.cms amalthea.3ds hubble.3ds deimos.3ds hyperion.3ds castalia.3ds galileo.3ds hyperion.cms vesta.3ds prometheus.3ds epimetheus.3ds eros.3ds bacchus.3ds >+KDE_DIST=gaspra.3ds geographos.3ds hyperion.cms amalthea.3ds gemini.3ds iss.3ds mir.3ds proteus.3ds asteroid.cms eros.cms marsglobalsurvr.3ds kleopatra.3ds vesta.3ds phobos.3ds toutatis.3ds borrelly.cms hyperion.3ds apollo.3ds roughsphere.cms ida.3ds skylab.3ds golevka.3ds bacchus.3ds eros.3ds janus.3ds proteus.cms mercury7.3ds castalia.3ds marsodyssey.3ds ky26.3ds galileo.3ds epimetheus.3ds deimos.3ds prometheus.3ds hubble.3ds > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -340,7 +344,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -366,7 +376,6 @@ > > installdirs: > $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -427,6 +436,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am uninstall-pkgdataDATA > > .PHONY: all all-am check check-am clean clean-generic clean-libtool \ >@@ -436,8 +453,8 @@ > install-info-am install-man install-pkgdataDATA install-strip \ > installcheck installcheck-am installdirs maintainer-clean \ > maintainer-clean-generic mostlyclean mostlyclean-generic \ >- mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ >- uninstall-pkgdataDATA >+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ >+ uninstall-info-am uninstall-pkgdataDATA > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/shaders/Makefile.in celestia-1.3.1/shaders/Makefile.in >--- celestia-1.3.1-old/shaders/Makefile.in 2003-12-25 00:21:22.000000000 -0800 >+++ celestia-1.3.1/shaders/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = .. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ > pkgdatadir = @datadir@/@PACKAGE@/shaders >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -277,6 +277,7 @@ > > EXTRA_DIST = $(pkgdata_DATA) > subdir = shaders >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -329,9 +330,12 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=night.vp simple_arb.vp rings.vp specular.vp rings_arb.vp diffuse_texoff.vp simple.vp shadowtex_arb.vp ringshadow.vp bumphaze_arb.vp diffuse_arb.vp bumpdiffuse.vp glossmap_arb.vp bumphaze.vp specular_arb.vp diffuse_texoff_arb.vp diffuse.vp night_arb.vp haze_arb.vp ringshadow_arb.vp shadowtex.vp bumpdiffuse_arb.vp haze.vp >+KDE_DIST=simple_arb.vp shadowtex_arb.vp specular.vp diffuse_texoff_arb.vp bumpdiffuse_arb.vp bumpdiffuse.vp glossmap_arb.vp haze.vp rings_arb.vp haze_arb.vp diffuse.vp ringshadow.vp ringshadow_arb.vp night.vp bumphaze.vp simple.vp diffuse_texoff.vp shadowtex.vp night_arb.vp diffuse_arb.vp rings.vp bumphaze_arb.vp specular_arb.vp > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -340,7 +344,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -366,7 +376,6 @@ > > installdirs: > $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -427,6 +436,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am uninstall-pkgdataDATA > > .PHONY: all all-am check check-am clean clean-generic clean-libtool \ >@@ -436,8 +453,8 @@ > install-info-am install-man install-pkgdataDATA install-strip \ > installcheck installcheck-am installdirs maintainer-clean \ > maintainer-clean-generic mostlyclean mostlyclean-generic \ >- mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ >- uninstall-pkgdataDATA >+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ >+ uninstall-info-am uninstall-pkgdataDATA > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/src/Makefile.in celestia-1.3.1/src/Makefile.in >--- celestia-1.3.1-old/src/Makefile.in 2003-12-25 00:21:22.000000000 -0800 >+++ celestia-1.3.1/src/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = .. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > SUBDIRS = celutil celmath cel3ds celtxf celengine celestia >@@ -281,6 +281,7 @@ > > noinst_PROGRAMS = buildstardb > subdir = src >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -295,11 +296,7 @@ > buildstardb_DEPENDENCIES = > buildstardb_LDFLAGS = > >-DEFS = @DEFS@ > DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) >-CPPFLAGS = @CPPFLAGS@ >-LDFLAGS = @LDFLAGS@ >-LIBS = @LIBS@ > depcomp = $(SHELL) $(top_srcdir)/admin/depcomp > am__depfiles_maybe = depfiles > #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/buildstardb.Po >@@ -324,15 +321,15 @@ > #>+ 2 > CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ > $(AM_LDFLAGS) $(LDFLAGS) -o $@ >-CXXFLAGS = @CXXFLAGS@ > DIST_SOURCES = $(buildstardb_SOURCES) > DATA = $(noinst_DATA) > > >-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ >- uninstall-info-recursive all-recursive install-data-recursive \ >- install-exec-recursive installdirs-recursive install-recursive \ >- uninstall-recursive check-recursive installcheck-recursive >+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ >+ ps-recursive install-info-recursive uninstall-info-recursive \ >+ all-recursive install-data-recursive install-exec-recursive \ >+ installdirs-recursive install-recursive uninstall-recursive \ >+ check-recursive installcheck-recursive > DIST_COMMON = Makefile.am Makefile.in > DIST_SUBDIRS = $(SUBDIRS) > SOURCES = $(buildstardb_SOURCES) >@@ -375,23 +372,37 @@ > -rm -rf ./$(DEPDIR) > > .cpp.o: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > .cpp.obj: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` > > .cpp.lo: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >-CXXDEPMODE = @CXXDEPMODE@ >+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > mostlyclean-libtool: > -rm -f *.lo >@@ -457,10 +468,17 @@ > list='$(SUBDIRS)'; for subdir in $$list; do \ > test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ > done >+ctags-recursive: >+ list='$(SUBDIRS)'; for subdir in $$list; do \ >+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ >+ done > > ETAGS = etags > ETAGSFLAGS = > >+CTAGS = ctags >+CTAGSFLAGS = >+ > tags: TAGS > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) >@@ -476,9 +494,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) $(LISP) $(TAGS_FILES)'; \ >@@ -491,16 +515,31 @@ > || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > $$tags $$unique > >+ctags: CTAGS >+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ >+ $(TAGS_FILES) $(LISP) >+ tags=; \ >+ here=`pwd`; \ >+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ >+ unique=`for i in $$list; do \ >+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ >+ done | \ >+ $(AWK) ' { files[$$0] = 1; } \ >+ END { for (i in files) print i; }'`; \ >+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ >+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ >+ $$tags $$unique >+ > GTAGS: > here=`$(am__cd) $(top_builddir) && pwd` \ > && cd $(top_srcdir) \ > && gtags -i $(GTAGS_ARGS) $$here > > distclean-tags: >- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH >+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=winbuild.mak readstars.cpp packnames.cpp Celestia.dsw packdb.cpp >+KDE_DIST=winbuild.mak packnames.cpp Celestia.dsw readstars.cpp packdb.cpp > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -509,7 +548,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -611,26 +656,35 @@ > mostlyclean-am: mostlyclean-compile mostlyclean-generic \ > mostlyclean-libtool > >+pdf: pdf-recursive >+ >+pdf-am: >+ >+ps: ps-recursive >+ >+ps-am: >+ > uninstall-am: uninstall-info-am > > uninstall-info: uninstall-info-recursive > >-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ >+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ > clean-generic clean-libtool clean-noinstPROGRAMS \ >- clean-recursive distclean distclean-compile distclean-depend \ >- distclean-generic distclean-libtool distclean-recursive \ >- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ >- info-recursive install install-am install-data install-data-am \ >- install-data-recursive install-exec install-exec-am \ >- install-exec-recursive install-info install-info-am \ >- install-info-recursive install-man install-recursive \ >- install-strip installcheck installcheck-am installdirs \ >- installdirs-am installdirs-recursive maintainer-clean \ >- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ >- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ >- mostlyclean-recursive tags tags-recursive uninstall \ >- uninstall-am uninstall-info-am uninstall-info-recursive \ >- uninstall-recursive >+ clean-recursive ctags ctags-recursive distclean \ >+ distclean-compile distclean-depend distclean-generic \ >+ distclean-libtool distclean-recursive distclean-tags distdir \ >+ dvi dvi-am dvi-recursive info info-am info-recursive install \ >+ install-am install-data install-data-am install-data-recursive \ >+ install-exec install-exec-am install-exec-recursive \ >+ install-info install-info-am install-info-recursive install-man \ >+ install-recursive install-strip installcheck installcheck-am \ >+ installdirs installdirs-am installdirs-recursive \ >+ maintainer-clean maintainer-clean-generic \ >+ maintainer-clean-recursive mostlyclean mostlyclean-compile \ >+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ >+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ >+ tags-recursive uninstall uninstall-am uninstall-info-am \ >+ uninstall-info-recursive uninstall-recursive > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/src/cel3ds/Makefile.in celestia-1.3.1/src/cel3ds/Makefile.in >--- celestia-1.3.1-old/src/cel3ds/Makefile.in 2003-12-25 00:21:22.000000000 -0800 >+++ celestia-1.3.1/src/cel3ds/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > noinst_LIBRARIES = libcel3ds.a >@@ -286,6 +286,7 @@ > 3dsread.cpp > > subdir = src/cel3ds >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -301,11 +302,7 @@ > @KDE_USE_FINAL_FALSE@libcel3ds_a_OBJECTS = $(libcel3ds_a_nofinal_OBJECTS) > @KDE_USE_FINAL_TRUE@libcel3ds_a_OBJECTS = $(libcel3ds_a_final_OBJECTS) > >-DEFS = @DEFS@ > DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) >-CPPFLAGS = @CPPFLAGS@ >-LDFLAGS = @LDFLAGS@ >-LIBS = @LIBS@ > depcomp = $(SHELL) $(top_srcdir)/admin/depcomp > am__depfiles_maybe = depfiles > #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/3dsmodel.Po ./$(DEPDIR)/3dsread.Po >@@ -331,7 +328,6 @@ > #>+ 2 > CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ > $(AM_LDFLAGS) $(LDFLAGS) -o $@ >-CXXFLAGS = @CXXFLAGS@ > DIST_SOURCES = $(libcel3ds_a_SOURCES) > DATA = $(noinst_DATA) > >@@ -378,23 +374,37 @@ > -rm -rf ./$(DEPDIR) > > .cpp.o: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > .cpp.obj: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` > > .cpp.lo: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >-CXXDEPMODE = @CXXDEPMODE@ >+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > mostlyclean-libtool: > -rm -f *.lo >@@ -409,6 +419,9 @@ > ETAGS = etags > ETAGSFLAGS = > >+CTAGS = ctags >+CTAGSFLAGS = >+ > tags: TAGS > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) >@@ -434,16 +447,31 @@ > || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > $$tags $$unique > >+ctags: CTAGS >+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ >+ $(TAGS_FILES) $(LISP) >+ tags=; \ >+ here=`pwd`; \ >+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ >+ unique=`for i in $$list; do \ >+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ >+ done | \ >+ $(AWK) ' { files[$$0] = 1; } \ >+ END { for (i in files) print i; }'`; \ >+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ >+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ >+ $$tags $$unique >+ > GTAGS: > here=`$(am__cd) $(top_builddir) && pwd` \ > && cd $(top_srcdir) \ > && gtags -i $(GTAGS_ARGS) $$here > > distclean-tags: >- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH >+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=3dsread.h 3ds.mak 3dschunk.h 3dsmodel.h cel3ds.dsp >+KDE_DIST=cel3ds.dsp 3dsmodel.h 3ds.mak 3dschunk.h 3dsread.h > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -452,7 +480,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -477,7 +511,6 @@ > all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) > > installdirs: >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -544,18 +577,27 @@ > mostlyclean-am: mostlyclean-compile mostlyclean-generic \ > mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am > >-.PHONY: GTAGS all all-am check check-am clean clean-generic \ >- clean-libtool clean-noinstLIBRARIES distclean distclean-compile \ >- distclean-depend distclean-generic distclean-libtool \ >- distclean-tags distdir dvi dvi-am info info-am install \ >- install-am install-data install-data-am install-exec \ >- install-exec-am install-info install-info-am install-man \ >- install-strip installcheck installcheck-am installdirs \ >- maintainer-clean maintainer-clean-generic mostlyclean \ >- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ >- tags uninstall uninstall-am uninstall-info-am >+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ >+ clean-libtool clean-noinstLIBRARIES ctags distclean \ >+ distclean-compile distclean-depend distclean-generic \ >+ distclean-libtool distclean-tags distdir dvi dvi-am info \ >+ info-am install install-am install-data install-data-am \ >+ install-exec install-exec-am install-info install-info-am \ >+ install-man install-strip installcheck installcheck-am \ >+ installdirs maintainer-clean maintainer-clean-generic \ >+ mostlyclean mostlyclean-compile mostlyclean-generic \ >+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ >+ uninstall-am uninstall-info-am > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/src/celengine/Makefile.in celestia-1.3.1/src/celengine/Makefile.in >--- celestia-1.3.1-old/src/celengine/Makefile.in 2003-12-25 00:21:23.000000000 -0800 >+++ celestia-1.3.1/src/celengine/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > noinst_LIBRARIES = libcelengine.a >@@ -338,6 +338,7 @@ > vsop87.cpp > > subdir = src/celengine >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -389,11 +390,7 @@ > @KDE_USE_FINAL_FALSE@libcelengine_a_OBJECTS = $(libcelengine_a_nofinal_OBJECTS) > @KDE_USE_FINAL_TRUE@libcelengine_a_OBJECTS = $(libcelengine_a_final_OBJECTS) > >-DEFS = @DEFS@ > DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) >-CPPFLAGS = @CPPFLAGS@ >-LDFLAGS = @LDFLAGS@ >-LIBS = @LIBS@ > depcomp = $(SHELL) $(top_srcdir)/admin/depcomp > am__depfiles_maybe = depfiles > #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/3dsmesh.Po ./$(DEPDIR)/asterism.Po \ >@@ -503,7 +500,6 @@ > #>+ 2 > CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ > $(AM_LDFLAGS) $(LDFLAGS) -o $@ >-CXXFLAGS = @CXXFLAGS@ > DIST_SOURCES = $(libcelengine_a_SOURCES) > DATA = $(noinst_DATA) > >@@ -602,23 +598,37 @@ > -rm -rf ./$(DEPDIR) > > .cpp.o: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > .cpp.obj: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` > > .cpp.lo: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >-CXXDEPMODE = @CXXDEPMODE@ >+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > mostlyclean-libtool: > -rm -f *.lo >@@ -633,6 +643,9 @@ > ETAGS = etags > ETAGSFLAGS = > >+CTAGS = ctags >+CTAGSFLAGS = >+ > tags: TAGS > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) >@@ -658,16 +671,31 @@ > || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > $$tags $$unique > >+ctags: CTAGS >+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ >+ $(TAGS_FILES) $(LISP) >+ tags=; \ >+ here=`pwd`; \ >+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ >+ unique=`for i in $$list; do \ >+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ >+ done | \ >+ $(AWK) ' { files[$$0] = 1; } \ >+ END { for (i in files) print i; }'`; \ >+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ >+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ >+ $$tags $$unique >+ > GTAGS: > here=`$(am__cd) $(top_builddir) && pwd` \ > && cd $(top_srcdir) \ > && gtags -i $(GTAGS_ARGS) $$here > > distclean-tags: >- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH >+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=tokenizer.h console.h solarsysxml.h render.h glext.h glcontext.h vertexprog.h virtualtex.h parser.h astro.h body.h stellarclass.h trajmanager.h overlay.h catalogxref.h gl.h celestia.h stardb.h boundaries.h surface.h regcombine.h engine.mak solarsys.h opencluster.h dispmap.h simulation.h image.h multitexture.h octree.h vertexlist.h frame.h location.h execution.h galaxy.h vsop87.h fragmentprog.cpp spheremesh.h univcoord.h marker.h lodspheremesh.h 3dsmesh.h meshmanager.h star.h celengine.dsp CGBuffer.h starname.h cmdparser.h starbrowser.h mesh.h universe.h texture.h execenv.h fragmentprog.h deepskyobj.h nebula.h customorbit.h vertexbuf.h solarsysxml.cpp asterism.h texmanager.h observer.h selection.h orbit.h command.h vecgl.h samporbit.h atmosphere.h constellation.h >+KDE_DIST=fragmentprog.h starbrowser.h trajmanager.h surface.h star.h execenv.h body.h observer.h vsop87.h astro.h octree.h dispmap.h texmanager.h galaxy.h universe.h fragmentprog.cpp solarsys.h render.h spheremesh.h lodspheremesh.h customorbit.h vertexprog.h vecgl.h samporbit.h meshmanager.h regcombine.h starname.h image.h console.h deepskyobj.h stardb.h solarsysxml.h selection.h orbit.h CGBuffer.h opencluster.h command.h celestia.h location.h engine.mak overlay.h constellation.h multitexture.h cmdparser.h virtualtex.h atmosphere.h execution.h 3dsmesh.h univcoord.h stellarclass.h solarsysxml.cpp asterism.h gl.h vertexbuf.h catalogxref.h glcontext.h glext.h tokenizer.h nebula.h marker.h parser.h mesh.h vertexlist.h frame.h texture.h boundaries.h celengine.dsp simulation.h > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -676,7 +704,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -701,7 +735,6 @@ > all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) > > installdirs: >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -768,18 +801,27 @@ > mostlyclean-am: mostlyclean-compile mostlyclean-generic \ > mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am > >-.PHONY: GTAGS all all-am check check-am clean clean-generic \ >- clean-libtool clean-noinstLIBRARIES distclean distclean-compile \ >- distclean-depend distclean-generic distclean-libtool \ >- distclean-tags distdir dvi dvi-am info info-am install \ >- install-am install-data install-data-am install-exec \ >- install-exec-am install-info install-info-am install-man \ >- install-strip installcheck installcheck-am installdirs \ >- maintainer-clean maintainer-clean-generic mostlyclean \ >- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ >- tags uninstall uninstall-am uninstall-info-am >+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ >+ clean-libtool clean-noinstLIBRARIES ctags distclean \ >+ distclean-compile distclean-depend distclean-generic \ >+ distclean-libtool distclean-tags distdir dvi dvi-am info \ >+ info-am install install-am install-data install-data-am \ >+ install-exec install-exec-am install-info install-info-am \ >+ install-man install-strip installcheck installcheck-am \ >+ installdirs maintainer-clean maintainer-clean-generic \ >+ mostlyclean mostlyclean-compile mostlyclean-generic \ >+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ >+ uninstall-am uninstall-info-am > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/src/celestia/Makefile.in celestia-1.3.1/src/celestia/Makefile.in >--- celestia-1.3.1-old/src/celestia/Makefile.in 2003-12-25 00:21:23.000000000 -0800 >+++ celestia-1.3.1/src/celestia/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > SUBDIRS = res kde >@@ -281,6 +281,15 @@ > @ENABLE_KDE_TRUE@ $(LIBSOCKET) kde/libkdegui.a > > @ENABLE_KDE_TRUE@celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) >+@ENABLE_CELX_FALSE@COMMONSOURCES = \ >+@ENABLE_CELX_FALSE@ celestiacore.cpp \ >+@ENABLE_CELX_FALSE@ configfile.cpp \ >+@ENABLE_CELX_FALSE@ destination.cpp \ >+@ENABLE_CELX_FALSE@ eclipsefinder.cpp\ >+@ENABLE_CELX_FALSE@ favorites.cpp \ >+@ENABLE_CELX_FALSE@ imagecapture.cpp \ >+@ENABLE_CELX_FALSE@ url.cpp >+ > > @ENABLE_CELX_TRUE@COMMONSOURCES = \ > @ENABLE_CELX_TRUE@ celestiacore.cpp \ >@@ -292,15 +301,6 @@ > @ENABLE_CELX_TRUE@ url.cpp \ > @ENABLE_CELX_TRUE@ celx.cpp > >-@ENABLE_CELX_FALSE@COMMONSOURCES = \ >-@ENABLE_CELX_FALSE@ celestiacore.cpp \ >-@ENABLE_CELX_FALSE@ configfile.cpp \ >-@ENABLE_CELX_FALSE@ destination.cpp \ >-@ENABLE_CELX_FALSE@ eclipsefinder.cpp\ >-@ENABLE_CELX_FALSE@ favorites.cpp \ >-@ENABLE_CELX_FALSE@ imagecapture.cpp \ >-@ENABLE_CELX_FALSE@ url.cpp >- > > WINSOURCES = \ > wingotodlg.cpp \ >@@ -314,9 +314,10 @@ > ODMenu.cpp \ > wineclipses.cpp > >- > @ENABLE_GLUT_FALSE@@ENABLE_GTK_FALSE@celestia_SOURCES = $(COMMONSOURCES) >+ > @ENABLE_GLUT_TRUE@@ENABLE_GTK_FALSE@celestia_SOURCES = $(COMMONSOURCES) glutmain.cpp >+ > @ENABLE_GTK_TRUE@celestia_SOURCES = $(COMMONSOURCES) gtkmain.cpp > > EXTRA_celestia_SOURCES = gtkmain.cpp glutmain.cpp $(WINSOURCES) >@@ -334,12 +335,16 @@ > noinst_DATA = ../../celestia > CLEANFILES = ../../celestia > subdir = src/celestia >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = > bin_PROGRAMS = celestia$(EXEEXT) > PROGRAMS = $(bin_PROGRAMS) > >+am__celestia_SOURCES_DIST = celestiacore.cpp configfile.cpp \ >+ destination.cpp eclipsefinder.cpp favorites.cpp \ >+ imagecapture.cpp url.cpp celx.cpp glutmain.cpp gtkmain.cpp > @ENABLE_CELX_TRUE@am__objects_1 = celestiacore.$(OBJEXT) \ > @ENABLE_CELX_TRUE@ configfile.$(OBJEXT) destination.$(OBJEXT) \ > @ENABLE_CELX_TRUE@ eclipsefinder.$(OBJEXT) favorites.$(OBJEXT) \ >@@ -357,15 +362,17 @@ > @ENABLE_GTK_TRUE@am_celestia_OBJECTS = $(am__objects_1) \ > @ENABLE_GTK_TRUE@ gtkmain.$(OBJEXT) > celestia_OBJECTS = $(am_celestia_OBJECTS) >-celestia_DEPENDENCIES = ../celengine/libcelengine.a \ >- ../celtxf/libceltxf.a ../cel3ds/libcel3ds.a \ >- ../celmath/libcelmath.a ../celutil/libcelutil.a >+@ENABLE_KDE_TRUE@celestia_DEPENDENCIES = kde/libkdegui.a \ >+@ENABLE_KDE_TRUE@ ../celengine/libcelengine.a \ >+@ENABLE_KDE_TRUE@ ../celtxf/libceltxf.a ../cel3ds/libcel3ds.a \ >+@ENABLE_KDE_TRUE@ ../celmath/libcelmath.a \ >+@ENABLE_KDE_TRUE@ ../celutil/libcelutil.a >+@ENABLE_KDE_FALSE@celestia_DEPENDENCIES = ../celengine/libcelengine.a \ >+@ENABLE_KDE_FALSE@ ../celtxf/libceltxf.a ../cel3ds/libcel3ds.a \ >+@ENABLE_KDE_FALSE@ ../celmath/libcelmath.a \ >+@ENABLE_KDE_FALSE@ ../celutil/libcelutil.a > >-DEFS = @DEFS@ > DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) >-CPPFLAGS = @CPPFLAGS@ >-LDFLAGS = @LDFLAGS@ >-LIBS = @LIBS@ > depcomp = $(SHELL) $(top_srcdir)/admin/depcomp > am__depfiles_maybe = depfiles > #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ODMenu.Po ./$(DEPDIR)/avicapture.Po \ >@@ -416,17 +423,17 @@ > #>+ 2 > CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ > $(AM_LDFLAGS) $(LDFLAGS) -o $@ >-CXXFLAGS = @CXXFLAGS@ >-DIST_SOURCES = $(celestia_SOURCES) $(EXTRA_celestia_SOURCES) >+DIST_SOURCES = $(am__celestia_SOURCES_DIST) $(EXTRA_celestia_SOURCES) > DATA = $(noinst_DATA) > > HEADERS = $(noinst_HEADERS) > > >-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ >- uninstall-info-recursive all-recursive install-data-recursive \ >- install-exec-recursive installdirs-recursive install-recursive \ >- uninstall-recursive check-recursive installcheck-recursive >+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ >+ ps-recursive install-info-recursive uninstall-info-recursive \ >+ all-recursive install-data-recursive install-exec-recursive \ >+ installdirs-recursive install-recursive uninstall-recursive \ >+ check-recursive installcheck-recursive > DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in > DIST_SUBDIRS = $(SUBDIRS) > SOURCES = $(celestia_SOURCES) $(EXTRA_celestia_SOURCES) >@@ -457,7 +464,7 @@ > ; then \ > f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ > echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ >- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ >+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ > else :; fi; \ > done > >@@ -510,23 +517,37 @@ > -rm -rf ./$(DEPDIR) > > .cpp.o: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > .cpp.obj: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` > > .cpp.lo: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >-CXXDEPMODE = @CXXDEPMODE@ >+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > mostlyclean-libtool: > -rm -f *.lo >@@ -592,10 +613,17 @@ > list='$(SUBDIRS)'; for subdir in $$list; do \ > test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ > done >+ctags-recursive: >+ list='$(SUBDIRS)'; for subdir in $$list; do \ >+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ >+ done > > ETAGS = etags > ETAGSFLAGS = > >+CTAGS = ctags >+CTAGSFLAGS = >+ > tags: TAGS > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) >@@ -611,9 +639,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) $(LISP) $(TAGS_FILES)'; \ >@@ -626,16 +660,31 @@ > || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > $$tags $$unique > >+ctags: CTAGS >+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ >+ $(TAGS_FILES) $(LISP) >+ tags=; \ >+ here=`pwd`; \ >+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ >+ unique=`for i in $$list; do \ >+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ >+ done | \ >+ $(AWK) ' { files[$$0] = 1; } \ >+ END { for (i in files) print i; }'`; \ >+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ >+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ >+ $$tags $$unique >+ > GTAGS: > here=`$(am__cd) $(top_builddir) && pwd` \ > && cd $(top_srcdir) \ > && gtags -i $(GTAGS_ARGS) $$here > > distclean-tags: >- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH >+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=winhyperlinks.h wingotodlg.cpp eclipsefinder.cpp winbookmarks.cpp avicapture.h winmain.cpp favorites.cpp destination.h url.h eclipsefinder.h winbookmarks.h configfile.h winviewoptsdlg.cpp winstarbrowser.cpp wintourguide.cpp winstarbrowser.h winviewoptsdlg.h celx.cpp destination.cpp configfile.cpp wingotodlg.h wineclipses.h winssbrowser.h imagecapture.cpp celestiacore.cpp imagecapture.h avicapture.cpp moviecapture.h celestiacore.h url.cpp ODMenu.h ODMenu.cpp wineclipses.cpp celx.h winlocations.h favorites.h winssbrowser.cpp wintourguide.h winhyperlinks.cpp winlocations.cpp >+KDE_DIST=moviecapture.h wintourguide.cpp avicapture.cpp winbookmarks.cpp destination.cpp configfile.h wintourguide.h eclipsefinder.h destination.h winhyperlinks.cpp imagecapture.h favorites.cpp url.h winviewoptsdlg.h imagecapture.cpp winviewoptsdlg.cpp configfile.cpp favorites.h winmain.cpp ODMenu.cpp wingotodlg.h ODMenu.h wineclipses.h winstarbrowser.cpp winssbrowser.cpp celestiacore.cpp eclipsefinder.cpp winstarbrowser.h winhyperlinks.h wineclipses.cpp wingotodlg.cpp celx.h avicapture.h winbookmarks.h winssbrowser.h celx.cpp winlocations.h winlocations.cpp celestiacore.h url.cpp > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -644,7 +693,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -747,16 +802,25 @@ > mostlyclean-am: mostlyclean-compile mostlyclean-generic \ > mostlyclean-libtool > >+pdf: pdf-recursive >+ >+pdf-am: >+ >+ps: ps-recursive >+ >+ps-am: >+ > uninstall-am: uninstall-binPROGRAMS uninstall-info-am > > uninstall-info: uninstall-info-recursive > >-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ >+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ > clean-binPROGRAMS clean-generic clean-libtool clean-recursive \ >- distclean distclean-compile distclean-depend distclean-generic \ >- distclean-libtool distclean-recursive distclean-tags distdir \ >- dvi dvi-am dvi-recursive info info-am info-recursive install \ >- install-am install-binPROGRAMS install-data install-data-am \ >+ ctags ctags-recursive distclean distclean-compile \ >+ distclean-depend distclean-generic distclean-libtool \ >+ distclean-recursive distclean-tags distdir dvi dvi-am \ >+ dvi-recursive info info-am info-recursive install install-am \ >+ install-binPROGRAMS install-data install-data-am \ > install-data-recursive install-exec install-exec-am \ > install-exec-recursive install-info install-info-am \ > install-info-recursive install-man install-recursive \ >@@ -764,8 +828,9 @@ > installdirs-am installdirs-recursive maintainer-clean \ > maintainer-clean-generic maintainer-clean-recursive mostlyclean \ > mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ >- mostlyclean-recursive tags tags-recursive uninstall \ >- uninstall-am uninstall-binPROGRAMS uninstall-info-am \ >+ mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ >+ ps-recursive tags tags-recursive uninstall uninstall-am \ >+ uninstall-binPROGRAMS uninstall-info-am \ > uninstall-info-recursive uninstall-recursive > > >diff -urN celestia-1.3.1-old/src/celestia/kde/Makefile.in celestia-1.3.1/src/celestia/kde/Makefile.in >--- celestia-1.3.1-old/src/celestia/kde/Makefile.in 2003-12-25 00:21:24.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -310,6 +310,7 @@ > > EXTRA_DIST = celestialbrowserbase.ui eclipsefinderdlgbase.ui > subdir = src/celestia/kde >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -317,6 +318,18 @@ > > libkdegui_a_AR = $(AR) cru > libkdegui_a_LIBADD = >+am__libkdegui_a_SOURCES_DIST = eclipsefinderdlgbase.uic.h \ >+ eclipsefinderdlgbase.uic.cpp eclipsefinderdlgbase.uic.moc.cpp \ >+ eclipsefinderdlg.cpp eclipsefinderdlg.moc.cpp \ >+ celestialbrowserbase.uic.h celestialbrowserbase.uic.cpp \ >+ celestialbrowserbase.uic.moc.cpp celestialbrowser.cpp \ >+ celestialbrowser.moc.cpp kdemain.cpp kdeapp.cpp kdeapp.moc.cpp \ >+ kdeglwidget.cpp kdeglwidget.moc.cpp kdepreferencesdialog.cpp \ >+ kdepreferencesdialog.moc.cpp kdeuniquecelestia.cpp \ >+ kdeuniquecelestia.moc.cpp kcelbookmarkmenu.cpp \ >+ kcelbookmarkmenu.moc.cpp kcelbookmarkmanager.cpp \ >+ kcelbookmarkmanager.moc.cpp selectionpopup.cpp \ >+ selectionpopup.moc.cpp > #>- @ENABLE_KDE_TRUE@am_libkdegui_a_OBJECTS = \ > #>- @ENABLE_KDE_TRUE@ eclipsefinderdlgbase.uic.$(OBJEXT) \ > #>- @ENABLE_KDE_TRUE@ eclipsefinderdlgbase.uic.moc.$(OBJEXT) \ >@@ -366,11 +379,7 @@ > @KDE_USE_FINAL_TRUE@@ENABLE_KDE_TRUE@am_libkdegui_a_OBJECTS = $(@ENABLE_KDE_TRUE@am_libkdegui_a_final_OBJECTS) > libkdegui_a_OBJECTS = $(am_libkdegui_a_OBJECTS) > >-DEFS = @DEFS@ > DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) >-CPPFLAGS = @CPPFLAGS@ >-LDFLAGS = @LDFLAGS@ >-LIBS = @LIBS@ > depcomp = $(SHELL) $(top_srcdir)/admin/depcomp > am__depfiles_maybe = depfiles > #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/celestialbrowser.Po \ >@@ -459,8 +468,6 @@ > #>+ 2 > CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ > $(AM_LDFLAGS) $(LDFLAGS) -o $@ >-CXXFLAGS = @CXXFLAGS@ >-CFLAGS = @CFLAGS@ > COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ > $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) > LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ >@@ -468,14 +475,15 @@ > CCLD = $(CC) > LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ > $(AM_LDFLAGS) $(LDFLAGS) -o $@ >-DIST_SOURCES = $(libkdegui_a_SOURCES) >+DIST_SOURCES = $(am__libkdegui_a_SOURCES_DIST) > HEADERS = $(noinst_HEADERS) > > >-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ >- uninstall-info-recursive all-recursive install-data-recursive \ >- install-exec-recursive installdirs-recursive install-recursive \ >- uninstall-recursive check-recursive installcheck-recursive >+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ >+ ps-recursive install-info-recursive uninstall-info-recursive \ >+ all-recursive install-data-recursive install-exec-recursive \ >+ installdirs-recursive install-recursive uninstall-recursive \ >+ check-recursive installcheck-recursive > DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in > DIST_SUBDIRS = data doc po > SOURCES = $(libkdegui_a_SOURCES) >@@ -539,23 +547,37 @@ > -rm -rf ./$(DEPDIR) > > .cpp.o: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > .cpp.obj: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` > > .cpp.lo: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >-CXXDEPMODE = @CXXDEPMODE@ >+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > mostlyclean-libtool: > -rm -f *.lo >@@ -621,10 +643,17 @@ > list='$(SUBDIRS)'; for subdir in $$list; do \ > test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ > done >+ctags-recursive: >+ list='$(SUBDIRS)'; for subdir in $$list; do \ >+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ >+ done > > ETAGS = etags > ETAGSFLAGS = > >+CTAGS = ctags >+CTAGSFLAGS = >+ > tags: TAGS > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) >@@ -640,9 +669,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) $(LISP) $(TAGS_FILES)'; \ >@@ -655,16 +690,31 @@ > || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > $$tags $$unique > >+ctags: CTAGS >+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ >+ $(TAGS_FILES) $(LISP) >+ tags=; \ >+ here=`pwd`; \ >+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ >+ unique=`for i in $$list; do \ >+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ >+ done | \ >+ $(AWK) ' { files[$$0] = 1; } \ >+ END { for (i in files) print i; }'`; \ >+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ >+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ >+ $$tags $$unique >+ > GTAGS: > here=`$(am__cd) $(top_builddir) && pwd` \ > && cd $(top_srcdir) \ > && gtags -i $(GTAGS_ARGS) $$here > > distclean-tags: >- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH >+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=celestialbrowser.h kdeuniquecelestia.h cellistviewitem.h kdeglwidget.h kdepreferencesdialog.h eclipsefinderdlg.h kcelbookmarkmenu.h kdeapp.h selectionpopup.h kcelbookmarkmanager.h kcelbookmarkowner.h >+KDE_DIST=kdeuniquecelestia.h selectionpopup.h eclipsefinderdlg.h kdepreferencesdialog.h kdeapp.h kcelbookmarkowner.h kcelbookmarkmanager.h cellistviewitem.h kcelbookmarkmenu.h kdeglwidget.h celestialbrowser.h > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -673,7 +723,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -707,7 +763,7 @@ > fi; \ > done > $(MAKE) $(AM_MAKEFLAGS) \ >- top_distdir="${top_distdir}" distdir="$(distdir)" \ >+ top_distdir="$(top_distdir)" distdir="$(distdir)" \ > dist-hook > check-am: all-am > check: check-recursive >@@ -781,26 +837,35 @@ > mostlyclean-am: mostlyclean-compile mostlyclean-generic \ > mostlyclean-libtool > >+pdf: pdf-recursive >+ >+pdf-am: >+ >+ps: ps-recursive >+ >+ps-am: >+ > uninstall-am: uninstall-info-am > > uninstall-info: uninstall-info-recursive > >-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ >+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ > clean-generic clean-libtool clean-noinstLIBRARIES \ >- clean-recursive distclean distclean-compile distclean-depend \ >- distclean-generic distclean-libtool distclean-recursive \ >- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ >- info-recursive install install-am install-data install-data-am \ >- install-data-recursive install-exec install-exec-am \ >- install-exec-recursive install-info install-info-am \ >- install-info-recursive install-man install-recursive \ >- install-strip installcheck installcheck-am installdirs \ >- installdirs-am installdirs-recursive maintainer-clean \ >- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ >- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ >- mostlyclean-recursive tags tags-recursive uninstall \ >- uninstall-am uninstall-info-am uninstall-info-recursive \ >- uninstall-recursive >+ clean-recursive ctags ctags-recursive distclean \ >+ distclean-compile distclean-depend distclean-generic \ >+ distclean-libtool distclean-recursive distclean-tags distdir \ >+ dvi dvi-am dvi-recursive info info-am info-recursive install \ >+ install-am install-data install-data-am install-data-recursive \ >+ install-exec install-exec-am install-exec-recursive \ >+ install-info install-info-am install-info-recursive install-man \ >+ install-recursive install-strip installcheck installcheck-am \ >+ installdirs installdirs-am installdirs-recursive \ >+ maintainer-clean maintainer-clean-generic \ >+ maintainer-clean-recursive mostlyclean mostlyclean-compile \ >+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ >+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ >+ tags-recursive uninstall uninstall-am uninstall-info-am \ >+ uninstall-info-recursive uninstall-recursive > > > @ENABLE_KDE_TRUE@%.uic.h: %.ui >@@ -837,7 +902,7 @@ > > > #>+ 11 >-@ENABLE_KDE_TRUE@am_libkdegui_a.all_cpp.cpp: $(srcdir)/Makefile.in eclipsefinderdlgbase.uic.cpp eclipsefinderdlgbase.uic.moc.cpp eclipsefinderdlg.cpp eclipsefinderdlg.moc.cpp celestialbrowserbase.uic.cpp celestialbrowserbase.uic.moc.cpp celestialbrowser.cpp celestialbrowser.moc.cpp kdemain.cpp kdeapp.cpp kdeapp.moc.cpp kdeglwidget.cpp kdeglwidget.moc.cpp kdepreferencesdialog.cpp kdepreferencesdialog.moc.cpp kdeuniquecelestia.cpp kdeuniquecelestia.moc.cpp kcelbookmarkmenu.cpp kcelbookmarkmenu.moc.cpp kcelbookmarkmanager.cpp kcelbookmarkmanager.moc.cpp selectionpopup.cpp selectionpopup.moc.cpp >+@ENABLE_KDE_TRUE@am_libkdegui_a.all_cpp.cpp: $(srcdir)/Makefile.in eclipsefinderdlgbase.uic.cpp eclipsefinderdlgbase.uic.moc.cpp $(srcdir)/eclipsefinderdlg.cpp eclipsefinderdlg.moc.cpp celestialbrowserbase.uic.cpp celestialbrowserbase.uic.moc.cpp $(srcdir)/celestialbrowser.cpp celestialbrowser.moc.cpp $(srcdir)/kdemain.cpp $(srcdir)/kdeapp.cpp kdeapp.moc.cpp $(srcdir)/kdeglwidget.cpp kdeglwidget.moc.cpp $(srcdir)/kdepreferencesdialog.cpp kdepreferencesdialog.moc.cpp $(srcdir)/kdeuniquecelestia.cpp kdeuniquecelestia.moc.cpp $(srcdir)/kcelbookmarkmenu.cpp kcelbookmarkmenu.moc.cpp $(srcdir)/kcelbookmarkmanager.cpp kcelbookmarkmanager.moc.cpp $(srcdir)/selectionpopup.cpp selectionpopup.moc.cpp > @echo 'creating @ENABLE_KDE_TRUE@am_libkdegui_a.all_cpp.cpp ...'; \ > rm -f @ENABLE_KDE_TRUE@am_libkdegui_a.all_cpp.files @ENABLE_KDE_TRUE@am_libkdegui_a.all_cpp.final; \ > echo "#define KDE_USE_FINAL 1" >> @ENABLE_KDE_TRUE@am_libkdegui_a.all_cpp.final; \ >diff -urN celestia-1.3.1-old/src/celestia/kde/celestialbrowser.cpp celestia-1.3.1/src/celestia/kde/celestialbrowser.cpp >--- celestia-1.3.1-old/src/celestia/kde/celestialbrowser.cpp 1969-12-31 16:00:00.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/celestialbrowser.cpp 2003-06-28 01:53:59.000000000 -0700 >@@ -0,0 +1,264 @@ >+#include <qradiobutton.h> >+#include <klistview.h> >+#include <kpopupmenu.h> >+#include <klocale.h> >+#include <qstatusbar.h> >+ >+#include <vector> >+ >+#include "celestiacore.h" >+#include "celengine/simulation.h" >+#include "celengine/stardb.h" >+#include "celengine/starbrowser.h" >+#include "celengine/selection.h" >+ >+#include "celestialbrowser.h" >+#include "cellistviewitem.h" >+#include "selectionpopup.h" >+ >+/* >+ * Constructs a CelestialBrowser which is a child of 'parent', with the >+ * name 'name' and widget flags set to 'f' >+ * >+ * The dialog will by default be modeless, unless you set 'modal' to >+ * TRUE to construct a modal dialog. >+ */ >+CelestialBrowser::CelestialBrowser( QWidget* parent, CelestiaCore* appCore) >+ : CelestialBrowserBase( parent, i18n("Celestial Browser")) >+{ >+ this->parent = dynamic_cast<KdeApp*>(parent); >+ this->appCore = appCore; >+ this->appSim = appCore->getSimulation(); >+ listStars->setAllColumnsShowFocus(true); >+ listStars->setRootIsDecorated(true); >+ listStars->setColumnAlignment(1, Qt::AlignRight); >+ listStars->setColumnAlignment(2, Qt::AlignRight); >+ listStars->setColumnAlignment(3, Qt::AlignRight); >+ listStars->setShowSortIndicator(true); >+ >+ sbrowser.setSimulation(appSim); >+ radioNearest->setChecked(true); >+ statusBar()->hide(); >+} >+ >+/* >+ * Destroys the object and frees any allocated resources >+ */ >+CelestialBrowser::~CelestialBrowser() >+{ >+ // no need to delete child widgets, Qt does it all for us >+} >+ >+/* >+ * public slot >+ */ >+void CelestialBrowser::slotNearest(bool) >+{ >+ sbrowser.setPredicate(StarBrowser::NearestStars); >+ listStars->setSorting(1); >+ slotRefresh(); >+} >+ >+/* >+ * public slot >+ */ >+void CelestialBrowser::slotBrightest(bool) >+{ >+ sbrowser.setPredicate(StarBrowser::BrightestStars); >+ listStars->setSorting(3); >+ slotRefresh(); >+} >+ >+/* >+ * public slot >+ */ >+void CelestialBrowser::slotBrighter(bool) >+{ >+ sbrowser.setPredicate(StarBrowser::BrighterStars); >+ listStars->setSorting(2); >+ slotRefresh(); >+} >+ >+/* >+ * public slot >+ */ >+void CelestialBrowser::slotWithPlanets(bool) >+{ >+ sbrowser.setPredicate(StarBrowser::StarsWithPlanets); >+ listStars->setSorting(1); >+ slotRefresh(); >+} >+ >+/* >+ * public slot >+ */ >+void CelestialBrowser::slotRefresh() >+{ >+ StarDatabase* stardb = appSim->getUniverse()->getStarCatalog(); >+ sbrowser.refresh(); >+ >+ std::vector<const Star*> *stars = sbrowser.listStars(100); >+ >+ listStars->clear(); >+ browserSel.obj = const_cast<Star*>((*stars)[0]); >+ browserSel.type = Selection::Type_Star; >+ >+ SolarSystemCatalog* solarSystemCatalog = appSim->getUniverse()->getSolarSystemCatalog(); >+ >+ UniversalCoord ucPos = appSim->getObserver().getPosition(); >+ Point3f obsPos( (double)ucPos.x * 1e-6, >+ (double)ucPos.y * 1e-6, >+ (double)ucPos.z * 1e-6); >+ >+ for (std::vector<const Star*>::iterator i = stars->begin(); >+ i != stars->end() ; >+ i++ ) >+ { >+ char buf[20]; >+ const Star *star=(Star *)(*i); >+ QString name((stardb->getStarName(*star)).c_str()); >+ >+ Point3f starPos = star->getPosition(); >+ Vec3d v(starPos.x - obsPos.x, >+ starPos.y - obsPos.y, >+ starPos.z - obsPos.z); >+ double d = v.length(); >+ >+ sprintf(buf, " %.2f ly", d); >+ QString dist(buf); >+ >+ sprintf(buf, " %.2f ", astro::absToAppMag(star->getAbsoluteMagnitude(), d)); >+ QString appMag(buf); >+ >+ sprintf(buf, " %.2f ", star->getAbsoluteMagnitude()); >+ QString absMag(buf); >+ >+ star->getStellarClass().str(buf, sizeof buf); >+ QString starClass(buf); >+ >+ CelListViewItem *starItem = new CelListViewItem(listStars, name, dist, appMag, absMag, starClass); >+ >+ SolarSystemCatalog::iterator iter = solarSystemCatalog->find(star->getCatalogNumber()); >+ if (iter != solarSystemCatalog->end()) >+ { >+ const PlanetarySystem* planets = 0; >+ SolarSystem* solarSys = iter->second; >+ planets = solarSys->getPlanets(); >+ >+ for (int i = 0; i < solarSys->getPlanets()->getSystemSize(); i++) >+ { >+ Body* body = solarSys->getPlanets()->getBody(i); >+ >+ Point3d bodyPos = body->getHeliocentricPosition(appSim->getTime()); >+ double starBodyDist = bodyPos.distanceFromOrigin(); >+ sprintf(buf, " %.2f au", starBodyDist / KM_PER_AU); >+ QString distStarBody(buf); >+ >+ CelListViewItem *planetItem = new CelListViewItem(starItem, QString(body->getName().c_str()), >+ distStarBody, "", "", getClassification(body->getClassification())); >+ >+ const PlanetarySystem* satellites = body->getSatellites(); >+ if (satellites != NULL && satellites->getSystemSize() != 0) >+ { >+ for (int i = 0; i < satellites->getSystemSize(); i++) >+ { >+ Body* sat = satellites->getBody(i); >+ >+ Point3d satPos = sat->getHeliocentricPosition(appSim->getTime()); >+ Vec3d bodySatVec(bodyPos.x - satPos.x, bodyPos.y - satPos.y, bodyPos.z - satPos.z); >+ double bodySatDist = bodySatVec.length(); >+ sprintf(buf, " %.0f km", bodySatDist); >+ QString distBodySat(buf); >+ >+ new CelListViewItem(planetItem, >+ QString(sat->getName().c_str()), >+ distBodySat, "", "", getClassification(sat->getClassification())); >+ >+ } >+ } >+ } >+ } >+ } >+ delete(stars); >+} >+ >+ >+QString CelestialBrowser::getClassification(int c) const{ >+ QString cl; >+ switch(c) >+ { >+ case Body::Planet: >+ cl = i18n("Planet"); >+ break; >+ case Body::Moon: >+ cl = i18n("Moon"); >+ break; >+ case Body::Asteroid: >+ cl = i18n("Asteroid"); >+ break; >+ case Body::Comet: >+ cl = i18n("Comet"); >+ break; >+ case Body::Spacecraft: >+ cl = i18n("Spacecraft"); >+ break; >+ case Body::Unknown: >+ default: >+ cl = i18n("-"); >+ break; >+ } >+ return cl; >+} >+ >+ >+void CelestialBrowser::slotRightClickOnStar(QListViewItem* item, const QPoint& p, int col) { >+ QListViewItem *i = item; >+ QString name = i->text(0); >+ while ( (i = i->parent()) ) { >+ name = i->text(0) + "/" + name; >+ } >+ Selection sel = appSim->findObjectFromPath(std::string(name.latin1())); >+ >+ SelectionPopup popup(this, appCore, sel); >+ popup.init(); >+ int id = popup.exec(p); >+ popup.process(id); >+} >+ >+ >+CelListViewItem::CelListViewItem( QListView * parent, QString label1, QString label2, >+ QString label3, QString label4, QString label5, QString label6, QString label7, >+ QString label8 ) >+ : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) >+{ >+} >+ >+CelListViewItem::CelListViewItem( QListViewItem * parent, QString label1, QString label2, >+ QString label3, QString label4, QString label5, QString label6, QString label7, >+ QString label8 ) >+ : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) >+{ >+} >+ >+CelListViewItem::~CelListViewItem() { >+ >+} >+ >+int CelListViewItem::compare ( QListViewItem * i, int col, bool ascending ) const { >+ >+ if (col == 0 || col > 3) { >+ return key(col, ascending).localeAwareCompare(i->key(col, ascending)); >+ } else { >+ float a = key(col, ascending).toFloat(); >+ float b = i->key(col, ascending).toFloat(); >+ if ( a == b && col == 1) { return 0; } >+ if ( a == b && col != 1) { return compare(i, 1, ascending); } >+ if ( a < b ) { return -1; } >+ return 1; >+ } >+} >+ >+ >+ >+ >+ >diff -urN celestia-1.3.1-old/src/celestia/kde/data/Makefile.in celestia-1.3.1/src/celestia/kde/data/Makefile.in >--- celestia-1.3.1-old/src/celestia/kde/data/Makefile.in 2003-12-25 00:21:24.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/data/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../../../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -301,6 +301,7 @@ > hi48-app-celestia.png > > subdir = src/celestia/kde/data >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -444,9 +445,12 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=celestia.desktop celestia.protocol celestia_20021215170159036.png celestiarc celestia_20020830192655186.png celestia_20021215164726547.png celestia_20030106235954721.png celestia_20021210223316001.png celestia_20020830192652097.png bookmarks.xml x-celestia-script.desktop celestiaui.rc celestia_20021215164511359.png celestia_20021212191412299.png >+KDE_DIST=celestia_20030106235954721.png celestia.desktop x-celestia-script.desktop celestia_20020830192655186.png celestia_20021215164511359.png bookmarks.xml celestia_20021215164726547.png celestia_20020830192652097.png celestiarc celestia_20021210223316001.png celestiaui.rc celestia.protocol celestia_20021212191412299.png celestia_20021215170159036.png > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -455,7 +459,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -481,7 +491,6 @@ > > installdirs: > $(mkinstalldirs) $(DESTDIR)$(appsdir) $(DESTDIR)$(confdir) $(DESTDIR)$(faviconsdir) $(DESTDIR)$(kdelnkdir) $(DESTDIR)$(mimedir) $(DESTDIR)$(rcdir) >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -546,6 +555,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > #>- uninstall-am: uninstall-appsDATA uninstall-confDATA \ > #>- uninstall-faviconsDATA uninstall-info-am uninstall-kdelnkDATA \ > #>- uninstall-mimeDATA uninstall-rcDATA >@@ -562,10 +579,10 @@ > install-info-am install-kdelnkDATA install-man install-mimeDATA \ > install-rcDATA install-strip installcheck installcheck-am \ > installdirs maintainer-clean maintainer-clean-generic \ >- mostlyclean mostlyclean-generic mostlyclean-libtool uninstall \ >- uninstall-am uninstall-appsDATA uninstall-confDATA \ >- uninstall-faviconsDATA uninstall-info-am uninstall-kdelnkDATA \ >- uninstall-mimeDATA uninstall-rcDATA >+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ >+ ps ps-am uninstall uninstall-am uninstall-appsDATA \ >+ uninstall-confDATA uninstall-faviconsDATA uninstall-info-am \ >+ uninstall-kdelnkDATA uninstall-mimeDATA uninstall-rcDATA > > > messages: rc.cpp >diff -urN celestia-1.3.1-old/src/celestia/kde/doc/Makefile.in celestia-1.3.1/src/celestia/kde/doc/Makefile.in >--- celestia-1.3.1-old/src/celestia/kde/doc/Makefile.in 2003-12-25 00:21:24.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/doc/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../../../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -280,15 +280,17 @@ > KDE_DOCS = celestia > KDE_LANG = en > subdir = src/celestia/kde/doc >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = > DIST_SOURCES = > >-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ >- uninstall-info-recursive all-recursive install-data-recursive \ >- install-exec-recursive installdirs-recursive install-recursive \ >- uninstall-recursive check-recursive installcheck-recursive >+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ >+ ps-recursive install-info-recursive uninstall-info-recursive \ >+ all-recursive install-data-recursive install-exec-recursive \ >+ installdirs-recursive install-recursive uninstall-recursive \ >+ check-recursive installcheck-recursive > DIST_COMMON = Makefile.am Makefile.in > DIST_SUBDIRS = $(SUBDIRS) > #>- all: all-recursive >@@ -370,10 +372,17 @@ > list='$(SUBDIRS)'; for subdir in $$list; do \ > test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ > done >+ctags-recursive: >+ list='$(SUBDIRS)'; for subdir in $$list; do \ >+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ >+ done > > ETAGS = etags > ETAGSFLAGS = > >+CTAGS = ctags >+CTAGSFLAGS = >+ > tags: TAGS > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) >@@ -389,9 +398,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) $(LISP) $(TAGS_FILES)'; \ >@@ -404,20 +419,41 @@ > || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > $$tags $$unique > >+ctags: CTAGS >+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ >+ $(TAGS_FILES) $(LISP) >+ tags=; \ >+ here=`pwd`; \ >+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ >+ unique=`for i in $$list; do \ >+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ >+ done | \ >+ $(AWK) ' { files[$$0] = 1; } \ >+ END { for (i in files) print i; }'`; \ >+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ >+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ >+ $$tags $$unique >+ > GTAGS: > here=`$(am__cd) $(top_builddir) && pwd` \ > && cd $(top_srcdir) \ > && gtags -i $(GTAGS_ARGS) $$here > > distclean-tags: >- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH >+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > > top_distdir = ../../../.. > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -517,23 +553,33 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-recursive >+ >+pdf-am: >+ >+ps: ps-recursive >+ >+ps-am: >+ > uninstall-am: uninstall-info-am > > uninstall-info: uninstall-info-recursive > >-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ >- clean-generic clean-libtool clean-recursive distclean \ >- distclean-generic distclean-libtool distclean-recursive \ >- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ >- info-recursive install install-am install-data install-data-am \ >- install-data-recursive install-exec install-exec-am \ >- install-exec-recursive install-info install-info-am \ >- install-info-recursive install-man install-recursive \ >- install-strip installcheck installcheck-am installdirs \ >- installdirs-am installdirs-recursive maintainer-clean \ >- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ >- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ >- tags tags-recursive uninstall uninstall-am uninstall-info-am \ >+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ >+ clean-generic clean-libtool clean-recursive ctags \ >+ ctags-recursive distclean distclean-generic distclean-libtool \ >+ distclean-recursive distclean-tags distdir dvi dvi-am \ >+ dvi-recursive info info-am info-recursive install install-am \ >+ install-data install-data-am install-data-recursive \ >+ install-exec install-exec-am install-exec-recursive \ >+ install-info install-info-am install-info-recursive install-man \ >+ install-recursive install-strip installcheck installcheck-am \ >+ installdirs installdirs-am installdirs-recursive \ >+ maintainer-clean maintainer-clean-generic \ >+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ >+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ >+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ >+ uninstall uninstall-am uninstall-info-am \ > uninstall-info-recursive uninstall-recursive > > # Tell versions [3.59,3.63) of GNU make to not export all variables. >diff -urN celestia-1.3.1-old/src/celestia/kde/doc/celestia/Makefile.in celestia-1.3.1/src/celestia/kde/doc/celestia/Makefile.in >--- celestia-1.3.1-old/src/celestia/kde/doc/celestia/Makefile.in 2003-12-25 00:21:24.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/doc/celestia/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../../../../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -282,15 +282,17 @@ > SUBDIRS =. > > subdir = src/celestia/kde/doc/celestia >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = > DIST_SOURCES = > >-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ >- uninstall-info-recursive all-recursive install-data-recursive \ >- install-exec-recursive installdirs-recursive install-recursive \ >- uninstall-recursive check-recursive installcheck-recursive >+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ >+ ps-recursive install-info-recursive uninstall-info-recursive \ >+ all-recursive install-data-recursive install-exec-recursive \ >+ installdirs-recursive install-recursive uninstall-recursive \ >+ check-recursive installcheck-recursive > DIST_COMMON = Makefile.am Makefile.in > DIST_SUBDIRS = $(SUBDIRS) > #>- all: all-recursive >@@ -372,10 +374,17 @@ > list='$(SUBDIRS)'; for subdir in $$list; do \ > test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ > done >+ctags-recursive: >+ list='$(SUBDIRS)'; for subdir in $$list; do \ >+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ >+ done > > ETAGS = etags > ETAGSFLAGS = > >+CTAGS = ctags >+CTAGSFLAGS = >+ > tags: TAGS > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) >@@ -391,9 +400,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) $(LISP) $(TAGS_FILES)'; \ >@@ -406,16 +421,31 @@ > || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > $$tags $$unique > >+ctags: CTAGS >+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ >+ $(TAGS_FILES) $(LISP) >+ tags=; \ >+ here=`pwd`; \ >+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ >+ unique=`for i in $$list; do \ >+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ >+ done | \ >+ $(AWK) ' { files[$$0] = 1; } \ >+ END { for (i in files) print i; }'`; \ >+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ >+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ >+ $$tags $$unique >+ > GTAGS: > here=`$(am__cd) $(top_builddir) && pwd` \ > && cd $(top_srcdir) \ > && gtags -i $(GTAGS_ARGS) $$here > > distclean-tags: >- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH >+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=fig20.jpg index.docbook fig22.jpg fig23.jpg fig6.jpg fig3.jpg fig5.jpg fig28.jpg fig12.jpg fig30.jpg fig17.jpg fig18.jpg fig4.jpg fig25.jpg fig13.jpg fig2.jpg fig21.jpg fig14.jpg fig26.jpg fig10.jpg fig16.jpg fig1.jpg fig15.jpg fig27.jpg fig19.jpg fig11.jpg fig9.jpg fig29.jpg fig24.jpg fig8.jpg fig7.jpg >+KDE_DIST=fig14.jpg fig22.jpg index.docbook fig15.jpg fig24.jpg fig29.jpg fig9.jpg fig25.jpg fig10.jpg fig26.jpg fig5.jpg fig18.jpg fig2.jpg fig3.jpg fig1.jpg fig17.jpg fig11.jpg fig28.jpg fig12.jpg fig13.jpg fig20.jpg fig21.jpg fig4.jpg fig7.jpg fig8.jpg fig23.jpg fig6.jpg fig30.jpg fig19.jpg fig16.jpg fig27.jpg > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -426,7 +456,13 @@ > #>- distdir: $(DISTFILES) > #>+ 1 > distdir: distdir-nls $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -532,23 +568,33 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-recursive >+ >+pdf-am: >+ >+ps: ps-recursive >+ >+ps-am: >+ > uninstall-am: uninstall-info-am > > uninstall-info: uninstall-info-recursive > >-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ >- clean-generic clean-libtool clean-recursive distclean \ >- distclean-generic distclean-libtool distclean-recursive \ >- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ >- info-recursive install install-am install-data install-data-am \ >- install-data-recursive install-exec install-exec-am \ >- install-exec-recursive install-info install-info-am \ >- install-info-recursive install-man install-recursive \ >- install-strip installcheck installcheck-am installdirs \ >- installdirs-am installdirs-recursive maintainer-clean \ >- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ >- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ >- tags tags-recursive uninstall uninstall-am uninstall-info-am \ >+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ >+ clean-generic clean-libtool clean-recursive ctags \ >+ ctags-recursive distclean distclean-generic distclean-libtool \ >+ distclean-recursive distclean-tags distdir dvi dvi-am \ >+ dvi-recursive info info-am info-recursive install install-am \ >+ install-data install-data-am install-data-recursive \ >+ install-exec install-exec-am install-exec-recursive \ >+ install-info install-info-am install-info-recursive install-man \ >+ install-recursive install-strip installcheck installcheck-am \ >+ installdirs installdirs-am installdirs-recursive \ >+ maintainer-clean maintainer-clean-generic \ >+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ >+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ >+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ >+ uninstall uninstall-am uninstall-info-am \ > uninstall-info-recursive uninstall-recursive > > # Tell versions [3.59,3.63) of GNU make to not export all variables. >diff -urN celestia-1.3.1-old/src/celestia/kde/eclipsefinderdlg.cpp celestia-1.3.1/src/celestia/kde/eclipsefinderdlg.cpp >--- celestia-1.3.1-old/src/celestia/kde/eclipsefinderdlg.cpp 1969-12-31 16:00:00.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/eclipsefinderdlg.cpp 2003-01-28 12:08:30.000000000 -0800 >@@ -0,0 +1,140 @@ >+#include <klocale.h> >+#include <qstatusbar.h> >+#include <qdatetime.h> >+#include <knuminput.h> >+#include <kcombobox.h> >+#include <qradiobutton.h> >+#include <qlistview.h> >+#include <kpopupmenu.h> >+ >+#include "eclipsefinderdlg.h" >+#include "celestiacore.h" >+#include "celengine/astro.h" >+#include "eclipsefinder.h" >+ >+/* >+ * Constructs a EclipseFinder which is a child of 'parent', with the >+ * name 'name' and widget flags set to 'f' >+ */ >+EclipseFinderDlg::EclipseFinderDlg( QWidget* parent, CelestiaCore *appCore) >+ : EclipseFinderDlgBase( parent, i18n("Eclipse Finder") ),appCore(appCore) >+{ >+ astro::Date date(appCore->getSimulation()->getTime()); >+ fromYSpin->setValue(date.year); >+ fromMSpin->setValue(date.month); >+ fromDSpin->setValue(date.day); >+ toYSpin->setValue(date.year); >+ toMSpin->setValue(date.month); >+ toDSpin->setValue(date.day); >+ >+ >+ statusBar()->hide(); >+} >+ >+/* >+ * Destroys the object and frees any allocated resources >+ */ >+EclipseFinderDlg::~EclipseFinderDlg() >+{ >+ // no need to delete child widgets, Qt does it all for us >+} >+ >+/* >+ * public slot >+ */ >+void EclipseFinderDlg::search() >+{ >+ std::string onBody = ""; >+ >+ switch(comboBody->currentItem()) { >+ case 0: >+ onBody = "Earth"; >+ break; >+ case 1: >+ onBody = "Jupiter"; >+ break; >+ case 2: >+ onBody = "Saturn"; >+ break; >+ case 3: >+ onBody = "Uranus"; >+ break; >+ case 4: >+ onBody = "Neptune"; >+ break; >+ case 5: >+ onBody = "Pluto"; >+ break; >+ } >+ EclipseFinder ef(appCore, >+ onBody, >+ (radioSolar->isChecked()?Eclipse::Solar:Eclipse::Moon), >+ (double)(astro::Date(fromYSpin->value(), >+ fromMSpin->value(), >+ fromDSpin->value())), >+ (double)(astro::Date(toYSpin->value(), >+ toMSpin->value(), >+ toDSpin->value())) + 1 >+ ); >+ >+ std::vector<Eclipse> eclipses = ef.getEclipses(); >+ >+ listEclipses->clear(); >+ for (std::vector<Eclipse>::iterator i = eclipses.begin(); >+ i != eclipses.end(); >+ i++) { >+ >+ if ((*i).planete == "None") { >+ new QListViewItem(listEclipses, >+ QString((*i).planete.c_str())); >+ continue; >+ } >+ >+ char d[12], strStart[10], strEnd[10]; >+ astro::Date start((*i).startTime); >+ astro::Date end((*i).endTime); >+ >+ sprintf(d, "%d-%02d-%02d", (*i).date->year, (*i).date->month, (*i).date->day); >+ sprintf(strStart, "%02d:%02d:%02d", start.hour, start.minute, (int)start.seconds); >+ sprintf(strEnd, "%02d:%02d:%02d", end.hour, end.minute, (int)end.seconds); >+ >+ new QListViewItem(listEclipses, >+ QString((*i).planete.c_str()), >+ QString((*i).sattelite.c_str()), >+ d, >+ strStart, >+ strEnd >+ ); >+ } >+} >+ >+void EclipseFinderDlg::gotoEclipse(QListViewItem* item, const QPoint& p, int col) { >+ if (item->text(0) == "None") return; >+ >+ KPopupMenu menu(this); >+ >+ menu.insertTitle(item->text(col == 1)); >+ menu.insertItem(i18n("&Goto"), 1); >+ >+ int id=menu.exec(p); >+ >+ if (id == 1) { >+ Selection sel = appCore->getSimulation()->findObjectFromPath(std::string(item->text(col == 1).latin1())); >+ appCore->getSimulation()->setSelection(sel); >+ QString date = item->text(2); >+ int yearEnd = date.find('-', 1); >+ astro::Date d(date.left(yearEnd).toInt(), >+ date.mid(yearEnd + 1, 2).toInt(), >+ date.mid(yearEnd + 4, 2).toInt()); >+ d.hour = item->text(3).left(2).toInt(); >+ d.minute = item->text(3).mid(3, 2).toInt(); >+ d.seconds = item->text(3).mid(6, 2).toDouble(); >+ appCore->getSimulation()->setTime((double)d); >+ appCore->charEntered('g'); >+ } >+} >+ >+ >+ >+ >+ >diff -urN celestia-1.3.1-old/src/celestia/kde/kcelbookmarkmanager.cpp celestia-1.3.1/src/celestia/kde/kcelbookmarkmanager.cpp >--- celestia-1.3.1-old/src/celestia/kde/kcelbookmarkmanager.cpp 1969-12-31 16:00:00.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/kcelbookmarkmanager.cpp 2002-11-03 11:30:25.000000000 -0800 >@@ -0,0 +1,64 @@ >+/*************************************************************************** >+ kcelbookmarkmanager.cpp - description >+ ------------------- >+ begin : Sat Aug 31 2002 >+ copyright : (C) 2002 by chris >+ email : chris@tux.teyssier.org >+ ***************************************************************************/ >+ >+/*************************************************************************** >+ * * >+ * This program is free software; you can redistribute it and/or modify * >+ * it under the terms of the GNU General Public License as published by * >+ * the Free Software Foundation; either version 2 of the License, or * >+ * (at your option) any later version. * >+ * * >+ ***************************************************************************/ >+ >+#include <qfile.h> >+#include <qdir.h> >+#include <kstandarddirs.h> >+#include "kcelbookmarkmanager.h" >+ >+KBookmarkManager* KCelBookmarkManager::self() { >+ if ( !s_bookmarkManager ) >+ { >+ QString bookmarksFile = locateLocal("data", QString::fromLatin1("celestia/bookmarks.xml")); >+ QFile local(bookmarksFile); >+ if (!local.exists()) { >+ QString bookmarksFileDefault = locate("data", QString::fromLatin1("celestia/bookmarks.xml")); >+ copy(bookmarksFileDefault, bookmarksFile); >+ QString faviconsDefault = locate("data", QString::fromLatin1("celestia/favicons/")); >+ QDir faviconsDir(faviconsDefault, "*.png"); >+ QStringList iconsList = faviconsDir.entryList(); >+ QString faviconsDest = locateLocal("cache", "favicons/"); >+ for ( QStringList::Iterator i = iconsList.begin(); i != iconsList.end(); ++i ) { >+ copy(faviconsDefault + *i, faviconsDest + *i); >+ } >+ } >+ s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile ); >+ s_bookmarkManager->setShowNSBookmarks(false); >+ } >+ return s_bookmarkManager; >+} >+ >+ >+void KCelBookmarkManager::copy(const QString& source, const QString& destination) { >+ QFile src(source), dst(destination); >+ if (!src.exists()) return; >+ >+ src.open(IO_ReadOnly); >+ dst.open(IO_WriteOnly); >+ int bufSize=16384; >+ char* buf = new char[bufSize]; >+ int len = src.readBlock(buf, bufSize); >+ do { >+ dst.writeBlock(buf, len); >+ len = src.readBlock(buf, len); >+ } while (len > 0); >+ src.close(); >+ dst.close(); >+ delete[] buf; >+} >+ >+ >diff -urN celestia-1.3.1-old/src/celestia/kde/kcelbookmarkmenu.cpp celestia-1.3.1/src/celestia/kde/kcelbookmarkmenu.cpp >--- celestia-1.3.1-old/src/celestia/kde/kcelbookmarkmenu.cpp 1969-12-31 16:00:00.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/kcelbookmarkmenu.cpp 2003-06-01 15:19:01.000000000 -0700 >@@ -0,0 +1,467 @@ >+// -*- mode: c++; c-basic-offset: 2 -*- >+/* This file is part of the KDE project >+ Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> >+ >+ This library is free software; you can redistribute it and/or >+ modify it under the terms of the GNU Library General Public >+ License as published by the Free Software Foundation; either >+ version 2 of the License, or (at your option) any later version. >+ >+ This library is distributed in the hope that it will be useful, >+ but WITHOUT ANY WARRANTY; without even the implied warranty of >+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ Library General Public License for more details. >+ >+ You should have received a copy of the GNU Library General Public License >+ along with this library; see the file COPYING.LIB. If not, write to >+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, >+ Boston, MA 02111-1307, USA. >+*/ >+ >+ >+#include <sys/types.h> >+#include <sys/stat.h> >+ >+#include <assert.h> >+#include <dirent.h> >+#include <errno.h> >+#include <fcntl.h> >+#include <stddef.h> >+#include <stdlib.h> >+#include <unistd.h> >+ >+#include "kcelbookmarkmenu.h" >+#include <kbookmarkmenu.h> >+#include "kbookmarkimporter.h" >+#include "kcelbookmarkowner.h" >+ >+#include <qfile.h> >+#include <qregexp.h> >+ >+#include <kaction.h> >+#include <kdebug.h> >+#include <klocale.h> >+#include <kmessagebox.h> >+#include <kpopupmenu.h> >+#include <kstdaccel.h> >+#include <kstdaction.h> >+ >+template class QPtrList<KCelBookmarkMenu>; >+ >+/******************************************************************** >+ * >+ * KCelBookmarkMenu >+ * >+ ********************************************************************/ >+ >+KCelBookmarkMenu::KCelBookmarkMenu( KBookmarkManager* mgr, >+ KCelBookmarkOwner * _owner, KPopupMenu * _parentMenu, >+ KActionCollection *collec, bool _isRoot, bool _add, >+ const QString & parentAddress ) >+ : m_bIsRoot(_isRoot), m_bAddBookmark(_add), >+ m_pManager(mgr), m_pOwner(_owner), >+ m_parentMenu( _parentMenu ), >+ m_actionCollection( collec ), >+ m_parentAddress( parentAddress ) >+{ >+ m_lstSubMenus.setAutoDelete( true ); >+ m_actions.setAutoDelete( true ); >+ >+ m_bNSBookmark = m_parentAddress.isNull(); >+ if ( !m_bNSBookmark ) // not for the netscape bookmark >+ { >+ //kdDebug(1203) << "KBookmarkMenu::KBookmarkMenu " << this << " address : " << m_parentAddress << endl; >+ >+ connect( _parentMenu, SIGNAL( aboutToShow() ), >+ SLOT( slotAboutToShow() ) ); >+ >+ if ( m_bIsRoot ) >+ { >+ connect( m_pManager, SIGNAL( changed(const QString &, const QString &) ), >+ SLOT( slotBookmarksChanged(const QString &) ) ); >+ } >+ } >+ >+ // add entries that possibly have a shortcut, so they are available _before_ first popup >+ if ( m_bIsRoot ) >+ { >+ if ( m_bAddBookmark ) { >+ addAddBookmark(); >+ } >+ >+ addEditBookmarks(); >+ } >+ >+ m_bDirty = true; >+} >+ >+KCelBookmarkMenu::~KCelBookmarkMenu() >+{ >+ //kdDebug(1203) << "KBookmarkMenu::~KBookmarkMenu() " << this << endl; >+ QPtrListIterator<KAction> it( m_actions ); >+ for (; it.current(); ++it ) >+ it.current()->unplugAll(); >+ >+ m_lstSubMenus.clear(); >+ m_actions.clear(); >+} >+ >+void KCelBookmarkMenu::ensureUpToDate() >+{ >+ slotAboutToShow(); >+} >+ >+ >+void KCelBookmarkMenu::slotAboutToShow() >+{ >+ // Did the bookmarks change since the last time we showed them ? >+ if ( m_bDirty ) >+ { >+ m_bDirty = false; >+ refill(); >+ } >+} >+ >+void KCelBookmarkMenu::slotBookmarksChanged( const QString & groupAddress ) >+{ >+ if (m_bNSBookmark) >+ return; >+ >+ if ( groupAddress == m_parentAddress ) >+ { >+ //kdDebug(1203) << "KBookmarkMenu::slotBookmarksChanged -> setting m_bDirty on " << groupAddress << endl; >+ m_bDirty = true; >+ } >+ else >+ { >+ // Iterate recursively into child menus >+ QPtrListIterator<KCelBookmarkMenu> it( m_lstSubMenus ); >+ for (; it.current(); ++it ) >+ { >+ it.current()->slotBookmarksChanged( groupAddress ); >+ } >+ } >+} >+ >+void KCelBookmarkMenu::refill() >+{ >+ //kdDebug(1203) << "KBookmarkMenu::refill()" << endl; >+ m_lstSubMenus.clear(); >+ >+ QPtrListIterator<KAction> it( m_actions ); >+ for (; it.current(); ++it ) >+ it.current()->unplug( m_parentMenu ); >+ >+ m_parentMenu->clear(); >+ m_actions.clear(); >+ >+ fillBookmarkMenu(); >+ m_parentMenu->adjustSize(); >+} >+ >+void KCelBookmarkMenu::addAddBookmark() >+{ >+ KAction * paAddBookmarks = new KAction( i18n( "&Add Bookmark" ), >+ "bookmark_add", >+ m_bIsRoot ? ALT + Key_B : 0, >+ this, >+ SLOT( slotAddBookmark() ), >+ m_actionCollection, m_bIsRoot ? "add_bookmark" : 0 ); >+ >+ paAddBookmarks->setStatusText( i18n( "Add a bookmark for the current document" ) ); >+ >+ paAddBookmarks->plug( m_parentMenu ); >+ m_actions.append( paAddBookmarks ); >+ addAddRelativeBookmark(); >+ addAddSettingsBookmark(); >+} >+ >+void KCelBookmarkMenu::addAddRelativeBookmark() >+{ >+ KAction * paAddBookmarks = new KAction( i18n( "Add &Relative Bookmark" ), >+ "bookmark_add", >+ m_bIsRoot ? ALT + Key_R : 0, //m_bIsRoot ? KStdAccel::addBookmark() : KShortcut(), >+ this, >+ SLOT( slotAddRelativeBookmark() ), >+ m_actionCollection, m_bIsRoot ? "add_relative_bookmark" : 0 ); >+ >+ paAddBookmarks->setStatusText( i18n( "Add a relative bookmark for the current document" ) ); >+ >+ paAddBookmarks->plug( m_parentMenu ); >+ m_actions.append( paAddBookmarks ); >+} >+ >+void KCelBookmarkMenu::addAddSettingsBookmark() >+{ >+ KAction * paAddBookmarks = new KAction( i18n( "Add &Settings Bookmark" ), >+ "bookmark_add", >+ m_bIsRoot ? CTRL + ALT + Key_S : 0, //m_bIsRoot ? KStdAccel::addBookmark() : KShortcut(), >+ this, >+ SLOT( slotAddSettingsBookmark() ), >+ m_actionCollection, m_bIsRoot ? "add_settings_bookmark" : 0 ); >+ >+ paAddBookmarks->setStatusText( i18n( "Add a settings bookmark for the current document" ) ); >+ >+ paAddBookmarks->plug( m_parentMenu ); >+ m_actions.append( paAddBookmarks ); >+} >+ >+void KCelBookmarkMenu::addEditBookmarks() >+{ >+ KAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, SLOT( slotEditBookmarks() ), >+ m_actionCollection, "edit_bookmarks" ); >+ m_paEditBookmarks->plug( m_parentMenu ); >+ m_paEditBookmarks->setStatusText( i18n( "Edit your bookmark collection in a separate window" ) ); >+ m_actions.append( m_paEditBookmarks ); >+} >+ >+void KCelBookmarkMenu::addNewFolder() >+{ >+ KAction * paNewFolder = new KAction( i18n( "&New Folder..." ), >+ "folder_new", //"folder", >+ 0, >+ this, >+ SLOT( slotNewFolder() ), >+ m_actionCollection ); >+ >+ paNewFolder->setStatusText( i18n( "Create a new bookmark folder in this menu" ) ); >+ >+ paNewFolder->plug( m_parentMenu ); >+ m_actions.append( paNewFolder ); >+} >+ >+void KCelBookmarkMenu::fillBookmarkMenu() >+{ >+ if ( m_bIsRoot ) >+ { >+ if ( m_bAddBookmark ) >+ addAddBookmark(); >+ >+ addEditBookmarks(); >+ >+ if ( m_bAddBookmark ) >+ addNewFolder(); >+ >+ } >+ >+ KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); >+ Q_ASSERT(!parentBookmark.isNull()); >+ bool separatorInserted = false; >+ for ( KBookmark bm = parentBookmark.first(); !bm.isNull(); bm = parentBookmark.next(bm) ) >+ { >+ QString text = bm.text(); >+ text.replace( QRegExp( "&" ), "&&" ); >+ if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark >+ m_parentMenu->insertSeparator(); >+ separatorInserted = true; >+ } >+ if ( !bm.isGroup() ) >+ { >+ if ( bm.isSeparator() ) >+ { >+ m_parentMenu->insertSeparator(); >+ } >+ else >+ { >+ // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; >+ // create a normal URL item, with ID as a name >+ KAction * action = new KAction( text, bm.icon(), 0, >+ this, SLOT( slotBookmarkSelected() ), >+ m_actionCollection, bm.url().url().utf8() ); >+ >+ action->setStatusText( bm.url().prettyURL() ); >+ >+ action->plug( m_parentMenu ); >+ m_actions.append( action ); >+ } >+ } >+ else >+ { >+ // kdDebug(1203) << "Creating bookmark submenu named " << bm.text() << endl; >+ KActionMenu * actionMenu = new KActionMenu( text, bm.icon(), >+ m_actionCollection, 0L ); >+ actionMenu->plug( m_parentMenu ); >+ m_actions.append( actionMenu ); >+ KCelBookmarkMenu *subMenu = new KCelBookmarkMenu( m_pManager, m_pOwner, actionMenu->popupMenu(), >+ m_actionCollection, false, >+ m_bAddBookmark, >+ bm.address() ); >+ m_lstSubMenus.append( subMenu ); >+ } >+ } >+ >+ if ( !m_bIsRoot && m_bAddBookmark ) >+ { >+ m_parentMenu->insertSeparator(); >+ addAddBookmark(); >+ addNewFolder(); >+ } >+} >+ >+void KCelBookmarkMenu::slotAddRelativeBookmark() >+{ >+ Url Url = m_pOwner->currentUrl(Url::Relative); >+ QString url = QString(Url.getAsString().c_str());; >+ if (url.isEmpty()) >+ { >+ KMessageBox::error( 0L, i18n("Can't add bookmark with empty URL")); >+ return; >+ } >+ QString title = QString(Url.getName().c_str()); >+ if (title.isEmpty()) >+ title = url; >+ >+ KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); >+ Q_ASSERT(!parentBookmark.isNull()); >+ // If this title is already used, we'll try to find something unused. >+ KBookmark ch = parentBookmark.first(); >+ int count = 1; >+ QString uniqueTitle = title; >+ do >+ { >+ while ( !ch.isNull() ) >+ { >+ if ( uniqueTitle == ch.text() ) >+ { >+ // Title already used ! >+ if ( url != ch.url().url() ) >+ { >+ uniqueTitle = title + QString(" (%1)").arg(++count); >+ // New title -> restart search from the beginning >+ ch = parentBookmark.first(); >+ break; >+ } >+ else >+ { >+ // this exact URL already exists >+ return; >+ } >+ } >+ ch = parentBookmark.next( ch ); >+ } >+ } while ( !ch.isNull() ); >+ >+ parentBookmark.addBookmark( m_pManager, uniqueTitle, url, m_pOwner->currentIcon() ); >+ m_pManager->emitChanged( parentBookmark ); >+} >+ >+void KCelBookmarkMenu::slotAddSettingsBookmark() >+{ >+ Url Url = m_pOwner->currentUrl(Url::Settings); >+ QString url = QString(Url.getAsString().c_str());; >+ if (url.isEmpty()) >+ { >+ KMessageBox::error( 0L, i18n("Can't add bookmark with empty URL")); >+ return; >+ } >+ QString title = QString(Url.getName().c_str()); >+ if (title.isEmpty()) >+ title = url; >+ >+ KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); >+ Q_ASSERT(!parentBookmark.isNull()); >+ // If this title is already used, we'll try to find something unused. >+ KBookmark ch = parentBookmark.first(); >+ int count = 1; >+ QString uniqueTitle = title; >+ do >+ { >+ while ( !ch.isNull() ) >+ { >+ if ( uniqueTitle == ch.text() ) >+ { >+ // Title already used ! >+ if ( url != ch.url().url() ) >+ { >+ uniqueTitle = title + QString(" (%1)").arg(++count); >+ // New title -> restart search from the beginning >+ ch = parentBookmark.first(); >+ break; >+ } >+ else >+ { >+ // this exact URL already exists >+ return; >+ } >+ } >+ ch = parentBookmark.next( ch ); >+ } >+ } while ( !ch.isNull() ); >+ >+ parentBookmark.addBookmark( m_pManager, uniqueTitle, url, m_pOwner->currentIcon() ); >+ m_pManager->emitChanged( parentBookmark ); >+} >+ >+void KCelBookmarkMenu::slotAddBookmark() >+{ >+ Url Url = m_pOwner->currentUrl(Url::Absolute); >+ QString url = QString(Url.getAsString().c_str());; >+ if (url.isEmpty()) >+ { >+ KMessageBox::error( 0L, i18n("Can't add bookmark with empty URL")); >+ return; >+ } >+ QString title = QString(Url.getName().c_str()); >+ if (title.isEmpty()) >+ title = url; >+ >+ KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); >+ Q_ASSERT(!parentBookmark.isNull()); >+ // If this title is already used, we'll try to find something unused. >+ KBookmark ch = parentBookmark.first(); >+ int count = 1; >+ QString uniqueTitle = title; >+ do >+ { >+ while ( !ch.isNull() ) >+ { >+ if ( uniqueTitle == ch.text() ) >+ { >+ // Title already used ! >+ if ( url != ch.url().url() ) >+ { >+ uniqueTitle = title + QString(" (%1)").arg(++count); >+ // New title -> restart search from the beginning >+ ch = parentBookmark.first(); >+ break; >+ } >+ else >+ { >+ // this exact URL already exists >+ return; >+ } >+ } >+ ch = parentBookmark.next( ch ); >+ } >+ } while ( !ch.isNull() ); >+ >+ parentBookmark.addBookmark( m_pManager, uniqueTitle, url, m_pOwner->currentIcon() ); >+ m_pManager->emitChanged( parentBookmark ); >+} >+ >+void KCelBookmarkMenu::slotNewFolder() >+{ >+ if ( !m_pOwner ) return; // this view doesn't handle bookmarks... >+ KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); >+ Q_ASSERT(!parentBookmark.isNull()); >+ KBookmarkGroup group = parentBookmark.createNewFolder( m_pManager ); >+ if ( !group.isNull() ) >+ { >+ KBookmarkGroup parentGroup = group.parentGroup(); >+ m_pManager->emitChanged( parentGroup ); >+ } >+} >+ >+void KCelBookmarkMenu::slotBookmarkSelected() >+{ >+ //kdDebug(1203) << "KBookmarkMenu::slotBookmarkSelected()" << endl; >+ if ( !m_pOwner ) return; // this view doesn't handle bookmarks... >+ //kdDebug(1203) << sender()->name() << endl; >+ >+ // The name of the action is the URL to open >+ m_pOwner->openBookmarkURL( QString::fromUtf8(sender()->name()) ); >+} >+ >+// ----------------------------------------------------------------------------- >+ >+ >diff -urN celestia-1.3.1-old/src/celestia/kde/kdeapp.cpp celestia-1.3.1/src/celestia/kde/kdeapp.cpp >--- celestia-1.3.1-old/src/celestia/kde/kdeapp.cpp 1969-12-31 16:00:00.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/kdeapp.cpp 2003-11-12 14:58:54.000000000 -0800 >@@ -0,0 +1,1299 @@ >+/*************************************************************************** >+ kdeapp.cpp - description >+ ------------------- >+ begin : Tue Jul 16 22:28:19 CEST 2002 >+ copyright : (C) 2002 by Christophe Teyssier >+ email : chris@teyssier.org >+ ***************************************************************************/ >+ >+/*************************************************************************** >+ * * >+ * This program is free software; you can redistribute it and/or modify * >+ * it under the terms of the GNU General Public License as published by * >+ * the Free Software Foundation; either version 2 of the License, or * >+ * (at your option) any later version. * >+ * * >+ ***************************************************************************/ >+ >+#include <fstream> >+#include <sstream> >+ >+#include <qpushbutton.h> >+#include <qslider.h> >+#include <qlayout.h> >+#include <qframe.h> >+#include <qgrid.h> >+#include <qvbox.h> >+#include <qcheckbox.h> >+#include <qvgroupbox.h> >+#include <qlabel.h> >+#include <qclipboard.h> >+#include <qregexp.h> >+#include <qpalette.h> >+#include <qfont.h> >+#include <qlineedit.h> >+#include <qvalidator.h> >+ >+#include <qmenubar.h> >+#include <qpopupmenu.h> >+#include <qapplication.h> >+#include <qkeycode.h> >+#include <qtimer.h> >+#include <qimage.h> >+#include <kaction.h> >+#include <kstdaction.h> >+#include <kmenubar.h> >+#include <kedittoolbar.h> >+#include <kkeydialog.h> >+#include <klocale.h> >+#include <kconfig.h> >+#include <qtextedit.h> >+#include <klineeditdlg.h> >+ >+#include <qdatetime.h> >+#include <kshortcut.h> >+#include <klocale.h> >+#include <kfiledialog.h> >+#include <kmessagebox.h> >+#include <kurl.h> >+#include <krun.h> >+#include <kurldrag.h> >+#include <kstdaccel.h> >+#include <kpopupmenu.h> >+#include <kcelbookmarkmenu.h> >+#include <kbookmarkbar.h> >+#include <kcelbookmarkmanager.h> >+ >+#include "kdeglwidget.h" >+#include "kdeapp.h" >+#include "kdepreferencesdialog.h" >+#include "celengine/cmdparser.h" >+#include "url.h" >+#include "celestialbrowser.h" >+#include "eclipsefinderdlg.h" >+#include "selectionpopup.h" >+ >+#include "celengine/glext.h" >+ >+#define MENUMAXSIZE 100 >+ >+KdeApp* KdeApp::app=0; >+ >+KBookmarkManager* KCelBookmarkManager::s_bookmarkManager; >+ >+KdeApp::KdeApp(QWidget *parent, const char *name) : KMainWindow(parent, name) >+{ >+ appCore=new CelestiaCore(); >+ if (appCore == NULL) >+ { >+ cerr << "Out of memory.\n"; >+ exit(1); >+ } >+ >+ kdewatcher = new KdeWatcher(appCore, this); >+ >+ renderer = appCore->getRenderer(); >+ sim = appCore->getSimulation(); >+ >+ app=this; >+ appCore->setContextMenuCallback(&KdeApp::popupMenu); >+ appCore->setAlerter(new KdeAlerter(this)); >+ >+ setAcceptDrops(true); >+ >+ // Create our OpenGL widget >+ glWidget = new KdeGlWidget( this, "kdeglwidget", appCore); >+ >+ setCentralWidget(glWidget); >+ initActions(); >+ >+ glWidget->setFocus(); >+ >+ resize(640,480); >+ setAutoSaveSettings("MainWindow"); >+ KConfig* conf = kapp->config(); >+ applyMainWindowSettings(conf, "MainWindow"); >+ conf->setGroup("MainWindow"); >+ restoreWindowSize(conf); >+ conf->setGroup(0); >+ >+ KGlobal::config()->setGroup("Preferences"); >+ if (KGlobal::config()->hasKey("DistanceToScreen")) >+ { >+ appCore->setDistanceToScreen(KGlobal::config()->readNumEntry("DistanceToScreen")); >+ } >+ >+ >+ if (conf->hasGroup("Shortcuts")) >+ actionCollection()->readShortcutSettings("Shortcuts", conf); >+ >+ if (toolBar()->isHidden()) toggleToolbar->setChecked(false); >+ if (menuBar()->isHidden()) toggleMenubar->setChecked(false); >+ >+ >+ // We use a timer with a null timeout value >+ // to add appCore->tick to Qt's event loop >+ QTimer *t = new QTimer( dynamic_cast<QObject *>(this) ); >+ QObject::connect( t, SIGNAL(timeout()), SLOT(celestia_tick()) ); >+ t->start( 0, FALSE ); >+ >+} >+ >+void KdeApp::setStartURL(KURL url) { >+ if (url.protocol() == "cel") { >+ appCore->setStartURL(url.url().latin1()); >+ } >+ if (url.protocol() == "file") { >+ appCore->setStartURL(url.path().latin1()); >+ } >+} >+ >+void KdeApp::goToURL(const KURL& url) { >+ if (url.protocol() == "cel") { >+ appCore->addToHistory(); >+ appCore->goToUrl(url.prettyURL().latin1()); >+ } >+ if (url.protocol() == "file") { >+ appCore->addToHistory(); >+ slotOpenFileURL(url); >+ } >+} >+ >+void KdeApp::openBookmarkURL(const QString& _url) { >+ KURL url(_url); >+ appCore->addToHistory(); >+ appCore->goToUrl(url.prettyURL().latin1()); >+} >+ >+Url KdeApp::currentUrl(Url::UrlType type) const { >+ return Url(appCore, type); >+} >+ >+QString KdeApp::currentIcon() const { >+ QDateTime now = QDateTime::currentDateTime(); >+ QString iconName = QString::fromLatin1("favicons/celestia_") + now.toString("yyyyMMddhhmmsszzz"); >+ QString iconFilename = locateLocal("cache", iconName) + ".png"; >+ >+ QImage grabedImage = glWidget->grabFrameBuffer(); >+ int width=grabedImage.width(), height=grabedImage.height(); >+ if (width > height) { >+ grabedImage.copy((width - height)/2, 0, height, height).smoothScale(64,64).save(iconFilename, "PNG"); >+ } else { >+ grabedImage.copy(0, (height - width)/2, width, width).smoothScale(64,64).save(iconFilename, "PNG"); >+ } >+ >+ return iconName; >+} >+ >+void KdeWatcher::notifyChange(CelestiaCore * core, int property) >+{ >+ if ((property & (CelestiaCore::RenderFlagsChanged| >+ CelestiaCore::LabelFlagsChanged| >+ CelestiaCore::TimeZoneChanged))) >+ kdeapp->resyncMenus(); >+ else if (property & CelestiaCore::AmbientLightChanged) >+ kdeapp->resyncAmbient(); >+ else if (property & CelestiaCore::FaintestChanged) >+ kdeapp->resyncFaintest(); >+ else if (property & CelestiaCore::VerbosityLevelChanged) >+ kdeapp->resyncVerbosity(); >+ else if (property & CelestiaCore::HistoryChanged) >+ kdeapp->resyncHistory(); >+} >+ >+void KdeApp::resyncHistory() { >+ std::vector<Url> history=appCore->getHistory(); >+ std::vector<Url>::size_type i=appCore->getHistoryCurrent(); >+ >+ if (i >= history.size()-1) { >+ action("go_forward")->setEnabled(false); >+ } else { >+ action("go_forward")->setEnabled(true); >+ } >+ if (i == 0) { >+ action("go_back")->setEnabled(false); >+ } else { >+ action("go_back")->setEnabled(true); >+ } >+} >+ >+void KdeApp::resyncMenus() { >+ int rFlags = renderer->getRenderFlags(); >+ int orbitMask = renderer->getOrbitMask(); >+ ((KToggleAction*)action("showStars"))->setChecked(rFlags & Renderer::ShowStars); >+ ((KToggleAction*)action("showPlanets"))->setChecked(rFlags & Renderer::ShowPlanets); >+ ((KToggleAction*)action("showGalaxies"))->setChecked(rFlags & Renderer::ShowGalaxies); >+ ((KToggleAction*)action("showDiagrams"))->setChecked(rFlags & Renderer::ShowDiagrams); >+ ((KToggleAction*)action("showCloudMaps"))->setChecked(rFlags & Renderer::ShowCloudMaps); >+ ((KToggleAction*)action("showOrbits"))->setChecked(rFlags & Renderer::ShowOrbits); >+ ((KToggleAction*)action("showAsteroidOrbits"))->setChecked(orbitMask & Body::Asteroid); >+ ((KToggleAction*)action("showCometOrbits"))->setChecked(orbitMask & Body::Comet); >+ ((KToggleAction*)action("showMoonOrbits"))->setChecked(orbitMask & Body::Moon); >+ ((KToggleAction*)action("showPlanetOrbits"))->setChecked(orbitMask & Body::Planet); >+ ((KToggleAction*)action("showSpacecraftOrbits"))->setChecked(orbitMask & Body::Spacecraft); >+ ((KToggleAction*)action("showCelestialSphere"))->setChecked(rFlags & Renderer::ShowCelestialSphere); >+ ((KToggleAction*)action("showNightMaps"))->setChecked(rFlags & Renderer::ShowNightMaps); >+ ((KToggleAction*)action("showMarkers"))->setChecked(rFlags & Renderer::ShowMarkers); >+ ((KToggleAction*)action("showAtmospheres"))->setChecked(rFlags & Renderer::ShowAtmospheres); >+ ((KToggleAction*)action("showSmoothLines"))->setChecked(rFlags & Renderer::ShowSmoothLines); >+ ((KToggleAction*)action("showEclipseShadows"))->setChecked(rFlags & Renderer::ShowEclipseShadows); >+ ((KToggleAction*)action("showRingShadows"))->setChecked(rFlags & Renderer::ShowRingShadows); >+ ((KToggleAction*)action("showBoundaries"))->setChecked(rFlags & Renderer::ShowBoundaries); >+ ((KToggleAction*)action("showAutoMag"))->setChecked(rFlags & Renderer::ShowAutoMag); >+ ((KToggleAction*)action("showCometTails"))->setChecked(rFlags & Renderer::ShowCometTails); >+ >+ int lMode = renderer->getLabelMode(); >+ ((KToggleAction*)action("showStarLabels"))->setChecked(lMode & Renderer::StarLabels); >+ ((KToggleAction*)action("showPlanetLabels"))->setChecked(lMode & Renderer::PlanetLabels); >+ ((KToggleAction*)action("showMoonLabels"))->setChecked(lMode & Renderer::MoonLabels); >+ ((KToggleAction*)action("showCometLabels"))->setChecked(lMode & Renderer::CometLabels); >+ ((KToggleAction*)action("showConstellationLabels"))->setChecked(lMode & Renderer::ConstellationLabels); >+ ((KToggleAction*)action("showGalaxyLabels"))->setChecked(lMode & Renderer::GalaxyLabels); >+ ((KToggleAction*)action("showAsteroidLabels"))->setChecked(lMode & Renderer::AsteroidLabels); >+ ((KToggleAction*)action("showSpacecraftLabels"))->setChecked(lMode & Renderer::SpacecraftLabels); >+ ((KToggleAction*)action("showLocationLabels"))->setChecked(lMode & Renderer::LocationLabels); >+ >+ switch (renderer->getGLContext()->getRenderPath()) { >+ case GLContext::GLPath_Basic: >+ ((KToggleAction*)action("renderPathBasic"))->setChecked(true); >+ break; >+ case GLContext::GLPath_Multitexture: >+ ((KToggleAction*)action("renderPathMultitexture"))->setChecked(true); >+ break; >+ case GLContext::GLPath_NvCombiner: >+ ((KToggleAction*)action("renderPathNvCombiner"))->setChecked(true); >+ break; >+ case GLContext::GLPath_DOT3_ARBVP: >+ ((KToggleAction*)action("renderPathDOT3ARBVP"))->setChecked(true); >+ break; >+ case GLContext::GLPath_NvCombiner_NvVP: >+ ((KToggleAction*)action("renderPathNvCombinerNvVP"))->setChecked(true); >+ break; >+ case GLContext::GLPath_NvCombiner_ARBVP: >+ ((KToggleAction*)action("renderPathNvCombinerARBVP"))->setChecked(true); >+ break; >+ case GLContext::GLPath_ARBFP_ARBVP: >+ ((KToggleAction*)action("renderPathARBFPARBVP"))->setChecked(true); >+ break; >+ case GLContext::GLPath_NV30: >+ ((KToggleAction*)action("renderPathNV30"))->setChecked(true); >+ break; >+ } >+} >+ >+void KdeApp::resyncAmbient() { >+} >+void KdeApp::resyncFaintest() { >+} >+void KdeApp::resyncVerbosity() { >+} >+ >+void KdeApp::initActions() >+{ >+ KStdAction::open(this, SLOT(slotFileOpen()), actionCollection()); >+ openRecent = KStdAction::openRecent(this, SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); >+ openRecent->loadEntries(KGlobal::config()); >+ connect(openRecent, SIGNAL(urlSelected(const KURL&)), SLOT(slotOpenFileURL(const KURL&))); >+ >+ KStdAction::quit(this, SLOT(slotClose()), actionCollection()); >+ KStdAction::configureToolbars( this, SLOT( slotConfigureToolbars() ), actionCollection() ); >+ >+ new KAction(i18n("Go to &URL..."), 0, ALT + Key_G, this, SLOT(slotGoTo()), actionCollection(), "go_to"); >+ new KAction(i18n("Go to &Long/Lat..."), 0, ALT + Key_L, this, SLOT(slotGoToLongLat()), actionCollection(), "go_to_long_lat"); >+ >+ backAction = new KToolBarPopupAction( i18n("&Back"), "back", >+ KStdAccel::key(KStdAccel::Back), this, SLOT( slotBack() ), >+ actionCollection(), KStdAction::stdName( KStdAction::Back ) ); >+ forwardAction = new KToolBarPopupAction( i18n("&Forward"), "forward", >+ KStdAccel::key(KStdAccel::Forward), this, SLOT( slotForward() ), >+ actionCollection(), KStdAction::stdName( KStdAction::Forward ) ); >+ connect( backAction->popupMenu(), SIGNAL( aboutToShow() ), SLOT( slotBackAboutToShow() ) ); >+ connect( backAction->popupMenu(), SIGNAL( activated( int ) ), SLOT( slotBackActivated( int ) ) ); >+ connect( forwardAction->popupMenu(), SIGNAL( aboutToShow() ), SLOT( slotForwardAboutToShow() ) ); >+ connect( forwardAction->popupMenu(), SIGNAL( activated( int ) ), SLOT( slotForwardActivated( int ) ) ); >+ new KAction(i18n("Home"), "gohome", CTRL + Key_Home, this, SLOT(slotHome()), actionCollection(), "home"); >+ action("go_forward")->setEnabled(false); >+ action("go_back")->setEnabled(false); >+ >+ KStdAction::zoomIn(this, SLOT(slotZoomIn()), actionCollection()); >+ KStdAction::zoomOut(this, SLOT(slotZoomOut()), actionCollection()); >+ >+ KActionMenu *bookmarks = new KActionMenu( i18n("Bookmarks"), "bookmark", actionCollection(), "bookmarks" ); >+ new KCelBookmarkMenu( KCelBookmarkManager::self(), this, >+ bookmarks->popupMenu(), actionCollection(), true, true ); >+ >+ >+ KStdAction::preferences(this, SLOT(slotPreferences()), actionCollection()); >+ KStdAction::configureToolbars(this, SLOT(slotConfigureToolbars()), actionCollection()); >+ KStdAction::keyBindings(this, SLOT(slotKeyBindings()), actionCollection()); >+ >+ new KAction(i18n("Full Screen"), "window_fullscreen", CTRL + Key_F, this, SLOT(slotFullScreen()), actionCollection(), "fullScreen"); >+ new KAction(i18n("Copy URL"), "edit_copy", CTRL + Key_C, this, SLOT(slotCopyUrl()), actionCollection(), "copyUrl"); >+ >+ >+ new KAction(i18n("Set Time..."), "kalarm", ALT + Key_T, this, SLOT(slotSetTime()), actionCollection(), "setTime"); >+ new KAction(i18n("Set Time to Now"), "player_eject", Key_Exclam, this, SLOT(slotSetTimeNow()), actionCollection(), "setTimeNow"); >+ new KAction(i18n("Accelerate Time"), "1uparrow", Key_L, this, SLOT(slotAccelerateTime()), actionCollection(), "accelerateTime"); >+ new KAction(i18n("Decelerate Time"), "1downarrow", Key_K, this, SLOT(slotSlowDownTime()), actionCollection(), "slowDownTime"); >+ new KAction(i18n("Pause Time"), "player_pause", Key_Space, this, SLOT(slotPauseTime()), actionCollection(), "pauseTime"); >+ new KAction(i18n("Reverse Time"), "reload", Key_J, this, SLOT(slotReverseTime()), actionCollection(), "reverseTime"); >+ >+ new KAction(i18n("Split View Vertically"), "view_top_bottom", CTRL + Key_R, this, SLOT(slotSplitH()), actionCollection(), "splitH"); >+ new KAction(i18n("Split View Horizontally"), "view_left_right", CTRL + Key_U, this, SLOT(slotSplitV()), actionCollection(), "splitV"); >+ new KAction(i18n("Cycle View"), "rotate_cw", Key_Tab, this, SLOT(slotCycleView()), actionCollection(), "cycleView"); >+ new KAction(i18n("Single View"), "view_remove", CTRL + Key_D, this, SLOT(slotSingleView()), actionCollection(), "singleView"); >+ new KAction(i18n("Delete View"), "view_remove", Key_Delete, this, SLOT(slotDeleteView()), actionCollection(), "deleteView"); >+ KToggleAction* framesVisible = new KToggleAction(i18n("Frames Visible"), 0, 0, this, SLOT(slotToggleFramesVisible()), actionCollection(), "framesVisible"); >+ KGlobal::config()->setGroup("Preferences"); >+ if (KGlobal::config()->hasKey("FramesVisible")) >+ { >+ bool visible = KGlobal::config()->readBoolEntry("FramesVisible"); >+ framesVisible->setChecked(visible); >+ appCore->setFramesVisible(visible); >+ } >+ else >+ { >+ framesVisible->setChecked(appCore->getFramesVisible()); >+ } >+ >+ KToggleAction* activeFrameVisible = new KToggleAction(i18n("Active Frame Visible"), 0, 0, this, SLOT(slotToggleActiveFrameVisible()), actionCollection(), "activeFrameVisible"); >+ if (KGlobal::config()->hasKey("ActiveFrameVisible")) >+ { >+ bool visible = KGlobal::config()->readBoolEntry("ActiveFrameVisible"); >+ activeFrameVisible->setChecked(visible); >+ appCore->setActiveFrameVisible(visible); >+ } >+ else >+ { >+ activeFrameVisible->setChecked(appCore->getActiveFrameVisible()); >+ } >+ >+ KToggleAction* timeSync = new KToggleAction(i18n("Synchronize Time"), 0, 0, this, SLOT(slotToggleSyncTime()), actionCollection(), "syncTime"); >+ if (KGlobal::config()->hasKey("SyncTime")) >+ { >+ bool sync = KGlobal::config()->readBoolEntry("SyncTime"); >+ timeSync->setChecked(sync); >+ appCore->getSimulation()->setSyncTime(sync); >+ } >+ else >+ { >+ timeSync->setChecked(appCore->getSimulation()->getSyncTime()); >+ } >+ >+ new KAction(i18n("Alt-Azimuth Mode"), 0, ALT + Key_F, this, SLOT(slotAltAzMode()), actionCollection(), "altAzMode"); >+ new KAction(i18n("Go To Surface"), 0, ALT + Key_S, this, SLOT(slotGoToSurface()), actionCollection(), "goToSurface"); >+ >+ new KAction(i18n("Celestial Browser"), 0, ALT + Key_C, this, SLOT(slotCelestialBrowser()), actionCollection(), "celestialBrowser"); >+ new KAction(i18n("Eclipse Finder"), 0, ALT + Key_E, this, SLOT(slotEclipseFinder()), actionCollection(), "eclipseFinder"); >+ >+ int rFlags, lMode, oMask; >+ bool isLocal = true; >+ if (KGlobal::config()->hasKey("RendererFlags")) >+ rFlags = KGlobal::config()->readNumEntry("RendererFlags"); >+ else rFlags = appCore->getRenderer()->getRenderFlags(); >+ >+ if (KGlobal::config()->hasKey("LabelMode")) >+ lMode = KGlobal::config()->readNumEntry("LabelMode"); >+ else lMode = appCore->getRenderer()->getLabelMode(); >+ >+ oMask = appCore->getRenderer()->getOrbitMask(); >+ >+ if (KGlobal::config()->hasKey("TimeZoneBias")) >+ isLocal = (KGlobal::config()->readNumEntry("TimeZoneBias") != 0); >+ >+ KToggleAction* showStars = new KToggleAction(i18n("Show Stars"), 0, this, SLOT(slotShowStars()), actionCollection(), "showStars"); >+ showStars->setChecked(rFlags & Renderer::ShowStars); >+ >+ KToggleAction* showPlanets = new KToggleAction(i18n("Show Planets"), 0, this, SLOT(slotShowPlanets()), actionCollection(), "showPlanets"); >+ showPlanets->setChecked(rFlags & Renderer::ShowPlanets); >+ >+ KToggleAction* showGalaxies = new KToggleAction(i18n("Show Galaxies"), Key_U, this, SLOT(slotShowGalaxies()), actionCollection(), "showGalaxies"); >+ showGalaxies->setChecked(rFlags & Renderer::ShowGalaxies); >+ >+ KToggleAction* showDiagrams = new KToggleAction(i18n("Show Constellations"), Key_Slash, this, SLOT(slotShowDiagrams()), actionCollection(), "showDiagrams"); >+ showDiagrams->setChecked(rFlags & Renderer::ShowDiagrams); >+ >+ KToggleAction* showCloudMaps = new KToggleAction(i18n("Show CloudMaps"), Key_I, this, SLOT(slotShowCloudMaps()), actionCollection(), "showCloudMaps"); >+ showCloudMaps->setChecked(rFlags & Renderer::ShowCloudMaps); >+ >+ KToggleAction* showOrbits = new KToggleAction(i18n("Show Orbits"), Key_O, this, SLOT(slotShowOrbits()), actionCollection(), "showOrbits"); >+ showOrbits->setChecked(rFlags & Renderer::ShowOrbits); >+ >+ KToggleAction* showAsteroidOrbits = new KToggleAction(i18n("Show Asteroid Orbits"), 0, this, SLOT(slotShowAsteroidOrbits()), actionCollection(), "showAsteroidOrbits"); >+ showAsteroidOrbits->setChecked(oMask & Body::Asteroid); >+ >+ KToggleAction* showCometOrbits = new KToggleAction(i18n("Show Comet Orbits"), 0, this, SLOT(slotShowCometOrbits()), actionCollection(), "showCometOrbits"); >+ showCometOrbits->setChecked(oMask & Body::Comet); >+ >+ KToggleAction* showMoonOrbits = new KToggleAction(i18n("Show Moon Orbits"), 0, this, SLOT(slotShowMoonOrbits()), actionCollection(), "showMoonOrbits"); >+ showMoonOrbits->setChecked(oMask & Body::Moon); >+ >+ KToggleAction* showPlanetOrbits = new KToggleAction(i18n("Show Planet Orbits"), 0, this, SLOT(slotShowPlanetOrbits()), actionCollection(), "showPlanetOrbits"); >+ showPlanetOrbits->setChecked(oMask & Body::Planet); >+ >+ KToggleAction* showSpacecraftOrbits = new KToggleAction(i18n("Show Spacecraft Orbits"), 0, this, SLOT(slotShowSpacecraftOrbits()), actionCollection(), "showSpacecraftOrbits"); >+ showSpacecraftOrbits->setChecked(oMask & Body::Spacecraft); >+ >+ KToggleAction* showCelestialSphere = new KToggleAction(i18n("Show Celestial Grid"), Key_Semicolon, this, SLOT(slotShowCelestialSphere()), actionCollection(), "showCelestialSphere"); >+ showCelestialSphere->setChecked(rFlags & Renderer::ShowCelestialSphere); >+ >+ KToggleAction* showNightMaps = new KToggleAction(i18n("Show Night Side Lights"), CTRL + Key_L, this, SLOT(slotShowNightMaps()), actionCollection(), "showNightMaps"); >+ showNightMaps->setChecked(rFlags & Renderer::ShowNightMaps); >+ >+ KToggleAction* showMarkers = new KToggleAction(i18n("Show Markers"), CTRL + Key_K, this, SLOT(slotShowMarkers()), actionCollection(), "showMarkers"); >+ showMarkers->setChecked(rFlags & Renderer::ShowMarkers); >+ >+ KToggleAction* showAtmospheres = new KToggleAction(i18n("Show Atmospheres"), CTRL + Key_A, this, SLOT(slotShowAtmospheres()), actionCollection(), "showAtmospheres"); >+ showAtmospheres->setChecked(rFlags & Renderer::ShowAtmospheres); >+ >+ KToggleAction* showSmoothLines = new KToggleAction(i18n("Show Smooth Orbit Lines"), CTRL + Key_X, this, SLOT(slotShowSmoothLines()), actionCollection(), "showSmoothLines"); >+ showSmoothLines->setChecked(rFlags & Renderer::ShowSmoothLines); >+ >+ KToggleAction* showEclipseShadows = new KToggleAction(i18n("Show Eclipse Shadows"), CTRL + Key_E, this, SLOT(slotShowEclipseShadows()), actionCollection(), "showEclipseShadows"); >+ showEclipseShadows->setChecked(rFlags & Renderer::ShowEclipseShadows); >+ >+ new KAction(i18n("Cycle Star Mode"), CTRL + Key_S, this, SLOT(slotCycleStarMode()), actionCollection(), "cycleStarMode"); >+ >+ KToggleAction* showRingShadows = new KToggleAction(i18n("Show Ring Shadows"), 0, this, SLOT(slotShowRingShadows()), actionCollection(), "showRingShadows"); >+ showRingShadows->setChecked(rFlags & Renderer::ShowRingShadows); >+ >+ KToggleAction* showBoundaries = new KToggleAction(i18n("Show Boundaries"), CTRL + Key_B, this, SLOT(slotShowBoundaries()), actionCollection(), "showBoundaries"); >+ showBoundaries->setChecked(rFlags & Renderer::ShowBoundaries); >+ >+ new KToggleAction(i18n("Auto Magnitudes"), CTRL + Key_Y, this, SLOT(slotShowAutoMag()), actionCollection(), "showAutoMag"); >+ showBoundaries->setChecked(rFlags & Renderer::ShowAutoMag); >+ >+ KToggleAction* showCometTails = new KToggleAction(i18n("Show Comet Tails"), CTRL + Key_T, this, SLOT(slotShowCometTails()), actionCollection(), "showCometTails"); >+ showCometTails->setChecked(rFlags & Renderer::ShowCometTails); >+ >+ KToggleAction* showStarLabels = new KToggleAction(i18n("Show Star Labels"), Key_B, this, SLOT(slotShowStarLabels()), actionCollection(), "showStarLabels"); >+ showStarLabels->setChecked(lMode & Renderer::StarLabels); >+ >+ KToggleAction* showPlanetLabels = new KToggleAction(i18n("Show Planet Labels"), Key_P, this, SLOT(slotShowPlanetLabels()), actionCollection(), "showPlanetLabels"); >+ showPlanetLabels->setChecked(lMode & Renderer::PlanetLabels); >+ >+ KToggleAction* showMoonLabels = new KToggleAction(i18n("Show Moon Labels"), Key_M, this, SLOT(slotShowMoonLabels()), actionCollection(), "showMoonLabels"); >+ showMoonLabels->setChecked(lMode & Renderer::MoonLabels); >+ >+ KToggleAction* showCometLabels = new KToggleAction(i18n("Show Comet Labels"), SHIFT + Key_W, this, SLOT(slotShowCometLabels()), actionCollection(), "showCometLabels"); >+ showMoonLabels->setChecked(lMode & Renderer::CometLabels); >+ >+ >+ KToggleAction* showConstellationLabels = new KToggleAction(i18n("Show Constellation Labels"), Key_Equal, this, SLOT(slotShowConstellationLabels()), actionCollection(), "showConstellationLabels"); >+ showConstellationLabels->setChecked(lMode & Renderer::ConstellationLabels); >+ >+ KToggleAction* showGalaxyLabels = new KToggleAction(i18n("Show Galaxy Labels"), Key_E, this, SLOT(slotShowGalaxyLabels()), actionCollection(), "showGalaxyLabels"); >+ showGalaxyLabels->setChecked(lMode & Renderer::GalaxyLabels); >+ >+ KToggleAction* showAsteroidLabels = new KToggleAction(i18n("Show Asteroid Labels"), Key_W, this, SLOT(slotShowAsteroidLabels()), actionCollection(), "showAsteroidLabels"); >+ showAsteroidLabels->setChecked(lMode & Renderer::AsteroidLabels); >+ >+ KToggleAction* showSpacecraftLabels = new KToggleAction(i18n("Show Spacecraft Labels"), Key_N, this, SLOT(slotShowSpacecraftLabels()), actionCollection(), "showSpacecraftLabels"); >+ showSpacecraftLabels->setChecked(lMode & Renderer::SpacecraftLabels); >+ >+ KToggleAction* showLocationLabels = new KToggleAction(i18n("Show Location Labels"), Key_Ampersand, this, SLOT(slotShowLocationLabels()), actionCollection(), "showLocationLabels"); >+ showLocationLabels->setChecked(lMode & Renderer::LocationLabels); >+ >+ KToggleAction* displayLocalTime = new KToggleAction(i18n("Display Local Time"), ALT + Key_U, this, SLOT(slotDisplayLocalTime()), actionCollection(), "displayLocalTime"); >+ displayLocalTime->setChecked(isLocal); >+ >+ new KToggleAction(i18n("Wireframe Mode"), CTRL + Key_W, this, SLOT(slotWireframeMode()), actionCollection(), "wireframeMode"); >+ >+ new KAction(i18n("Center on Orbit"), SHIFT + Key_C, this, SLOT(slotCenterCO()), actionCollection(), "centerCO"); >+ >+ >+ KToggleAction *renderPath = 0; >+ renderPath = new KToggleAction(i18n("Basic"), 0, this, SLOT(slotSetRenderPathBasic()), actionCollection(), "renderPathBasic"); >+ renderPath->setExclusiveGroup("renderPath"); >+ renderPath = new KToggleAction(i18n("Multitexture"), 0, this, SLOT(slotSetRenderPathMultitexture()), actionCollection(), "renderPathMultitexture"); >+ renderPath->setExclusiveGroup("renderPath"); >+ renderPath = new KToggleAction(i18n("NvCombiners"), 0, this, SLOT(slotSetRenderPathNvCombiner()), actionCollection(), "renderPathNvCombiner"); >+ renderPath->setExclusiveGroup("renderPath"); >+ renderPath = new KToggleAction(i18n("DOT3 ARBVP"), 0, this, SLOT(slotSetRenderPathDOT3ARBVP()), actionCollection(), "renderPathDOT3ARBVP"); >+ renderPath->setExclusiveGroup("renderPath"); >+ renderPath = new KToggleAction(i18n("NvCombiner NvVP"), 0, this, SLOT(slotSetRenderPathNvCombinerNvVP()), actionCollection(), "renderPathNvCombinerNvVP"); >+ renderPath->setExclusiveGroup("renderPath"); >+ renderPath = new KToggleAction(i18n("NvCombiner ARBVP"), 0, this, SLOT(slotSetRenderPathNvCombinerARBVP()), actionCollection(), "renderPathNvCombinerARBVP"); >+ renderPath->setExclusiveGroup("renderPath"); >+ renderPath = new KToggleAction(i18n("ARBFP ARBVP"), 0, this, SLOT(slotSetRenderPathARBFPARBVP()), actionCollection(), "renderPathARBFPARBVP"); >+ renderPath->setExclusiveGroup("renderPath"); >+ renderPath = new KToggleAction(i18n("NV30"), 0, this, SLOT(slotSetRenderPathNV30()), actionCollection(), "renderPathNV30"); >+ renderPath->setExclusiveGroup("renderPath"); >+ new KAction(i18n("Cycle OpenGL Render Path"), "reload", CTRL + Key_V, this, SLOT(slotCycleRenderPath()), actionCollection(), "cycleRenderPath"); >+ >+ new KAction(i18n("Grab Image"), "filesave", CTRL + Key_G, this, SLOT(slotGrabImage()), actionCollection(), "grabImage"); >+ >+ new KAction(i18n("OpenGL info"), 0, this, SLOT(slotOpenGLInfo()), >+ actionCollection(), "opengl_info"); >+ >+ toggleMenubar=KStdAction::showMenubar(this, SLOT(slotToggleMenubar()), actionCollection()); >+ toggleToolbar=KStdAction::showToolbar(this, SLOT(slotToggleToolbar()), actionCollection()); >+ >+ new KToggleAction(i18n("Show Bookmark Toolbar"), 0, this, >+ SLOT(slotShowBookmarkBar()), actionCollection(), "showBookmarkBar"); >+ >+ createGUI(); >+ >+ bookmarkBarActionCollection = new KActionCollection( this ); >+ bookmarkBarActionCollection->setHighlightingEnabled( true ); >+ >+ bookmarkBar = 0; >+ initBookmarkBar(); >+ >+} >+ >+void KdeApp::initBookmarkBar() { >+ KToolBar *bar = new KToolBar(this, QMainWindow::Top, true, "bookmarkBar"); >+ >+ if (bookmarkBar) delete bookmarkBar; >+ bookmarkBar = new KBookmarkBar( KCelBookmarkManager::self(), this, bar, bookmarkBarActionCollection, this, "bookmarkBar"); >+ if (bar->count() == 0) bar->hide(); >+ >+ applyMainWindowSettings( KGlobal::config(), "MainWindow" ); >+ >+ if (bar->isHidden()) ((KToggleAction*)actionCollection()->action("showBookmarkBar"))->setChecked(false); >+ else ((KToggleAction*)actionCollection()->action("showBookmarkBar"))->setChecked(true); >+} >+ >+ >+bool KdeApp::queryExit() { >+ KConfig* conf = kapp->config(); >+ saveMainWindowSettings(conf, "MainWindow"); >+ conf->setGroup("MainWindow"); >+ saveWindowSize(conf); >+ conf->setGroup("Preferences"); >+ conf->writeEntry("RendererFlags", appCore->getRenderer()->getRenderFlags()); >+ conf->writeEntry("LabelMode", appCore->getRenderer()->getLabelMode()); >+ conf->writeEntry("AmbientLightLevel", appCore->getRenderer()->getAmbientLightLevel()); >+ conf->writeEntry("FaintestVisible", appCore->getSimulation()->getFaintestVisible()); >+ conf->writeEntry("HudDetail", appCore->getHudDetail()); >+ conf->writeEntry("TimeZoneBias", appCore->getTimeZoneBias()); >+ conf->writeEntry("RenderPath", appCore->getRenderer()->getGLContext()->getRenderPath()); >+ conf->writeEntry("FramesVisible", appCore->getFramesVisible()); >+ conf->writeEntry("ActiveFrameVisible", appCore->getActiveFrameVisible()); >+ conf->writeEntry("SyncTime", appCore->getSimulation()->getSyncTime()); >+ conf->writeEntry("DistanceToScreen", appCore->getDistanceToScreen()); >+ conf->setGroup(0); >+ actionCollection()->writeShortcutSettings("Shortcuts", conf); >+ openRecent->saveEntries(KGlobal::config()); >+ return true; >+} >+ >+bool KdeApp::queryClose() { >+ KConfig* conf = kapp->config(); >+ saveMainWindowSettings(conf, "MainWindow"); >+ conf->setGroup("MainWindow"); >+ saveWindowSize(conf); >+ conf->setGroup("Preferences"); >+ conf->writeEntry("RendererFlags", appCore->getRenderer()->getRenderFlags()); >+ conf->setGroup(0); >+ return true; >+} >+ >+ >+void KdeApp::slotNull() { >+ // dev only >+} >+ >+void KdeApp::slotFullScreen() { >+ static bool isFullScreen=false; >+ >+ if (isFullScreen) { >+ showNormal(); >+ action("fullScreen")->setIcon("window_fullscreen"); >+ } else { >+ showFullScreen(); >+ action("fullScreen")->setIcon("window_nofullscreen"); >+ } >+ isFullScreen = !isFullScreen; >+} >+ >+void KdeApp::slotHome() { >+ appCore->charEntered('h'); >+ appCore->charEntered('g'); >+} >+ >+void KdeApp::slotClose() { >+ close(); >+} >+ >+void KdeApp::slotZoomIn() { >+ appCore->charEntered(','); >+} >+ >+void KdeApp::slotZoomOut() { >+ appCore->charEntered('.'); >+} >+ >+void KdeApp::slotToggleToolbar() { >+ if (toolBar()->isVisible()) toolBar()->hide(); >+ else toolBar()->show(); >+} >+ >+void KdeApp::slotToggleMenubar() { >+ if (menuBar()->isVisible()) menuBar()->hide(); >+ else menuBar()->show(); >+} >+ >+void KdeApp::slotToggleFramesVisible() { >+ appCore->setFramesVisible(!appCore->getFramesVisible()); >+} >+ >+void KdeApp::slotToggleActiveFrameVisible() { >+ appCore->setActiveFrameVisible(!appCore->getActiveFrameVisible()); >+} >+ >+void KdeApp::slotToggleSyncTime() { >+ appCore->getSimulation()->setSyncTime(!appCore->getSimulation()->getSyncTime()); >+} >+ >+void KdeApp::slotConfigureToolbars() >+{ >+ saveMainWindowSettings( KGlobal::config(), "MainWindow" ); >+ KEditToolbar dlg(actionCollection()); >+ connect( &dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotNewToolbarConfig())); >+ if (dlg.exec()) >+ { >+ createGUI(); >+ initBookmarkBar(); >+ } >+} >+ >+void KdeApp::slotNewToolbarConfig() // This is called when OK or Apply is clicked >+{ >+// ...if you use any action list, use plugActionList on each here... >+ applyMainWindowSettings( KGlobal::config(), "MainWindow" ); >+} >+ >+void KdeApp::slotKeyBindings() >+{ >+ KKeyDialog dlg(false, this); >+ dlg.insert(actionCollection()); >+ if (dlg.exec()) { >+ dlg.commitChanges(); >+ } >+} >+ >+void KdeApp::slotFileOpen() >+{ >+#ifdef CELX >+ QString fileOpen = KFileDialog::getOpenFileName(0, "*.cel *.celx"); >+#else >+ QString fileOpen = KFileDialog::getOpenFileName(0, "*.cel"); >+#endif >+ if (fileOpen == "") return; >+ >+ slotOpenFileURL(KURL(fileOpen)); >+} >+ >+void KdeApp::slotOpenFileURL(const KURL& url) { >+ QString file = url.directory(false) + url.fileName(); >+ >+#ifdef CELX >+ if (file.right(5).compare(QString(".celx")) == 0) { >+ openRecent->addURL(url); >+ appCore->cancelScript(); >+ appCore->runScript(file.latin1()); >+ return; >+ } >+#endif >+ >+ ifstream scriptfile(file.latin1()); >+ if (!scriptfile.good()) { >+ KMessageBox::error(this, "Error opening script file " + file); >+ return; >+ } else { >+ CommandParser parser(scriptfile); >+ CommandSequence* script = parser.parse(); >+ if (script == NULL) { >+ const vector<string>* errors = parser.getErrors(); >+ const char* errorMsg = ""; >+ if (errors->size() > 0) >+ errorMsg = (*errors)[0].c_str(); >+ KMessageBox::error(this, "Errors in script file " + file + "\n" + errorMsg); >+ return; >+ } else { >+ openRecent->addURL(url); >+ appCore->cancelScript(); >+ appCore->runScript(script); >+ } >+ } >+} >+ >+ >+QString KdeApp::getOpenGLInfo() { >+ // Code grabbed from gtkmain.cpp >+ char* vendor = (char*) glGetString(GL_VENDOR); >+ char* render = (char*) glGetString(GL_RENDERER); >+ char* version = (char*) glGetString(GL_VERSION); >+ char* ext = (char*) glGetString(GL_EXTENSIONS); >+ QString s; >+ s = "Vendor : "; >+ if (vendor != NULL) >+ s += vendor; >+ s += "\n"; >+ >+ s += "Renderer : "; >+ if (render != NULL) >+ s += render; >+ s += "\n"; >+ >+ s += "Version : "; >+ if (version != NULL) >+ s += version; >+ s += "\n"; >+ >+ char buf[100]; >+ GLint simTextures = 1; >+ if (ExtensionSupported(const_cast<char*>("GL_ARB_multitexture"))) >+ glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &simTextures); >+ sprintf(buf, "Max simultaneous textures: %d\n", simTextures); >+ s += buf; >+ >+ GLint maxTextureSize = 0; >+ glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize); >+ sprintf(buf, "Max texture size: %d\n\n", maxTextureSize); >+ s += buf; >+ >+ s += "Supported Extensions:\n "; >+ if (ext != NULL) >+ { >+ QString extString(ext); >+ unsigned int pos = extString.find(' ', 0); >+ while (pos != string::npos) >+ { >+ extString.replace(pos, 1, "\n "); >+ pos = extString.find(' ', pos+5); >+ } >+ s += extString; >+ } >+ >+ return s; >+} >+ >+void KdeApp::slotOpenGLInfo() { >+ KDialogBase dlg(this, "openglinfo", true, i18n("OpenGL Info"), KDialogBase::Ok); >+ QTextEdit edit(&dlg); >+ edit.append(getOpenGLInfo()); >+ edit.setFocusPolicy(QWidget::NoFocus); >+ dlg.setMainWidget(&edit); >+ dlg.resize(400,430); >+ dlg.exec(); >+} >+ >+void KdeApp::slotPreferences() { >+ KdePreferencesDialog dlg(this, appCore); >+ >+ dlg.exec(); >+ resyncMenus(); >+} >+ >+void KdeApp::slotSetTime() { >+ KdePreferencesDialog dlg(this, appCore); >+ >+ dlg.showPage(1); >+ dlg.exec(); >+} >+ >+ >+void KdeApp::slotFileOpenRecent(const KURL&) >+{ >+ >+} >+ >+void KdeApp::slotReverseTime() { >+ appCore->charEntered('j'); >+} >+ >+void KdeApp::slotAccelerateTime() { >+ appCore->charEntered('l'); >+} >+ >+void KdeApp::slotPauseTime() { >+ appCore->charEntered(' '); >+} >+ >+void KdeApp::slotSlowDownTime() { >+ appCore->charEntered('k'); >+} >+ >+void KdeApp::slotSetTimeNow() { >+ time_t curtime=time(NULL); >+ appCore->getSimulation()->setTime((double) curtime / 86400.0 + (double) astro::Date(1970, 1, 1)); >+ appCore->getSimulation()->update(0.0); >+} >+ >+void KdeApp::slotShowStars() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowStars); >+} >+ >+void KdeApp::slotShowPlanets() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowPlanets); >+} >+ >+void KdeApp::slotShowGalaxies() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowGalaxies); >+} >+ >+void KdeApp::slotShowDiagrams() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowDiagrams); >+} >+ >+void KdeApp::slotShowCloudMaps() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowCloudMaps); >+} >+ >+void KdeApp::slotShowOrbits() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowOrbits); >+} >+ >+void KdeApp::slotShowAsteroidOrbits() { >+ appCore->getRenderer()->setOrbitMask( >+ appCore->getRenderer()->getOrbitMask() ^ Body::Asteroid); >+} >+ >+void KdeApp::slotShowCometOrbits() { >+ appCore->getRenderer()->setOrbitMask( >+ appCore->getRenderer()->getOrbitMask() ^ Body::Comet); >+} >+ >+void KdeApp::slotShowMoonOrbits() { >+ appCore->getRenderer()->setOrbitMask( >+ appCore->getRenderer()->getOrbitMask() ^ Body::Moon); >+} >+ >+void KdeApp::slotShowPlanetOrbits() { >+ appCore->getRenderer()->setOrbitMask( >+ appCore->getRenderer()->getOrbitMask() ^ Body::Planet); >+} >+ >+void KdeApp::slotShowSpacecraftOrbits() { >+ appCore->getRenderer()->setOrbitMask( >+ appCore->getRenderer()->getOrbitMask() ^ Body::Spacecraft); >+} >+ >+void KdeApp::slotShowCelestialSphere() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowCelestialSphere); >+} >+ >+void KdeApp::slotShowNightMaps() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowNightMaps); >+} >+ >+void KdeApp::slotShowMarkers() { >+ appCore->charEntered('\013'); >+} >+ >+void KdeApp::slotShowAtmospheres() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowAtmospheres); >+} >+ >+void KdeApp::slotShowSmoothLines() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowSmoothLines); >+} >+ >+void KdeApp::slotShowEclipseShadows() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowEclipseShadows); >+} >+ >+void KdeApp::slotCycleStarMode() { >+ appCore->charEntered('\023'); >+} >+ >+void KdeApp::slotShowRingShadows() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowRingShadows); >+} >+ >+void KdeApp::slotShowBoundaries() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowBoundaries); >+} >+ >+void KdeApp::slotShowAutoMag() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowAutoMag); >+} >+ >+void KdeApp::slotShowCometTails() { >+ appCore->getRenderer()->setRenderFlags( >+ appCore->getRenderer()->getRenderFlags() ^ Renderer::ShowCometTails); >+} >+ >+void KdeApp::slotShowStarLabels() { >+ appCore->getRenderer()->setLabelMode( >+ appCore->getRenderer()->getLabelMode() ^ Renderer::StarLabels); >+} >+ >+void KdeApp::slotShowPlanetLabels() { >+ appCore->getRenderer()->setLabelMode( >+ appCore->getRenderer()->getLabelMode() ^ Renderer::PlanetLabels); >+} >+ >+void KdeApp::slotShowMoonLabels() { >+ appCore->getRenderer()->setLabelMode( >+ appCore->getRenderer()->getLabelMode() ^ Renderer::MoonLabels); >+} >+ >+void KdeApp::slotShowCometLabels() { >+ appCore->getRenderer()->setLabelMode( >+ appCore->getRenderer()->getLabelMode() ^ Renderer::CometLabels); >+} >+ >+void KdeApp::slotShowConstellationLabels() { >+ appCore->getRenderer()->setLabelMode( >+ appCore->getRenderer()->getLabelMode() ^ Renderer::ConstellationLabels); >+} >+ >+void KdeApp::slotShowGalaxyLabels() { >+ appCore->getRenderer()->setLabelMode( >+ appCore->getRenderer()->getLabelMode() ^ Renderer::GalaxyLabels); >+} >+ >+void KdeApp::slotShowAsteroidLabels() { >+ appCore->getRenderer()->setLabelMode( >+ appCore->getRenderer()->getLabelMode() ^ Renderer::AsteroidLabels); >+} >+ >+void KdeApp::slotShowSpacecraftLabels() { >+ appCore->getRenderer()->setLabelMode( >+ appCore->getRenderer()->getLabelMode() ^ Renderer::SpacecraftLabels); >+} >+ >+void KdeApp::slotShowLocationLabels() { >+ appCore->getRenderer()->setLabelMode( >+ appCore->getRenderer()->getLabelMode() ^ Renderer::LocationLabels); >+} >+ >+void KdeApp::slotSplitH() { >+ appCore->charEntered('\022'); >+} >+ >+void KdeApp::slotSplitV() { >+ appCore->charEntered('\025'); >+} >+ >+void KdeApp::slotCycleView() { >+ appCore->charEntered('\011'); >+} >+ >+void KdeApp::slotAltAzMode() { >+ appCore->charEntered('\006'); >+} >+ >+void KdeApp::slotGoToSurface() { >+ appCore->charEntered('\007'); >+} >+ >+void KdeApp::slotSingleView() { >+ appCore->charEntered('\004'); >+} >+ >+void KdeApp::slotDeleteView() { >+ appCore->charEntered(127); >+} >+ >+void KdeApp::slotAmbientLightLevel(float l) { >+ appCore->getRenderer()->setAmbientLightLevel(l); >+} >+ >+void KdeApp::slotFaintestVisible(float m) { >+ appCore->getSimulation()->setFaintestVisible(m); >+} >+ >+void KdeApp::slotHudDetail(int l) { >+ appCore->setHudDetail(l); >+} >+ >+void KdeApp::slotDisplayLocalTime() { >+ if (appCore->getTimeZoneBias()) { >+ appCore->setTimeZoneBias(0); >+ appCore->setTimeZoneName(i18n("UTC").latin1()); >+ } else { >+ appCore->setTimeZoneBias(-timezone+3600*daylight); >+ appCore->setTimeZoneName(tzname[daylight?0:1]); >+ } >+} >+ >+void KdeApp::slotWireframeMode() { >+ static bool mode = false; >+ mode = !mode; >+ renderer->setRenderMode(mode ? GL_LINE : GL_FILL); >+} >+ >+void KdeApp::slotCenterCO() { >+ appCore->charEntered('C'); >+} >+ >+void KdeApp::slotSetRenderPathBasic() { >+ if (appCore->getRenderer()->getGLContext()->getRenderPath() != GLContext::GLPath_Basic) >+ appCore->getRenderer()->getGLContext()->setRenderPath(GLContext::GLPath_Basic); >+} >+ >+void KdeApp::slotSetRenderPathMultitexture() { >+ if (appCore->getRenderer()->getGLContext()->getRenderPath() != GLContext::GLPath_Multitexture) >+ appCore->getRenderer()->getGLContext()->setRenderPath(GLContext::GLPath_Multitexture); >+} >+ >+void KdeApp::slotSetRenderPathNvCombiner() { >+ if (appCore->getRenderer()->getGLContext()->getRenderPath() != GLContext::GLPath_NvCombiner) >+ appCore->getRenderer()->getGLContext()->setRenderPath(GLContext::GLPath_NvCombiner); >+} >+void KdeApp::slotSetRenderPathDOT3ARBVP() { >+ if (appCore->getRenderer()->getGLContext()->getRenderPath() != GLContext::GLPath_DOT3_ARBVP) >+ appCore->getRenderer()->getGLContext()->setRenderPath(GLContext::GLPath_DOT3_ARBVP); >+} >+void KdeApp::slotSetRenderPathNvCombinerNvVP() { >+ if (appCore->getRenderer()->getGLContext()->getRenderPath() != GLContext::GLPath_NvCombiner_NvVP) >+ appCore->getRenderer()->getGLContext()->setRenderPath(GLContext::GLPath_NvCombiner_NvVP); >+} >+void KdeApp::slotSetRenderPathNvCombinerARBVP() { >+ if (appCore->getRenderer()->getGLContext()->getRenderPath() != GLContext::GLPath_NvCombiner_ARBVP) >+ appCore->getRenderer()->getGLContext()->setRenderPath(GLContext::GLPath_NvCombiner_ARBVP); >+} >+void KdeApp::slotSetRenderPathARBFPARBVP() { >+ if (appCore->getRenderer()->getGLContext()->getRenderPath() != GLContext::GLPath_ARBFP_ARBVP) >+ appCore->getRenderer()->getGLContext()->setRenderPath(GLContext::GLPath_ARBFP_ARBVP); >+} >+void KdeApp::slotSetRenderPathNV30() { >+ if (appCore->getRenderer()->getGLContext()->getRenderPath() != GLContext::GLPath_NV30) >+ appCore->getRenderer()->getGLContext()->setRenderPath(GLContext::GLPath_NV30); >+} >+ >+void KdeApp::slotCycleRenderPath() { >+ appCore->charEntered('\026'); >+} >+ >+void KdeApp::slotGrabImage() { >+ QString saveAsName = KFileDialog::getSaveFileName(0, "*.png"); >+ if (saveAsName != "") { >+ QImage grabedImage = glWidget->grabFrameBuffer(); >+ grabedImage.save(saveAsName, "PNG"); >+ } >+} >+ >+void KdeApp::slotShowBookmarkBar() { >+ KToolBar * bar = static_cast<KToolBar *>( child( "bookmarkBar", "KToolBar" ) ); >+ if (bar->isVisible()) bar->hide(); >+ else bar->show(); >+} >+ >+void KdeApp::slotBack() { >+ appCore->back(); >+} >+ >+void KdeApp::slotForward() { >+ appCore->forward(); >+} >+ >+void KdeApp::slotCopyUrl() { >+ Url url(appCore); >+ static QClipboard *cb = QApplication::clipboard(); >+ cb->setText(url.getAsString().c_str()); >+} >+ >+void KdeApp::slotGoTo() { >+ KLineEditDlg dlg(i18n("Enter URL"), "", this); >+ >+ if (dlg.exec()) { >+ appCore->addToHistory(); >+ appCore->goToUrl(dlg.text().latin1()); >+ } >+} >+ >+void KdeApp::slotGoToLongLat() { >+ LongLatDialog dlg(this, appCore); >+ >+ dlg.exec(); >+} >+ >+void KdeApp::dragEnterEvent(QDragEnterEvent* event) { >+ KURL::List urls; >+ event->accept(KURLDrag::canDecode(event) && KURLDrag::decode(event, urls) && urls.first().protocol() == "cel"); >+} >+ >+void KdeApp::dropEvent(QDropEvent* event) { >+ KURL::List urls; >+ if (KURLDrag::decode(event, urls) && urls.first().protocol() == "cel") { >+ appCore->addToHistory(); >+ appCore->goToUrl(urls.first().url().latin1()); >+ } >+} >+ >+void KdeApp::slotBackAboutToShow() { >+ int i; >+ KPopupMenu* menu = backAction->popupMenu(); >+ std::vector<Url>::size_type current = appCore->getHistoryCurrent(); >+ int pos; >+ std::vector<Url> history = appCore->getHistory(); >+ >+ menu->clear(); >+ for (i=0, pos = current - 1 ; pos >= 0 && i < 15 ; pos--, i++) { >+ menu->insertItem(QString(history[pos].getName().c_str()), pos); >+ } >+} >+ >+void KdeApp::slotBackActivated(int i) { >+ appCore->setHistoryCurrent(i); >+} >+ >+void KdeApp::slotForwardAboutToShow() { >+ int i; >+ KPopupMenu* menu = forwardAction->popupMenu(); >+ std::vector<Url>::size_type current = appCore->getHistoryCurrent(); >+ std::vector<Url>::size_type pos; >+ std::vector<Url> history = appCore->getHistory(); >+ >+ menu->clear(); >+ for (i=0, pos = current + 1 ; pos < history.size() && i < 15 ; pos++, i++) { >+ menu->insertItem(QString(history[pos].getName().c_str()), pos); >+ } >+} >+ >+void KdeApp::slotForwardActivated(int i) { >+ appCore->setHistoryCurrent(i); >+} >+ >+void KdeApp::slotCelestialBrowser() { >+ static CelestialBrowser *cb = new CelestialBrowser(this, appCore); >+ >+ cb->show(); >+ cb->showNormal(); >+ cb->setActiveWindow(); >+ cb->raise(); >+} >+ >+void KdeApp::slotEclipseFinder() { >+ static EclipseFinderDlg *ef = new EclipseFinderDlg(this, appCore); >+ >+ ef->show(); >+ ef->showNormal(); >+ ef->setActiveWindow(); >+ ef->raise(); >+} >+ >+void KdeApp::popupMenu(float x, float y, Selection sel) { >+ SelectionPopup popup(app, app->appCore, sel); >+ popup.init(); >+ int id = popup.exec(app->glWidget->mapToGlobal(QPoint(int(x),int(y)))); >+ popup.process(id); >+} >+ >+LongLatDialog::LongLatDialog(QWidget* parent, CelestiaCore* appCore) : >+ KDialogBase(parent, "long_lat", true, "Go to Long/Lat"), appCore(appCore) >+{ >+ QGrid* grid = makeGridMainWidget(3, Qt::Horizontal); >+ >+ >+ QLabel* objLab = new QLabel(i18n("Object: "), grid); >+ objLab->setAlignment(Qt::AlignRight | Qt::AlignVCenter); >+ objEdit = new QLineEdit(grid); >+ new QLabel("", grid); >+ >+ QLabel* longLab = new QLabel(i18n("Longitude: "), grid); >+ longLab->setAlignment(Qt::AlignRight | Qt::AlignVCenter); >+ longEdit = new QLineEdit(grid); >+ longEdit->setAlignment(Qt::AlignRight | Qt::AlignVCenter); >+ longEdit->setValidator(new QDoubleValidator(0, 180, 3, longEdit)); >+ longSign = new QComboBox( grid ); >+ longSign->insertItem(i18n("East", "E")); >+ longSign->insertItem(i18n("West", "W")); >+ >+ QLabel* latLab = new QLabel(i18n("Latitude: "), grid); >+ latLab->setAlignment(Qt::AlignRight | Qt::AlignVCenter); >+ latEdit = new QLineEdit(grid); >+ latEdit->setAlignment(Qt::AlignRight | Qt::AlignVCenter); >+ latEdit->setValidator(new QDoubleValidator(0, 90, 3, latEdit)); >+ latSign = new QComboBox( grid ); >+ latSign->insertItem(i18n("North", "N")); >+ latSign->insertItem(i18n("South", "S")); >+ >+ QLabel* altLab = new QLabel(i18n("Altitude: "), grid); >+ altLab->setAlignment(Qt::AlignRight | Qt::AlignVCenter); >+ altEdit = new QLineEdit(grid); >+ altEdit->setAlignment(Qt::AlignRight | Qt::AlignVCenter); >+ altEdit->setValidator(new QDoubleValidator(altEdit)); >+ new QLabel(i18n("km"), grid); >+ >+ double distance, longitude, latitude; >+ appCore->getSimulation()->getSelectionLongLat(distance, longitude, latitude); >+ >+ if (longitude < 0) { >+ longitude = -longitude; >+ longSign->setCurrentItem(1); >+ } >+ if (latitude < 0) { >+ latitude = -latitude; >+ latSign->setCurrentItem(1); >+ } >+ >+ Selection selection = appCore->getSimulation()->getSelection(); >+ QString objName(selection.getName().c_str()); >+ objEdit->setText(objName.mid(objName.findRev('/') + 1)); >+ >+ latEdit->setText(QString("%1").arg(latitude, 0, 'f', 3)); >+ longEdit->setText(QString("%1").arg(longitude, 0, 'f', 3)); >+ altEdit->setText(QString("%1").arg(distance - selection.radius(), 0, 'f', 0)); >+ >+} >+ >+void LongLatDialog::slotCancel() { >+ reject(); >+} >+ >+void LongLatDialog::slotOk() { >+ slotApply(); >+ accept(); >+}KdeAlerter alerter; >+ >+ >+void LongLatDialog::slotApply() { >+ Simulation* appSim = appCore->getSimulation(); >+ Selection sel = appSim->findObjectFromPath(objEdit->text().latin1()); >+ if (!sel.empty()) >+ { >+ appSim->setSelection(sel); >+ appSim->follow(); >+ >+ double altitude = altEdit->text().toDouble(); >+ if (altitude < 0.020) altitude = .020; >+ double distance = altitude + sel.radius(); >+ distance = astro::kilometersToLightYears(distance); >+ >+ double longitude = longEdit->text().toDouble(); >+ if (longSign->currentItem() == 1) { >+ longitude = -longitude; >+ } >+ >+ double latitude = latEdit->text().toDouble(); >+ if (latSign->currentItem() == 1) { >+ latitude = -latitude; >+ } >+ >+ appSim->gotoSelectionLongLat(5.0, >+ distance, >+ degToRad(longitude), >+ degToRad(latitude), >+ Vec3f(0, 1, 0)); >+ } >+} >+ >+KdeAlerter::KdeAlerter(QWidget* _parent) : parent(_parent) >+{} >+ >+void KdeAlerter::fatalError(const std::string& err) >+{ >+ KMessageBox::detailedError(parent, i18n("Celestia encountered an error while processing your script"), QString(err.c_str())); >+} >+ >diff -urN celestia-1.3.1-old/src/celestia/kde/kdeglwidget.cpp celestia-1.3.1/src/celestia/kde/kdeglwidget.cpp >--- celestia-1.3.1-old/src/celestia/kde/kdeglwidget.cpp 1969-12-31 16:00:00.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/kdeglwidget.cpp 2003-12-14 11:32:53.000000000 -0800 >@@ -0,0 +1,446 @@ >+/*************************************************************************** >+ kdeglwidget.cpp - description >+ ------------------- >+ begin : Tue Jul 16 2002 >+ copyright : (C) 2002 by Christophe Teyssier >+ email : chris@teyssier.org >+ ***************************************************************************/ >+ >+/*************************************************************************** >+ * * >+ * This program is free software; you can redistribute it and/or modify * >+ * it under the terms of the GNU General Public License as published by * >+ * the Free Software Foundation; either version 2 of the License, or * >+ * (at your option) any later version. * >+ * * >+ ***************************************************************************/ >+ >+#include "kdeglwidget.h" >+#include <kaccel.h> >+ >+#include <unistd.h> >+#include <celengine/gl.h> >+//#include <celengine/glext.h> >+#include <celengine/celestia.h> >+#include <celengine/starbrowser.h> >+#include <kmainwindow.h> >+#include <kconfig.h> >+#include <qpaintdevicemetrics.h> >+ >+#ifndef DEBUG >+# define G_DISABLE_ASSERT >+#endif >+ >+#include "celmath/vecmath.h" >+#include "celmath/quaternion.h" >+#include "celmath/mathlib.h" >+#include "celengine/astro.h" >+#include "celutil/util.h" >+#include "celutil/filetype.h" >+#include "celutil/debug.h" >+#include "imagecapture.h" >+#include "celestiacore.h" >+#include "celengine/simulation.h" >+#include "celengine/glcontext.h" >+ >+#include "kdeapp.h" >+ >+#include <math.h> >+#include <vector> >+ >+KdeGlWidget::KdeGlWidget( QWidget* parent, const char* name, CelestiaCore* core ) >+ : QGLWidget( parent, name ) >+{ >+ if (chdir(CONFIG_DATA_DIR) == -1) >+ { >+// cerr << "Cannot chdir to '" << CONFIG_DATA_DIR << >+// "', probably due to improper installation\n"; >+ } >+ >+ actionColl = ((KdeApp*)parent)->actionCollection(); >+ >+ setFocusPolicy(QWidget::ClickFocus); >+ >+ appCore = core; >+ appRenderer=appCore->getRenderer(); >+ appSim = appCore->getSimulation(); >+ >+ >+ lastX = lastY = 0; >+ >+ if (!appCore->initSimulation()) >+ { >+ exit(1); >+ } >+ >+} >+ >+ >+/*! >+ Release allocated resources >+*/ >+ >+KdeGlWidget::~KdeGlWidget() >+{ >+} >+ >+ >+/*! >+ Paint the box. The actual openGL commands for drawing the box are >+ performed here. >+*/ >+ >+void KdeGlWidget::paintGL() >+{ >+ appCore->draw(); >+} >+ >+ >+/*! >+ Set up the OpenGL rendering state, and define display list >+*/ >+ >+void KdeGlWidget::initializeGL() >+{ >+ if (!appCore->initRenderer()) >+ { >+// cerr << "Failed to initialize renderer.\n"; >+ exit(1); >+ } >+ >+ time_t curtime=time(NULL); >+ appCore->start((double) curtime / 86400.0 + (double) astro::Date(1970, 1, 1)); >+ localtime(&curtime); /* Only doing this to set timezone as a side effect*/ >+ appCore->setTimeZoneBias(-timezone+3600*daylight); >+ appCore->setTimeZoneName(tzname[daylight?0:1]); >+ >+ KGlobal::config()->setGroup("Preferences"); >+ if (KGlobal::config()->hasKey("RendererFlags")) >+ appRenderer->setRenderFlags(KGlobal::config()->readNumEntry("RendererFlags")); >+ if (KGlobal::config()->hasKey("LabelMode")) >+ appRenderer->setLabelMode(KGlobal::config()->readNumEntry("LabelMode")); >+ if (KGlobal::config()->hasKey("AmbientLightLevel")) >+ appRenderer->setAmbientLightLevel(KGlobal::config()->readDoubleNumEntry("AmbientLightLevel")); >+ if (KGlobal::config()->hasKey("FaintestVisible")) >+ appCore->setFaintest(KGlobal::config()->readDoubleNumEntry("FaintestVisible")); >+ if (KGlobal::config()->hasKey("HudDetail")) >+ appCore->setHudDetail(KGlobal::config()->readNumEntry("HudDetail")); >+ if (KGlobal::config()->hasKey("TimeZoneBias")) >+ appCore->setTimeZoneBias(KGlobal::config()->readNumEntry("TimeZoneBias")); >+ >+ if (!appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_Basic)) >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathBasic")))->setEnabled(false); >+ if (!appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_Multitexture)) >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathMultitexture")))->setEnabled(false); >+ if (!appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_NvCombiner)) >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathNvCombiner")))->setEnabled(false); >+ if (!appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_DOT3_ARBVP)) >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathDOT3ARBVP")))->setEnabled(false); >+ if (!appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_NvCombiner_NvVP)) >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathNvCombinerNvVP")))->setEnabled(false); >+ if (!appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_NvCombiner_ARBVP)) >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathNvCombinerARBVP")))->setEnabled(false); >+ if (!appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_ARBFP_ARBVP)) >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathARBFPARBVP")))->setEnabled(false); >+ if (!appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_NV30)) >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathNV30")))->setEnabled(false); >+ >+ if (KGlobal::config()->hasKey("RenderPath")) { >+ GLContext::GLRenderPath path = (GLContext::GLRenderPath)KGlobal::config()->readNumEntry("RenderPath"); >+ if (appCore->getRenderer()->getGLContext()->renderPathSupported(path)) { >+ appCore->getRenderer()->getGLContext()->setRenderPath(path); >+ } >+ } >+ >+ switch (appCore->getRenderer()->getGLContext()->getRenderPath()) { >+ case GLContext::GLPath_Basic: >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathBasic")))->setChecked(true); >+ break; >+ case GLContext::GLPath_Multitexture: >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathMultitexture")))->setChecked(true); >+ break; >+ case GLContext::GLPath_NvCombiner: >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathNvCombiner")))->setChecked(true); >+ break; >+ case GLContext::GLPath_DOT3_ARBVP: >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathDOT3ARBVP")))->setChecked(true); >+ break; >+ case GLContext::GLPath_NvCombiner_NvVP: >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathNvCombinerNvVP")))->setChecked(true); >+ break; >+ case GLContext::GLPath_NvCombiner_ARBVP: >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathNvCombinerARBVP")))->setChecked(true); >+ break; >+ case GLContext::GLPath_ARBFP_ARBVP: >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathARBFPARBVP")))->setChecked(true); >+ break; >+ case GLContext::GLPath_NV30: >+ ((KToggleAction*)(((KdeApp*)parentWidget())->action("renderPathNV30")))->setChecked(true); >+ break; >+ } >+ >+ KGlobal::config()->setGroup(0); >+ >+ QPaintDeviceMetrics pdm(this); >+ appCore->setScreenDpi(pdm.logicalDpiY()); >+} >+ >+void KdeGlWidget::resizeGL( int w, int h ) >+{ >+/* QPaintDeviceMetrics pdm(this); >+ double fov = 2 * atan(h / (pdm.logicalDpiY() / 25.4) / 2. / 400.); >+ appCore->getSimulation()->getActiveObserver()->setFOV(fov); >+*/ >+ appCore->resize(w, h); >+} >+ >+void KdeGlWidget::mouseMoveEvent( QMouseEvent* m ) >+{ >+ int x = (int) m->x(); >+ int y = (int) m->y(); >+ >+ int buttons = 0; >+ if (m->state() & LeftButton) >+ buttons |= CelestiaCore::LeftButton; >+ if (m->state() & MidButton) >+ buttons |= CelestiaCore::MiddleButton; >+ if (m->state() & RightButton) >+ buttons |= CelestiaCore::RightButton; >+ if (m->state() & ShiftButton) >+ buttons |= CelestiaCore::ShiftKey; >+ if (m->state() & ControlButton) >+ buttons |= CelestiaCore::ControlKey; >+ >+ appCore->mouseMove(x - lastX, y - lastY, buttons); >+ >+ lastX = x; >+ lastY = y; >+} >+ >+void KdeGlWidget::mousePressEvent( QMouseEvent* m ) >+{ >+ lastX = (int) m->x(); >+ lastY = (int) m->y(); >+ >+ if (m->button() == LeftButton) >+ appCore->mouseButtonDown(m->x(), m->y(), CelestiaCore::LeftButton); >+ else if (m->button() == MidButton) >+ appCore->mouseButtonDown(m->x(), m->y(), CelestiaCore::MiddleButton); >+ else if (m->button() == RightButton) >+ appCore->mouseButtonDown(m->x(), m->y(), CelestiaCore::RightButton); >+ >+} >+ >+void KdeGlWidget::mouseReleaseEvent( QMouseEvent* m ) >+{ >+ lastX = (int) m->x(); >+ lastY = (int) m->y(); >+ if (m->button() == LeftButton) >+ appCore->mouseButtonUp(m->x(), m->y(), CelestiaCore::LeftButton); >+ else if (m->button() == MidButton) >+ appCore->mouseButtonUp(m->x(), m->y(), CelestiaCore::MiddleButton); >+ else if (m->button() == RightButton) >+ appCore->mouseButtonUp(m->x(), m->y(), CelestiaCore::RightButton); >+} >+ >+void KdeGlWidget::wheelEvent( QWheelEvent* w ) >+{ >+ if (w->delta() > 0 ) >+ { >+ appCore->mouseWheel(1.0f, 0); >+ } >+ else if (w->delta() < 0) >+ { >+ appCore->mouseWheel(-1.0f, 0); >+ } >+} >+ >+ >+bool KdeGlWidget::handleSpecialKey(QKeyEvent* e, bool down) >+{ >+ int k = -1; >+ switch (e->key()) >+ { >+ case Key_Up: >+ k = CelestiaCore::Key_Up; >+ break; >+ case Key_Down: >+ k = CelestiaCore::Key_Down; >+ break; >+ case Key_Left: >+ k = CelestiaCore::Key_Left; >+ break; >+ case Key_Right: >+ k = CelestiaCore::Key_Right; >+ break; >+ case Key_Home: >+ k = CelestiaCore::Key_Home; >+ break; >+ case Key_End: >+ k = CelestiaCore::Key_End; >+ break; >+ case Key_F1: >+ k = CelestiaCore::Key_F1; >+ break; >+ case Key_F2: >+ k = CelestiaCore::Key_F2; >+ break; >+ case Key_F3: >+ k = CelestiaCore::Key_F3; >+ break; >+ case Key_F4: >+ k = CelestiaCore::Key_F4; >+ break; >+ case Key_F5: >+ k = CelestiaCore::Key_F5; >+ break; >+ case Key_F6: >+ k = CelestiaCore::Key_F6; >+ break; >+ case Key_F7: >+ k = CelestiaCore::Key_F7; >+ break; >+ case Key_PageDown: >+ k = CelestiaCore::Key_PageDown; >+ break; >+ case Key_PageUp: >+ k = CelestiaCore::Key_PageUp; >+ break; >+/* case Key_F10: >+ if (down) >+ menuCaptureImage(); >+ break; */ >+ case Key_0: >+ if (e->state() & Qt::Keypad) >+ k = CelestiaCore::Key_NumPad0; >+ break; >+ case Key_1: >+ if (e->state() & Qt::Keypad) >+ k = CelestiaCore::Key_NumPad1; >+ break; >+ case Key_2: >+ if (e->state() & Qt::Keypad) >+ k = CelestiaCore::Key_NumPad2; >+ break; >+ case Key_3: >+ if (e->state() & Qt::Keypad) >+ k = CelestiaCore::Key_NumPad3; >+ break; >+ case Key_4: >+ if (e->state() & Qt::Keypad) >+ k = CelestiaCore::Key_NumPad4; >+ break; >+ case Key_5: >+ if (e->state() & Qt::Keypad) >+ k = CelestiaCore::Key_NumPad5; >+ break; >+ case Key_6: >+ if (e->state() & Qt::Keypad) >+ k = CelestiaCore::Key_NumPad6; >+ break; >+ case Key_7: >+ if (e->state() & Qt::Keypad) >+ k = CelestiaCore::Key_NumPad7; >+ break; >+ case Key_8: >+ if (e->state() & Qt::Keypad) >+ k = CelestiaCore::Key_NumPad8; >+ break; >+ case Key_9: >+ if (e->state() & Qt::Keypad) >+ k = CelestiaCore::Key_NumPad9; >+ break; >+ case Key_A: >+ k = 'A'; >+ break; >+ case Key_Z: >+ k = 'Z'; >+ break; >+ } >+ >+ if (k >= 0) >+ { >+ int buttons = 0; >+ if (e->state() & ShiftButton) >+ buttons |= CelestiaCore::ShiftKey; >+ >+ if (down) >+ appCore->keyDown(k, buttons); >+ else >+ appCore->keyUp(k); >+ return (k < 'A' || k > 'Z'); >+ } >+ else >+ { >+ return false; >+ } >+} >+ >+ >+void KdeGlWidget::keyPressEvent( QKeyEvent* e ) >+{ >+ static bool inputMode = false; >+ static std::vector<KAction*> actions; >+ switch (e->key()) >+ { >+ case Key_Escape: >+ if (inputMode) >+ { >+ for (unsigned int n=0; n<actionColl->count(); n++) { >+ if (actionColl->action(n)->shortcut().seq(0).key(0).modFlags()==0) >+ actionColl->action(n)->setEnabled(true); >+ } >+ inputMode = !inputMode; >+ } >+ appCore->charEntered('\033'); >+ break; >+ case Key_BackTab: >+ appCore->charEntered(CelestiaCore::Key_BackTab); >+ break; >+ case Key_Q: >+ if( e->state() == ControlButton ) >+ { >+ parentWidget()->close(); >+ } >+ // Intentional fallthrough if *not* Ctrl-Q >+ >+ default: >+ if (!handleSpecialKey(e, true)) >+ { >+ if ((e->text() != 0) && (e->text() != "")) >+ { >+ for (unsigned int i=0; i<e->text().length(); i++) >+ { >+ char c = e->text().at(i).latin1(); >+ if (c == 0x0D || c=='\033') { >+ if (!inputMode) { // entering input mode >+ for (unsigned int n=0; n<actionColl->count(); n++) { >+ if (actionColl->action(n)->shortcut().count() > 0 >+ && (actionColl->action(n)->shortcut().seq(0).key(0).modFlags() >+ & (KKey::CTRL | KKey::ALT | KKey::WIN )) == 0 ) { >+ actions.push_back(actionColl->action(n)); >+ actionColl->action(n)->setEnabled(false); >+ } >+ } >+ } else { // living input mode >+ for (std::vector<KAction*>::iterator n=actions.begin(); n<actions.end(); n++) { >+ (*n)->setEnabled(true); >+ } >+ actions.clear(); >+ } >+ inputMode = !inputMode; >+ } >+ if (c >= 0x20 || c == 0x0D || c== 0x08 || c=='\011') appCore->charEntered(c); >+ } >+ } >+ } >+ } >+ >+ >+} >+ >+ >+void KdeGlWidget::keyReleaseEvent( QKeyEvent* e ) >+{ >+ handleSpecialKey(e, false); >+} >diff -urN celestia-1.3.1-old/src/celestia/kde/kdemain.cpp celestia-1.3.1/src/celestia/kde/kdemain.cpp >--- celestia-1.3.1-old/src/celestia/kde/kdemain.cpp 1969-12-31 16:00:00.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/kdemain.cpp 2002-12-09 12:29:35.000000000 -0800 >@@ -0,0 +1,54 @@ >+/*************************************************************************** >+ kdemain.cpp - description >+ ------------------- >+ begin : Tue Jul 16 22:28:19 CEST 2002 >+ copyright : (C) 2002 by Christophe Teyssier >+ email : chris@teyssier.org >+ ***************************************************************************/ >+ >+/*************************************************************************** >+ * * >+ * This program is free software; you can redistribute it and/or modify * >+ * it under the terms of the GNU General Public License as published by * >+ * the Free Software Foundation; either version 2 of the License, or * >+ * (at your option) any later version. * >+ * * >+ ***************************************************************************/ >+ >+#include <kcmdlineargs.h> >+#include <kaboutdata.h> >+#include <klocale.h> >+ >+#include "kdeuniquecelestia.h" >+ >+static const char *description = >+ I18N_NOOP("Celestia"); >+// INSERT A DESCRIPTION FOR YOUR APPLICATION HERE >+ >+ >+static KCmdLineOptions options[] = >+{ { "+url", I18N_NOOP("Start and go to url"), 0}, >+ { 0, 0, 0 } >+ // INSERT YOUR COMMANDLINE OPTIONS HERE >+}; >+ >+int main(int argc, char *argv[]) >+{ >+ KAboutData aboutData( "celestia", I18N_NOOP("Celestia"), >+ VERSION, description, KAboutData::License_GPL, >+ "(c) 2002, Chris Laurel", 0, "http://www.shatters.net/celestia/", "chris@teyssier.org"); >+ aboutData.addAuthor("Chris Laurel",0, "claurel@shatters.net"); >+ aboutData.addAuthor("Clint Weisbrod",0, "cweisbrod@adelphia.net"); >+ aboutData.addAuthor("Fridger Schrempp",0, "t00fri@mail.desy.de"); >+ aboutData.addAuthor("Bob Ippolito",0, "bob@redivi.com"); >+ aboutData.addAuthor("Christophe Teyssier", "KDE interface", "chris@teyssier.org"); >+ >+ KCmdLineArgs::init( argc, argv, &aboutData ); >+ KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. >+ KUniqueApplication::addCmdLineOptions(); >+ >+ >+ KdeUniqueCelestia a; >+ >+ return a.exec(); >+} >diff -urN celestia-1.3.1-old/src/celestia/kde/kdepreferencesdialog.cpp celestia-1.3.1/src/celestia/kde/kdepreferencesdialog.cpp >--- celestia-1.3.1-old/src/celestia/kde/kdepreferencesdialog.cpp 1969-12-31 16:00:00.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/kdepreferencesdialog.cpp 2003-09-06 13:21:40.000000000 -0700 >@@ -0,0 +1,635 @@ >+/*************************************************************************** >+ kdepreferencesdialog.cpp - description >+ ------------------- >+ begin : Sun Jul 21 2002 >+ copyright : (C) 2002 by chris >+ email : chris@tux.teyssier.org >+ ***************************************************************************/ >+ >+/*************************************************************************** >+ * * >+ * This program is free software; you can redistribute it and/or modify * >+ * it under the terms of the GNU General Public License as published by * >+ * the Free Software Foundation; either version 2 of the License, or * >+ * (at your option) any later version. * >+ * * >+ ***************************************************************************/ >+ >+#include <qvbox.h> >+#include <kmainwindow.h> >+#include <kpushbutton.h> >+#include <qtextedit.h> >+#include <qcombobox.h> >+#include <klocale.h> >+#include <kconfig.h> >+#include <kiconloader.h> >+#include <qframe.h> >+#include <qgrid.h> >+#include <qcheckbox.h> >+#include <qvgroupbox.h> >+#include <qslider.h> >+#include <kkeydialog.h> >+#include <qspinbox.h> >+#include <qlabel.h> >+#include <qlayout.h> >+ >+ >+#include "kdeapp.h" >+#include "kdepreferencesdialog.h" >+#include "celengine/render.h" >+#include "celengine/glcontext.h" >+ >+KdePreferencesDialog::KdePreferencesDialog(QWidget* parent, CelestiaCore* core) : >+ KDialogBase (KDialogBase::IconList, "", >+ KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, KDialogBase::Ok,parent) >+{ >+ >+ setCaption(i18n("Celestia Preferences")); >+ appCore=core; >+ >+ this->parent = (KdeApp*)parent; >+ >+ // Render page >+ QGrid* renderFrame = addGridPage(2, Qt::Horizontal, i18n("Rendering"), i18n("Rendering"), >+ KGlobal::iconLoader()->loadIcon("configure", KIcon::NoGroup)); >+ >+ int renderFlags = appCore->getRenderer()->getRenderFlags(); >+ savedRendererFlags = renderFlags; >+ >+ KActionCollection* actionColl = ((KdeApp*)parent)->actionCollection(); >+ >+ QGroupBox* showGroup = new QGroupBox(1, Qt::Horizontal, i18n("Show"), renderFrame); >+ >+ QCheckBox* showStarsCheck = new QCheckBox(i18n("Stars"), showGroup); >+ actionColl->action("showStars")->connect(showStarsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showStarsCheck->setChecked(renderFlags & Renderer::ShowStars); >+ >+ QCheckBox* showPlanetsCheck = new QCheckBox(i18n("Planets"), showGroup); >+ actionColl->action("showPlanets")->connect(showPlanetsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showPlanetsCheck->setChecked(renderFlags & Renderer::ShowPlanets); >+ >+ QCheckBox* showGalaxiesCheck = new QCheckBox(i18n("Galaxies"), showGroup); >+ actionColl->action("showGalaxies")->connect(showGalaxiesCheck, SIGNAL(clicked()), SLOT(activate())); >+ showGalaxiesCheck->setChecked(renderFlags & Renderer::ShowGalaxies); >+ >+ QCheckBox* showDiagramsCheck = new QCheckBox(i18n("Constellations"), showGroup); >+ actionColl->action("showDiagrams")->connect(showDiagramsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showDiagramsCheck->setChecked(renderFlags & Renderer::ShowDiagrams); >+ >+ QCheckBox* showCloudMapsCheck = new QCheckBox(i18n("Clouds"), showGroup); >+ actionColl->action("showCloudMaps")->connect(showCloudMapsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showCloudMapsCheck->setChecked(renderFlags & Renderer::ShowCloudMaps); >+ >+ QCheckBox* showOrbitsCheck = new QCheckBox(i18n("Orbits"), showGroup); >+ actionColl->action("showOrbits")->connect(showOrbitsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showOrbitsCheck->setChecked(renderFlags & Renderer::ShowOrbits); >+ >+ QCheckBox* showCelestialSphereCheck = new QCheckBox(i18n("Celestial Grid"), showGroup); >+ actionColl->action("showCelestialSphere")->connect(showCelestialSphereCheck, SIGNAL(clicked()), SLOT(activate())); >+ showCelestialSphereCheck->setChecked(renderFlags & Renderer::ShowCelestialSphere); >+ >+ QCheckBox* showNightMapsCheck = new QCheckBox(i18n("Night Side Lights"), showGroup); >+ actionColl->action("showNightMaps")->connect(showNightMapsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showNightMapsCheck->setChecked(renderFlags & Renderer::ShowNightMaps); >+ >+ QCheckBox* showMarkersCheck = new QCheckBox(i18n("Markers"), showGroup); >+ actionColl->action("showMarkers")->connect(showMarkersCheck, SIGNAL(clicked()), SLOT(activate())); >+ showMarkersCheck->setChecked(renderFlags & Renderer::ShowMarkers); >+ >+ QCheckBox* showAtmospheresCheck = new QCheckBox(i18n("Atmospheres"), showGroup); >+ actionColl->action("showAtmospheres")->connect(showAtmospheresCheck, SIGNAL(clicked()), SLOT(activate())); >+ showAtmospheresCheck->setChecked(renderFlags & Renderer::ShowAtmospheres); >+ >+ QCheckBox* showSmoothLinesCheck = new QCheckBox(i18n("Smooth Orbit Lines"), showGroup); >+ actionColl->action("showSmoothLines")->connect(showSmoothLinesCheck, SIGNAL(clicked()), SLOT(activate())); >+ showSmoothLinesCheck->setChecked(renderFlags & Renderer::ShowSmoothLines); >+ >+ QCheckBox* showEclipseShadowsCheck = new QCheckBox(i18n("Eclipse Shadows"), showGroup); >+ actionColl->action("showEclipseShadows")->connect(showEclipseShadowsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showEclipseShadowsCheck->setChecked(renderFlags & Renderer::ShowEclipseShadows); >+ >+ QCheckBox* showRingShadowsCheck = new QCheckBox(i18n("Ring Shadows"), showGroup); >+ actionColl->action("showRingShadows")->connect(showRingShadowsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showRingShadowsCheck->setChecked(renderFlags & Renderer::ShowRingShadows); >+ >+ QCheckBox* showBoundariesCheck = new QCheckBox(i18n("Constellation Boundaries"), showGroup); >+ actionColl->action("showBoundaries")->connect(showBoundariesCheck, SIGNAL(clicked()), SLOT(activate())); >+ showBoundariesCheck->setChecked(renderFlags & Renderer::ShowBoundaries); >+ >+ QCheckBox* showAutoMagCheck = new QCheckBox(i18n("Auto Magnitudes"), showGroup); >+ actionColl->action("showAutoMag")->connect(showAutoMagCheck, SIGNAL(clicked()), SLOT(activate())); >+ showAutoMagCheck->setChecked(renderFlags & Renderer::ShowAutoMag); >+ >+ QCheckBox* showCometTailsCheck = new QCheckBox(i18n("Comet Tails"), showGroup); >+ actionColl->action("showCometTails")->connect(showCometTailsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showCometTailsCheck->setChecked(renderFlags & Renderer::ShowCometTails); >+ >+ >+ QVBox* vbox1 = new QVBox(renderFrame); >+ int labelMode = appCore->getRenderer()->getLabelMode(); >+ savedLabelMode = labelMode; >+ int orbitMask = appCore->getRenderer()->getOrbitMask(); >+ savedOrbitMask = orbitMask; >+ >+ QGroupBox* labelGroup = new QGroupBox(0, Qt::Horizontal, i18n("Orbits / Labels"), vbox1); >+ QGridLayout* labelGroupLayout = new QGridLayout( labelGroup->layout() ); >+ labelGroupLayout->setAlignment( Qt::AlignTop ); >+ >+ QLabel* orbitsLabel = new QLabel(i18n("Orbits"), labelGroup); >+ labelGroupLayout->addWidget(orbitsLabel, 0, 0); >+ QLabel* labelsLabel = new QLabel(i18n("Labels"), labelGroup); >+ labelGroupLayout->addWidget(labelsLabel, 0, 1); >+ >+ QCheckBox* showStarLabelsCheck = new QCheckBox(i18n("Stars"), labelGroup); >+ actionColl->action("showStarLabels")->connect(showStarLabelsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showStarLabelsCheck->setChecked(labelMode & Renderer::StarLabels); >+ labelGroupLayout->addWidget(showStarLabelsCheck, 1, 1); >+ >+ >+ QCheckBox* showPlanetOrbitsCheck = new QCheckBox("", labelGroup); >+ actionColl->action("showPlanetOrbits")->connect(showPlanetOrbitsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showPlanetOrbitsCheck->setChecked(orbitMask & Body::Planet); >+ labelGroupLayout->addWidget(showPlanetOrbitsCheck, 3, 0, Qt::AlignHCenter); >+ QCheckBox* showPlanetLabelsCheck = new QCheckBox(i18n("Planets"), labelGroup); >+ actionColl->action("showPlanetLabels")->connect(showPlanetLabelsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showPlanetLabelsCheck->setChecked(labelMode & Renderer::PlanetLabels); >+ labelGroupLayout->addWidget(showPlanetLabelsCheck, 3, 1); >+ >+ QCheckBox* showMoonOrbitsCheck = new QCheckBox("", labelGroup); >+ actionColl->action("showMoonOrbits")->connect(showMoonOrbitsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showMoonOrbitsCheck->setChecked(orbitMask & Body::Moon); >+ labelGroupLayout->addWidget(showMoonOrbitsCheck, 4, 0, Qt::AlignHCenter); >+ QCheckBox* showMoonLabelsCheck = new QCheckBox(i18n("Moons"), labelGroup); >+ actionColl->action("showMoonLabels")->connect(showMoonLabelsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showMoonLabelsCheck->setChecked(labelMode & Renderer::MoonLabels); >+ labelGroupLayout->addWidget(showMoonLabelsCheck, 4, 1); >+ >+ QCheckBox* showCometOrbitsCheck = new QCheckBox("", labelGroup); >+ actionColl->action("showCometOrbits")->connect(showCometOrbitsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showCometOrbitsCheck->setChecked(orbitMask & Body::Comet); >+ labelGroupLayout->addWidget(showCometOrbitsCheck, 5, 0, Qt::AlignHCenter); >+ QCheckBox* showCometLabelsCheck = new QCheckBox(i18n("Comets"), labelGroup); >+ actionColl->action("showCometLabels")->connect(showCometLabelsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showCometLabelsCheck->setChecked(labelMode & Renderer::CometLabels); >+ labelGroupLayout->addWidget(showCometLabelsCheck, 5, 1); >+ >+ QCheckBox* showConstellationLabelsCheck = new QCheckBox(i18n("Constellations"), labelGroup); >+ actionColl->action("showConstellationLabels")->connect(showConstellationLabelsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showConstellationLabelsCheck->setChecked(labelMode & Renderer::ConstellationLabels); >+ labelGroupLayout->addWidget(showConstellationLabelsCheck, 6, 1); >+ >+ QCheckBox* showGalaxyLabelsCheck = new QCheckBox(i18n("Galaxies"), labelGroup); >+ actionColl->action("showGalaxyLabels")->connect(showGalaxyLabelsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showGalaxyLabelsCheck->setChecked(labelMode & Renderer::GalaxyLabels); >+ labelGroupLayout->addWidget(showGalaxyLabelsCheck, 7, 1); >+ >+ QCheckBox* showAsteroidOrbitsCheck = new QCheckBox("", labelGroup); >+ actionColl->action("showAsteroidOrbits")->connect(showAsteroidOrbitsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showAsteroidOrbitsCheck->setChecked(orbitMask & Body::Asteroid); >+ labelGroupLayout->addWidget(showAsteroidOrbitsCheck, 8, 0, Qt::AlignHCenter); >+ QCheckBox* showAsteroidLabelsCheck = new QCheckBox(i18n("Asteroids"), labelGroup); >+ actionColl->action("showAsteroidLabels")->connect(showAsteroidLabelsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showAsteroidLabelsCheck->setChecked(labelMode & Renderer::AsteroidLabels); >+ labelGroupLayout->addWidget(showAsteroidLabelsCheck, 8, 1); >+ >+ QCheckBox* showSpacecraftOrbitsCheck = new QCheckBox("", labelGroup); >+ actionColl->action("showSpacecraftOrbits")->connect(showSpacecraftOrbitsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showSpacecraftOrbitsCheck->setChecked(orbitMask & Body::Spacecraft); >+ labelGroupLayout->addWidget(showSpacecraftOrbitsCheck, 9, 0, Qt::AlignHCenter); >+ QCheckBox* showSpacecraftLabelsCheck = new QCheckBox(i18n("Spacecrafts"), labelGroup); >+ actionColl->action("showSpacecraftLabels")->connect(showSpacecraftLabelsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showSpacecraftLabelsCheck->setChecked(labelMode & Renderer::SpacecraftLabels); >+ labelGroupLayout->addWidget(showSpacecraftLabelsCheck, 9, 1); >+ >+ QCheckBox* showLocationLabelsCheck = new QCheckBox(i18n("Locations"), labelGroup); >+ actionColl->action("showLocationLabels")->connect(showLocationLabelsCheck, SIGNAL(clicked()), SLOT(activate())); >+ showLocationLabelsCheck->setChecked(labelMode & Renderer::LocationLabels); >+ labelGroupLayout->addWidget(showLocationLabelsCheck, 10, 1); >+ >+ QSpacerItem* spacer = new QSpacerItem( 151, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); >+ labelGroupLayout->addItem( spacer, 0, 2 ); >+ >+ savedAmbientLightLevel = int(appCore->getRenderer()->getAmbientLightLevel() * 100); >+ QGroupBox* ambientLightGroup = new QGroupBox(1, Qt::Vertical, i18n("Ambient Light"), vbox1); >+ QSlider* ambientLightSlider = new QSlider(0, 25, 1, savedAmbientLightLevel, Qt::Horizontal, ambientLightGroup); >+ connect(ambientLightSlider, SIGNAL(valueChanged(int)), SLOT(slotAmbientLightLevel(int))); >+ ambientLabel = new QLabel(ambientLightGroup); >+ ambientLabel->setMinimumWidth(40); >+ ambientLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); >+ char buff[20]; >+ sprintf(buff, "%.2f", savedAmbientLightLevel / 100.); >+ ambientLabel->setText(buff); >+ >+ savedFaintestVisible = int(appCore->getSimulation()->getFaintestVisible() * 100); >+ QGroupBox* faintestVisibleGroup = new QGroupBox(1, Qt::Vertical, i18n("Limiting Magnitude"), vbox1); >+ QSlider* faintestVisibleSlider = new QSlider(1, 1200, 1, savedFaintestVisible, Qt::Horizontal, faintestVisibleGroup); >+ connect(faintestVisibleSlider, SIGNAL(valueChanged(int)), SLOT(slotFaintestVisible(int))); >+ faintestLabel = new QLabel(faintestVisibleGroup); >+ faintestLabel->setMinimumWidth(40); >+ faintestLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); >+ sprintf(buff, "%.2f", savedFaintestVisible / 100.); >+ faintestLabel->setText(buff); >+ >+ QGroupBox* infoTextGroup = new QGroupBox(1, Qt::Vertical, i18n("Info Text"), vbox1); >+ new QLabel(i18n("Level: "), infoTextGroup); >+ QComboBox* infoTextCombo = new QComboBox(infoTextGroup); >+ infoTextCombo->insertItem(i18n("None")); >+ infoTextCombo->insertItem(i18n("Terse")); >+ infoTextCombo->insertItem(i18n("Verbose")); >+ savedHudDetail = appCore->getHudDetail(); >+ infoTextCombo->setCurrentItem(savedHudDetail); >+ ((KdeApp*)parent)->connect(infoTextCombo, SIGNAL(activated(int)), SLOT(slotHudDetail(int))); >+ >+ QGroupBox* fovGroup = new QGroupBox(2, Qt::Horizontal, i18n("Automatic FOV"), vbox1); >+ new QLabel(i18n("Screen DPI: "), fovGroup); >+ new QLabel(QString::number(appCore->getScreenDpi(), 10), fovGroup); >+ new QLabel(i18n("Viewing Distance (cm): "), fovGroup); >+ dtsSpin = new QSpinBox(10, 300, 1, fovGroup); >+ savedDistanceToScreen = appCore->getDistanceToScreen(); >+ dtsSpin->setValue(savedDistanceToScreen / 10); >+ connect(dtsSpin, SIGNAL(valueChanged(int)), SLOT(slotDistanceToScreen(int))); >+ >+ // Time page >+ timeHasChanged = false; >+ QVBox* timeFrame = addVBoxPage(i18n("Date/Time"), i18n("Date/Time"), >+ KGlobal::iconLoader()->loadIcon("kalarm", KIcon::NoGroup)); >+ >+ savedDisplayLocalTime = appCore->getTimeZoneBias(); >+ QGroupBox* displayTimezoneGroup = new QGroupBox(1, Qt::Vertical, i18n("Display"), timeFrame); >+ new QLabel(i18n("Timezone: "), displayTimezoneGroup); >+ displayTimezoneCombo = new QComboBox(displayTimezoneGroup); >+ displayTimezoneCombo->insertItem(i18n("UTC")); >+ displayTimezoneCombo->insertItem(i18n("Local Time")); >+ displayTimezoneCombo->setCurrentItem((appCore->getTimeZoneBias()==0)?0:1); >+ ((KdeApp*)parent)->connect(displayTimezoneCombo, SIGNAL(activated(int)), SLOT(slotDisplayLocalTime())); >+ displayTimezoneGroup->addSpace(0); >+ >+ QGroupBox* setTimezoneGroup = new QGroupBox(1, Qt::Horizontal, i18n("Set"), timeFrame); >+ new QLabel(i18n("Local Time is only supported for dates between 1902 and 2037.\n"), setTimezoneGroup); >+ QHBox *hbox2 = new QHBox(setTimezoneGroup); >+ new QLabel(i18n("Timezone: "), hbox2); >+ setTimezoneCombo = new QComboBox(hbox2); >+ setTimezoneCombo->insertItem(i18n("UTC")); >+ setTimezoneCombo->insertItem(i18n("Local Time")); >+// setTimezoneCombo->setCurrentItem((appCore->getTimeZoneBias()==0)?0:1); >+ KGlobal::config()->setGroup("ConfigureDialog"); >+ if (KGlobal::config()->hasKey("SetTimeTimeZoneLocal")) >+ setTimezoneCombo->setCurrentItem(KGlobal::config()->readNumEntry("SetTimeTimeZoneLocal")); >+ KGlobal::config()->setGroup(0); >+ connect(setTimezoneCombo, SIGNAL(activated(int)), SLOT(slotTimeHasChanged())); >+ >+ >+ QHBox *hboxdate = new QHBox(setTimezoneGroup); >+ QLabel* spacerdate1 = new QLabel(" ", hboxdate); >+ timeFrame->setStretchFactor(spacerdate1, 2); >+ YSpin = new QSpinBox(-1000000000, 1000000000, 1, hboxdate); >+ YSpin->setWrapping(true); >+ MSpin = new QSpinBox(1, 12, 1, hboxdate); >+ MSpin->setWrapping(true); >+ DSpin = new QSpinBox(1, 31, 1, hboxdate); >+ DSpin->setWrapping(true); >+ QLabel* spacerdate2 = new QLabel(" ", hboxdate); >+ timeFrame->setStretchFactor(spacerdate2, 2); >+ >+ QVBox *vbox3 = new QVBox(setTimezoneGroup); >+ QHBox *hbox3 = new QHBox(vbox3); >+ QLabel* spacer1 = new QLabel(" ", hbox3); >+ hbox3->setStretchFactor(spacer1, 10); >+ hSpin = new QSpinBox(0, 23, 1, hbox3); >+ hSpin->setWrapping(true); >+ new QLabel(":", hbox3); >+ mSpin = new QSpinBox(0, 59, 1, hbox3); >+ mSpin->setWrapping(true); >+ new QLabel(":", hbox3); >+ sSpin = new QSpinBox(0, 59, 1, hbox3); >+ sSpin->setWrapping(true); >+ QLabel* spacer2 = new QLabel(" ", hbox3); >+ hbox3->setStretchFactor(spacer2, 10); >+ >+ QLabel* spacer3 = new QLabel(" ", timeFrame); >+ timeFrame->setStretchFactor(spacer3, 2); >+ >+ setTime(appCore->getSimulation()->getTime()); >+ connect(YSpin, SIGNAL(valueChanged(int)), SLOT(slotTimeHasChanged())); >+ connect(MSpin, SIGNAL(valueChanged(int)), SLOT(slotTimeHasChanged())); >+ connect(DSpin, SIGNAL(valueChanged(int)), SLOT(slotTimeHasChanged())); >+ connect(hSpin, SIGNAL(valueChanged(int)), SLOT(slotTimeHasChanged())); >+ connect(mSpin, SIGNAL(valueChanged(int)), SLOT(slotTimeHasChanged())); >+ connect(sSpin, SIGNAL(valueChanged(int)), SLOT(slotTimeHasChanged())); >+ >+ KPushButton *nowButton = new KPushButton(setTimezoneGroup); >+ nowButton->setText(i18n("Now")); >+ QSizePolicy nowButtonSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); >+ nowButton->setSizePolicy(nowButtonSizePolicy); >+ connect(nowButton, SIGNAL(clicked()), SLOT(setNow())); >+ >+ Selection selection = appCore->getSimulation()->getSelection(); >+ std::string sel_name; >+ if (selection.body() != 0) { >+ QHBox* ltBox = new QHBox(setTimezoneGroup); >+ char time[50]; >+ sel_name = selection.body()->getName(); >+ Vec3d v = selection.getPosition(appCore->getSimulation()->getTime()) - >+ appCore->getSimulation()->getObserver().getPosition(); >+ double dist = astro::lightYearsToKilometers(v.length()*1e-6); >+ double lt = dist / astro::speedOfLight; >+ long lt_h = (long)(lt / 3600); >+ int lt_m = (int)((lt - lt_h * 3600) / 60); >+ double lt_s = (lt - lt_h * 3600 - lt_m * 60); >+ if (lt_h == 0) snprintf(time, 50, "%d min %02.1f s", lt_m, lt_s); >+ else snprintf(time, 50, "%ld h %02d min %02.1f s", lt_h, lt_m, lt_s); >+ >+ new QLabel(i18n("\nSelection: " + QString(sel_name.c_str()) >+ + QString("\nLight Travel Time: %2").arg(time)), ltBox); >+ >+ KPushButton *ltButton = new KPushButton(ltBox); >+ ltButton->setToggleButton(true); >+ >+ if (!appCore->getLightDelayActive()) >+ ltButton->setText(i18n("Include Light Travel Time")); >+ else >+ ltButton->setText(i18n("Ignore Light Travel Time ")); >+ >+ ltButton->setSizePolicy(nowButtonSizePolicy); >+ connect(ltButton, SIGNAL(clicked()), SLOT(ltSubstract())); >+ } >+ >+ // OpenGL Page >+ QVBox* openGL = addVBoxPage(i18n("OpenGL"), i18n("OpenGL"), >+ KGlobal::iconLoader()->loadIcon("misc", KIcon::NoGroup)); >+ >+ renderPathCombo = new QComboBox(openGL); >+ savedRenderPath = (int)appCore->getRenderer()->getGLContext()->getRenderPath(); >+ if (appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_Basic)) >+ renderPathCombo->insertItem(i18n("Basic")); >+ if (appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_Multitexture)) >+ renderPathCombo->insertItem(i18n("Multitexture")); >+ if (appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_NvCombiner)) >+ renderPathCombo->insertItem(i18n("NvCombiners")); >+ if (appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_DOT3_ARBVP)) >+ renderPathCombo->insertItem(i18n("DOT3 ARBVP")); >+ if (appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_NvCombiner_NvVP)) >+ renderPathCombo->insertItem(i18n("NvCombiner NvVP")); >+ if (appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_NvCombiner_ARBVP)) >+ renderPathCombo->insertItem(i18n("NvCombiner ARBVP")); >+ if (appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_ARBFP_ARBVP)) >+ renderPathCombo->insertItem(i18n("ARBFP ARBVP")); >+ if (appCore->getRenderer()->getGLContext()->renderPathSupported(GLContext::GLPath_NV30)) >+ renderPathCombo->insertItem(i18n("NV30")); >+ >+ connect(renderPathCombo, SIGNAL(activated(int)), SLOT(slotRenderPath(int))); >+ >+ { >+ int path=0, ipathIdx=0; >+ while (path != appCore->getRenderer()->getGLContext()->getRenderPath()) { >+ ipathIdx++; >+ do { >+ path++; >+ } while (!appCore->getRenderer()->getGLContext()->renderPathSupported((GLContext::GLRenderPath)path)); >+ } >+ renderPathCombo->setCurrentItem(ipathIdx); >+ } >+ >+ renderPathLabel = new QLabel(openGL); >+ renderPathLabel->setTextFormat(Qt::RichText); >+ setRenderPathLabel(); >+ >+ QTextEdit* edit = new QTextEdit(openGL); >+ edit->append(((KdeApp*)parent)->getOpenGLInfo()); >+ edit->setFocusPolicy(QWidget::NoFocus); >+ >+ >+ // Key bindings page >+ QVBox* keyBindings = addVBoxPage(i18n("Key Bindings"), i18n("Key Bindings"), >+ KGlobal::iconLoader()->loadIcon("key_bindings", KIcon::NoGroup)); >+ >+ keyChooser = new KKeyChooser(((KMainWindow*)parent)->actionCollection(), keyBindings, false); >+ >+ resize(550,400); >+} >+ >+KdePreferencesDialog::~KdePreferencesDialog() { >+} >+ >+ >+void KdePreferencesDialog::setNow() { >+ time_t date_t; >+ time(&date_t); >+ struct tm* tm; >+ if (setTimezoneCombo->currentItem() != 0) { >+ tm = localtime ( &date_t); >+ } else { >+ tm = gmtime ( &date_t); >+ } >+ YSpin->setValue(tm->tm_year + 1900); >+ MSpin->setValue(tm->tm_mon + 1); >+ DSpin->setValue(tm->tm_mday); >+ hSpin->setValue(tm->tm_hour); >+ mSpin->setValue(tm->tm_min); >+ sSpin->setValue(tm->tm_sec); >+} >+ >+void KdePreferencesDialog::ltSubstract() { >+ double d; >+ >+ d = getTime(); >+ >+ Selection selection = appCore->getSimulation()->getSelection(); >+ std::string sel_name; >+ >+ // LT-delay only for solar bodies && target-speed < 0.99 c >+ >+ if (selection.body() != 0 && >+ (appCore->getSimulation()->getTargetSpeed() < 0.99 * >+ astro::kilometersToMicroLightYears(astro::speedOfLight))) { >+ sel_name = selection.body()->getName(); >+ Vec3d v = selection.getPosition(d) - >+ appCore->getSimulation()->getObserver().getPosition(); >+ appCore->setLightDelayActive(!appCore->getLightDelayActive()); >+ double dist = astro::lightYearsToKilometers(v.length()*1e-6); >+ double lt = dist / astro::speedOfLight; >+ if (appCore->getLightDelayActive()) >+ d -= lt / 86400.; >+ else >+ d += lt / 86400.; >+ setTime(d); >+ } >+} >+ >+void KdePreferencesDialog::setTime(double d) { >+ if (setTimezoneCombo->currentItem() != 0 && d < 2465442 && d > 2415733) { >+ time_t date_t = (int) astro::julianDateToSeconds( d - (float)astro::Date(1970, 1, 1) ); >+ >+ struct tm* tm; >+ tm = localtime ( &date_t); >+ YSpin->setValue(tm->tm_year + 1900); >+ MSpin->setValue(tm->tm_mon + 1); >+ DSpin->setValue(tm->tm_mday); >+ hSpin->setValue(tm->tm_hour); >+ mSpin->setValue(tm->tm_min); >+ sSpin->setValue(tm->tm_sec); >+ } else { >+ astro::Date date(d); >+ YSpin->setValue(date.year); >+ MSpin->setValue(date.month); >+ DSpin->setValue(date.day); >+ hSpin->setValue(date.hour); >+ mSpin->setValue(date.minute); >+ sSpin->setValue(int(date.seconds)); >+ } >+} >+ >+double KdePreferencesDialog::getTime() const { >+ double d; >+ >+ if (setTimezoneCombo->currentItem() == 0 || YSpin->value() < 1902 || YSpin->value() > 2037) { >+ astro::Date date(0.0); >+ date.year=YSpin->value(); >+ date.month=MSpin->value(); >+ date.day=DSpin->value(); >+ date.hour=hSpin->value(); >+ date.minute=mSpin->value(); >+ date.seconds=float(sSpin->value()); >+ d = (double) date; >+ } else { >+ struct tm time; >+ time.tm_year = YSpin->value() - 1900; >+ time.tm_mon = MSpin->value() - 1; >+ time.tm_mday = DSpin->value(); >+ time.tm_hour = hSpin->value(); >+ time.tm_min = mSpin->value(); >+ time.tm_sec = sSpin->value(); >+ d = astro::secondsToJulianDate(mktime(&time)) + (double) astro::Date(1970, 1, 1); >+ } >+ return d; >+} >+ >+void KdePreferencesDialog::slotOk() { >+ slotApply(); >+ accept(); >+} >+ >+void KdePreferencesDialog::slotCancel() { >+ appCore->getRenderer()->setRenderFlags(savedRendererFlags); >+ appCore->getRenderer()->setLabelMode(savedLabelMode); >+ appCore->getRenderer()->setOrbitMask(savedOrbitMask); >+ appCore->getRenderer()->setAmbientLightLevel(savedAmbientLightLevel/100.); >+ appCore->getSimulation()->setFaintestVisible(savedFaintestVisible/100.); >+ appCore->setHudDetail(savedHudDetail); >+ appCore->getRenderer()->getGLContext()->setRenderPath((GLContext::GLRenderPath)savedRenderPath); >+ appCore->setDistanceToScreen(savedDistanceToScreen); >+ >+ reject(); >+} >+ >+void KdePreferencesDialog::slotApply() { >+ savedRendererFlags = appCore->getRenderer()->getRenderFlags(); >+ savedLabelMode = appCore->getRenderer()->getLabelMode(); >+ savedAmbientLightLevel = int(appCore->getRenderer()->getAmbientLightLevel() * 100); >+ savedFaintestVisible = int(appCore->getSimulation()->getFaintestVisible() * 100); >+ savedHudDetail = appCore->getHudDetail(); >+ savedDisplayLocalTime = appCore->getTimeZoneBias(); >+ savedRenderPath = (int)appCore->getRenderer()->getGLContext()->getRenderPath(); >+ savedDistanceToScreen = appCore->getDistanceToScreen(); >+ >+ keyChooser->commitChanges(); >+ >+ KGlobal::config()->setGroup("ConfigureDialog"); >+ KGlobal::config()->writeEntry("SetTimeTimeZoneLocal", setTimezoneCombo->currentItem()); >+ KGlobal::config()->setGroup(0); >+ >+ if (timeHasChanged) { >+ if (setTimezoneCombo->currentItem() == 0 || YSpin->value() < 1902 || YSpin->value() > 2037) { >+ astro::Date date(0.0); >+ date.year=YSpin->value(); >+ date.month=MSpin->value(); >+ date.day=DSpin->value(); >+ date.hour=hSpin->value(); >+ date.minute=mSpin->value(); >+ date.seconds=float(sSpin->value()); >+ appCore->getSimulation()->setTime((double) date); >+ appCore->getSimulation()->update(0.0); >+ } else { >+ struct tm time; >+ time.tm_year = YSpin->value() - 1900; >+ time.tm_mon = MSpin->value() - 1; >+ time.tm_mday = DSpin->value(); >+ time.tm_hour = hSpin->value(); >+ time.tm_min = mSpin->value(); >+ time.tm_sec = sSpin->value(); >+ appCore->getSimulation()->setTime(astro::secondsToJulianDate(mktime(&time)) + (double) astro::Date(1970, 1, 1)); >+ appCore->getSimulation()->update(0.0); >+ } >+ } >+} >+ >+void KdePreferencesDialog::slotTimeHasChanged() { >+ timeHasChanged = true; >+} >+ >+void KdePreferencesDialog::slotFaintestVisible(int m) { >+ char buff[20]; >+ >+ parent->slotFaintestVisible(m / 100.); >+ sprintf(buff, "%.2f", m / 100.); >+ faintestLabel->setText(buff); >+} >+ >+void KdePreferencesDialog::slotAmbientLightLevel(int l) { >+ char buff[20]; >+ >+ parent->slotAmbientLightLevel(l / 100.); >+ sprintf(buff, "%.2f", l / 100.); >+ ambientLabel->setText(buff); >+} >+ >+void KdePreferencesDialog::slotRenderPath(int pathIdx) { >+ int path=0, ipathIdx=0; >+ while (ipathIdx != pathIdx) { >+ ipathIdx++; >+ do { >+ path++; >+ } while (!appCore->getRenderer()->getGLContext()->renderPathSupported((GLContext::GLRenderPath)path)); >+ } >+ >+ appCore->getRenderer()->getGLContext()->setRenderPath((GLContext::GLRenderPath)path); >+ setRenderPathLabel(); >+} >+ >+void KdePreferencesDialog::slotDistanceToScreen(int dts) { >+ appCore->setDistanceToScreen(dts * 10); >+} >+ >+void KdePreferencesDialog::setRenderPathLabel() { >+ switch(appCore->getRenderer()->getGLContext()->getRenderPath()) { >+ case GLContext::GLPath_Basic: >+ renderPathLabel->setText(i18n("<b>Unextended OpenGL 1.1</b>")); >+ break; >+ case GLContext::GLPath_Multitexture: >+ renderPathLabel->setText(i18n("<b>Multiple textures and the ARB_texenv_combine extension</b>")); >+ break; >+ case GLContext::GLPath_NvCombiner: >+ renderPathLabel->setText(i18n("<b>NVIDIA combiners, no vertex programs</b>")); >+ break; >+ case GLContext::GLPath_DOT3_ARBVP: >+ renderPathLabel->setText(i18n("<b>ARB_texenv_DOT3 extension, ARB_vertex_program extension</b>")); >+ break; >+ case GLContext::GLPath_NvCombiner_NvVP: >+ renderPathLabel->setText(i18n("<b>NVIDIA Combiners, NV_vertex_program extension</b><br> " >+ "provide bump mapping, ring shadows, and specular " >+ "highlights on any Geforce or ATI Radeon graphics card, though " >+ "NvCombiner ARBVP is a slightly better option for Geforce users")); >+ break; >+ case GLContext::GLPath_NvCombiner_ARBVP: >+ renderPathLabel->setText(i18n("<b>NVIDIA Combiners, ARB_vertex_program extension</b>")); >+ break; >+ case GLContext::GLPath_ARBFP_ARBVP: >+ renderPathLabel->setText(i18n("<b>ARB_fragment_program and ARB_vertex_program extensions</b><br>" >+ "provide advanced effects on Geforce FX and Radeon 9700 cards")); >+ break; >+ case GLContext::GLPath_NV30: >+ renderPathLabel->setText(i18n("<b>NV_fragment_program and ARB_vertex_program extensions</b>")); >+ break; >+ } >+} >+ >diff -urN celestia-1.3.1-old/src/celestia/kde/kdeuniquecelestia.cpp celestia-1.3.1/src/celestia/kde/kdeuniquecelestia.cpp >--- celestia-1.3.1-old/src/celestia/kde/kdeuniquecelestia.cpp 1969-12-31 16:00:00.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/kdeuniquecelestia.cpp 2003-09-06 13:26:38.000000000 -0700 >@@ -0,0 +1,44 @@ >+/*************************************************************************** >+ kdeuniquecelestia.cpp - description >+ ------------------- >+ begin : Mon Aug 5 2002 >+ copyright : (C) 2002 by chris >+ email : chris@tux.teyssier.org >+ ***************************************************************************/ >+ >+/*************************************************************************** >+ * * >+ * This program is free software; you can redistribute it and/or modify * >+ * it under the terms of the GNU General Public License as published by * >+ * the Free Software Foundation; either version 2 of the License, or * >+ * (at your option) any later version. * >+ * * >+ ***************************************************************************/ >+#include "kdeuniquecelestia.h" >+#include <kcmdlineargs.h> >+ >+KdeUniqueCelestia::KdeUniqueCelestia() { >+ app = new KdeApp(); >+ >+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); >+ >+ if (args->count() != 0) { >+ app->setStartURL(args->url(0)); >+ } >+ setMainWidget(app); >+ app->show(); >+ >+} >+ >+int KdeUniqueCelestia::newInstance() { >+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); >+ if (args->count() != 0) { >+ app->goToURL(args->url(0)); >+ app->showNormal(); >+ app->setActiveWindow(); >+ app->raise(); >+ } >+ return 0; >+} >+ >+ >diff -urN celestia-1.3.1-old/src/celestia/kde/po/Makefile.in celestia-1.3.1/src/celestia/kde/po/Makefile.in >--- celestia-1.3.1-old/src/celestia/kde/po/Makefile.in 2003-12-25 00:21:25.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/po/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../../../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,16 +253,31 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > #>- POFILES = AUTO > #>+ 2 >-POFILES = it.po de.po el.po es.po fr.po gl.po nl.po pt_br.po >-GMOFILES = it.gmo de.gmo el.gmo es.gmo fr.gmo gl.gmo nl.gmo pt_br.gmo >+POFILES = de.po el.po es.po fr.po gl.po it.po nl.po pt_br.po >+GMOFILES = de.gmo el.gmo es.gmo fr.gmo gl.gmo it.gmo nl.gmo pt_br.gmo > subdir = src/celestia/kde/po >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -309,9 +310,12 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=gl.po de.po fr.po el.po it.gmo de.gmo es.po pt_br.po es.gmo it.po pt_br.gmo nl.gmo nl.po el.gmo fr.gmo celestia-kde.pot gl.gmo >+KDE_DIST=de.gmo celestia-kde.pot nl.po gl.gmo fr.po pt_br.gmo it.gmo pt_br.po it.po gl.po fr.gmo es.po el.po es.gmo el.gmo nl.gmo de.po > > #>- DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > #>+ 1 >@@ -326,7 +330,13 @@ > #>- distdir: $(DISTFILES) > #>+ 1 > distdir: distdir-nls $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -351,7 +361,6 @@ > all-am: Makefile > > installdirs: >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -418,6 +427,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am > > .PHONY: all all-am check check-am clean clean-generic clean-libtool \ >@@ -427,7 +444,8 @@ > install-info-am install-man install-strip installcheck \ > installcheck-am installdirs maintainer-clean \ > maintainer-clean-generic mostlyclean mostlyclean-generic \ >- mostlyclean-libtool uninstall uninstall-am uninstall-info-am >+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ >+ uninstall-info-am > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >@@ -435,9 +453,6 @@ > > > #>+ 25 >-it.gmo: it.po >- rm -f it.gmo; $(GMSGFMT) -o it.gmo $(srcdir)/it.po >- test ! -f it.gmo || touch it.gmo > de.gmo: de.po > rm -f de.gmo; $(GMSGFMT) -o de.gmo $(srcdir)/de.po > test ! -f de.gmo || touch de.gmo >@@ -453,6 +468,9 @@ > gl.gmo: gl.po > rm -f gl.gmo; $(GMSGFMT) -o gl.gmo $(srcdir)/gl.po > test ! -f gl.gmo || touch gl.gmo >+it.gmo: it.po >+ rm -f it.gmo; $(GMSGFMT) -o it.gmo $(srcdir)/it.po >+ test ! -f it.gmo || touch it.gmo > nl.gmo: nl.po > rm -f nl.gmo; $(GMSGFMT) -o nl.gmo $(srcdir)/nl.po > test ! -f nl.gmo || touch nl.gmo >@@ -462,11 +480,11 @@ > > #>+ 3 > clean-nls: >- -rm -f it.gmo de.gmo el.gmo es.gmo fr.gmo gl.gmo nl.gmo pt_br.gmo >+ -rm -f de.gmo el.gmo es.gmo fr.gmo gl.gmo it.gmo nl.gmo pt_br.gmo > > #>+ 10 > install-nls: >- @for base in it de el es fr gl nl pt_br ; do \ >+ @for base in de el es fr gl it nl pt_br ; do \ > echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\ > $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \ > if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\ >@@ -477,12 +495,12 @@ > > #>+ 10 > uninstall-nls: >- rm -f $(DESTDIR)$(kde_locale)/it/LC_MESSAGES/$(PACKAGE).mo > rm -f $(DESTDIR)$(kde_locale)/de/LC_MESSAGES/$(PACKAGE).mo > rm -f $(DESTDIR)$(kde_locale)/el/LC_MESSAGES/$(PACKAGE).mo > rm -f $(DESTDIR)$(kde_locale)/es/LC_MESSAGES/$(PACKAGE).mo > rm -f $(DESTDIR)$(kde_locale)/fr/LC_MESSAGES/$(PACKAGE).mo > rm -f $(DESTDIR)$(kde_locale)/gl/LC_MESSAGES/$(PACKAGE).mo >+ rm -f $(DESTDIR)$(kde_locale)/it/LC_MESSAGES/$(PACKAGE).mo > rm -f $(DESTDIR)$(kde_locale)/nl/LC_MESSAGES/$(PACKAGE).mo > rm -f $(DESTDIR)$(kde_locale)/pt_br/LC_MESSAGES/$(PACKAGE).mo > >diff -urN celestia-1.3.1-old/src/celestia/kde/selectionpopup.cpp celestia-1.3.1/src/celestia/kde/selectionpopup.cpp >--- celestia-1.3.1-old/src/celestia/kde/selectionpopup.cpp 1969-12-31 16:00:00.000000000 -0800 >+++ celestia-1.3.1/src/celestia/kde/selectionpopup.cpp 2003-06-28 01:53:59.000000000 -0700 >@@ -0,0 +1,393 @@ >+/*************************************************************************** >+ selectionpopup.cpp - description >+ ------------------- >+ begin : 2003-05-06 >+ copyright : (C) 2002 by Christophe Teyssier >+ email : chris@teyssier.org >+ ***************************************************************************/ >+ >+/*************************************************************************** >+ * * >+ * This program is free software; you can redistribute it and/or modify * >+ * it under the terms of the GNU General Public License as published by * >+ * the Free Software Foundation; either version 2 of the License, or * >+ * (at your option) any later version. * >+ * * >+ ***************************************************************************/ >+ >+#include "selectionpopup.h" >+ >+#include <fstream> >+#include <sstream> >+ >+#include <qlabel.h> >+ >+#include <klocale.h> >+#include <kurl.h> >+#include <krun.h> >+ >+SelectionPopup::SelectionPopup(QWidget* parent, CelestiaCore* _appCore, Selection _sel) >+:KPopupMenu(parent), >+ appCore(_appCore), >+ sel(_sel) >+{ >+ >+} >+ >+void SelectionPopup::init() >+{ >+ QLabel *lab = new QLabel("", this); >+ QPalette pal( lab->palette() ); >+ pal.setColor( QPalette::Normal, QColorGroup::Background, QColor( "White" ) ); >+ pal.setColor( QPalette::Normal, QColorGroup::Foreground, QColor( "Black" ) ); >+ pal.setColor( QPalette::Inactive, QColorGroup::Foreground, QColor( "Black" ) ); >+ >+ QFont rsFont = lab->font(); >+ rsFont.setPointSize( rsFont.pointSize() - 2 ); >+ >+ Simulation *sim = appCore->getSimulation(); >+ Vec3d v = sel.getPosition(sim->getTime()) - sim->getObserver().getPosition(); >+ >+ if (sel.body() != NULL) >+ { >+ insertTitle(sel.body()->getName().c_str(), 0, 0); >+ insert(this, sel, MENUMAXSIZE); >+ } >+ else if (sel.star() != NULL) >+ { >+ std::string name = sim->getUniverse()->getStarCatalog()->getStarName(*sel.star()); >+ >+ double distance = v.length() * 1e-6; >+ char buff[50]; >+ >+ ostringstream o; >+ >+ if (abs(distance) >= astro::AUtoLightYears(1000.0f)) >+ sprintf(buff, "%.3f ly", distance); >+ else if (abs(distance) >= astro::kilometersToLightYears(10000000.0)) >+ sprintf(buff, "%.3f au", astro::lightYearsToAU(distance)); >+ else if (abs(distance) > astro::kilometersToLightYears(1.0f)) >+ sprintf(buff, "%.3f km", astro::lightYearsToKilometers(distance)); >+ else >+ sprintf(buff, "%.3f m", astro::lightYearsToKilometers(distance) * 1000.0f); >+ >+ o << i18n("Distance: ") << buff << "\n"; >+ >+ o << i18n("Abs (app) mag: "); >+ >+ sprintf(buff, "%.2f (%.2f)", >+ sel.star()->getAbsoluteMagnitude(), >+ astro::absToAppMag(sel.star()->getAbsoluteMagnitude(), >+ (float) distance)); >+ o << buff << "\n"; >+ >+ o << i18n("Class: "); >+ sprintf(buff, "%s", sel.star()->getStellarClass().str().c_str()); >+ o << buff << "\n"; >+ >+ o << i18n("Surface Temp: "); >+ sprintf(buff, "%.0f K", sel.star()->getTemperature()); >+ o << buff << "\n"; >+ >+ o << i18n("Radius: "); >+ sprintf(buff, "%.2f Rsun", sel.star()->getRadius() / 696000.0f); >+ o << buff; >+ >+ QLabel *starDetails = new QLabel(QString(o.str().c_str()), this); >+ starDetails->setPalette(pal); >+ starDetails->setFont(rsFont); >+ >+ insertTitle(name.c_str(), 0, 0); >+ insertItem(starDetails); >+ insertSeparator(); >+ insert(this, sel, MENUMAXSIZE); >+ } >+ else if (sel.deepsky() != NULL) >+ { >+ insertTitle(sel.deepsky()->getName().c_str(), 0); >+ insert(this, sel, MENUMAXSIZE); >+ } >+ >+ if (sim->getUniverse() != NULL) >+ { >+ MarkerList* markers = sim->getUniverse()->getMarkers(); >+ if (markers->size() > 0) >+ { >+ KPopupMenu *markMenu = new KPopupMenu(this); >+ int j=1; >+ for (std::vector<Marker>::iterator i = markers->begin(); i < markers->end() && j < MENUMAXSIZE; i++) >+ { >+ KPopupMenu *objMenu = new KPopupMenu(this); >+ insert(objMenu, (*i).getObject(), (2 * MENUMAXSIZE + j) * MENUMAXSIZE, false); >+ markMenu->insertItem(getSelectionName((*i).getObject()), objMenu); >+ j++; >+ } >+ insertItem(i18n("Marked objects"), markMenu); >+ } >+ } >+} >+ >+void SelectionPopup::process(int id) >+{ >+ Simulation *sim = appCore->getSimulation(); >+ >+ int actionId = id; >+ actionId = id - (id / MENUMAXSIZE) * MENUMAXSIZE; >+ >+ int subId = id; >+ int level = 1; >+ while (id > MENUMAXSIZE) { >+ id /= MENUMAXSIZE; >+ level *= MENUMAXSIZE; >+ } >+ subId -= id * level; >+ >+ if (id == 1) >+ { >+ int selId = subId / MENUMAXSIZE; >+ sel = getSelectionFromId(sel, selId); >+ } >+ else if (id == 2) // marked objects sub-menu >+ { >+ int subsubId = subId; >+ int level = 1; >+ while (subId > MENUMAXSIZE) { >+ subId /= MENUMAXSIZE; >+ level *= MENUMAXSIZE; >+ } >+ subsubId -= subId * level; >+ MarkerList* markers = sim->getUniverse()->getMarkers(); >+ sel = (*markers)[subId-1].getObject(); >+ int selId = subsubId / MENUMAXSIZE; >+ sel = getSelectionFromId(sel, selId); >+ } >+ >+ if (actionId == 1) { >+ sim->setSelection(sel); >+ return; >+ } >+ if (actionId == 2) { >+ sim->setSelection(sel); >+ appCore->charEntered('c'); >+ return; >+ } >+ if (actionId == 3) { >+ sim->setSelection(sel); >+ appCore->charEntered('g'); >+ return; >+ } >+ if (actionId == 4) { >+ sim->setSelection(sel); >+ appCore->charEntered('f'); >+ return; >+ } >+ if (actionId == 5) { >+ sim->setSelection(sel); >+ appCore->charEntered('y'); >+ return; >+ } >+ if (actionId == 6) { >+ QString url; >+ if (sel.body() != NULL) { >+ url = QString(sel.body()->getInfoURL().c_str()); >+ if (url == "") { >+ QString name = QString(sel.body()->getName().c_str()).lower(); >+ url = QString("http://www.nineplanets.org/") + name + ".html"; >+ } >+ } else if (sel.star() != NULL) { >+ if (sel.star()->getCatalogNumber() != 0) { >+ url = QString("http://simbad.u-strasbg.fr/sim-id.pl?protocol=html&Ident=HIP %1") >+ .arg(sel.star()->getCatalogNumber() & ~0xf0000000); >+ } else { >+ url = QString("http://www.nineplanets.org/sun.html"); >+ } >+ } else if (sel.deepsky() != NULL) { >+ url = QString("http://simbad.u-strasbg.fr/sim-id.pl?protocol=html&Ident=%1") >+ .arg(sel.deepsky()->getName().c_str()); >+ } >+ KRun::runURL(url, "text/html"); >+ return; >+ } >+ if (actionId == 7) >+ { >+ if (sim->getUniverse() != NULL) >+ sim->getUniverse()->unmarkObject(sel, 1); >+ return; >+ } >+ if (actionId == 8) >+ { >+ sim->getUniverse()->unmarkAll(); >+ return; >+ } >+ if (actionId >= 10 && actionId <= 14) >+ { >+ if (sim->getUniverse() != NULL) >+ { >+ sim->getUniverse()->markObject(sel, >+ 10.0f, >+ Color(0.0f, 1.0f, 0.0f, 0.9f), >+ (Marker::Symbol)(actionId - 10), >+ 1); >+ } >+ return; >+ } >+ if (actionId == 20) { >+ sim->getActiveObserver()->setDisplayedSurface(""); >+ return; >+ } >+ if (actionId > 20) { >+ std::vector<std::string>* altSurfaces = sel.body()->getAlternateSurfaceNames(); >+ if (altSurfaces != NULL && altSurfaces->size() > actionId - 21) >+ { >+ sim->getActiveObserver()->setDisplayedSurface((*altSurfaces)[actionId - 21]); >+ } >+ } >+} >+ >+const char* SelectionPopup::getSelectionName(const Selection& sel) const >+{ >+ if (sel.body() != NULL) >+ { >+ return sel.body()->getName().c_str(); >+ } >+ else if (sel.star() != NULL) >+ { >+ Simulation *sim = appCore->getSimulation(); >+ return sim->getUniverse()->getStarCatalog()->getStarName(*(sel.star())).c_str(); >+ } >+ else if (sel.deepsky() != NULL) >+ { >+ return sel.deepsky()->getName().c_str(); >+ } >+ >+ return ""; >+} >+ >+Selection SelectionPopup::getSelectionFromId(Selection sel, int id) const >+{ >+ if (id == 0) return sel; >+ >+ int subId = id; >+ int level = 1; >+ while (id > MENUMAXSIZE) { >+ id /= MENUMAXSIZE; >+ level *= MENUMAXSIZE; >+ } >+ subId -= id * level; >+ if (subId < 0) subId = 0; >+ >+ if (sel.body() != NULL) >+ { >+ const PlanetarySystem* satellites = sel.body()->getSatellites(); >+ if (satellites != NULL && satellites->getSystemSize() != 0) >+ { >+ Body* body = satellites->getBody(id - 1); >+ Selection satSel(body); >+ return getSelectionFromId(satSel, subId); >+ } >+ } >+ else if (sel.star() != NULL) >+ { >+ Simulation *sim = appCore->getSimulation(); >+ SolarSystemCatalog* solarSystemCatalog = sim->getUniverse()->getSolarSystemCatalog(); >+ SolarSystemCatalog::iterator iter = solarSystemCatalog->find(sel.star()->getCatalogNumber()); >+ if (iter != solarSystemCatalog->end()) >+ { >+ SolarSystem* solarSys = iter->second; >+ Body* body = solarSys->getPlanets()->getBody(id - 1); >+ Selection satSel(body); >+ return getSelectionFromId(satSel, subId); >+ } >+ } >+ >+ return sel; >+} >+ >+void SelectionPopup::insert(KPopupMenu *popup, Selection sel, int baseId, bool showSubObjects) >+{ >+ popup->insertItem(i18n("&Select"), baseId + 1); >+ popup->insertItem(i18n("&Center"), baseId + 2); >+ popup->insertItem(i18n("&Goto"), baseId + 3); >+ popup->insertItem(i18n("&Follow"), baseId + 4); >+ popup->insertItem(i18n("S&ynch Orbit"), baseId + 5); >+ popup->insertItem(i18n("&Info"), baseId + 6); >+ popup->insertItem(i18n("Unmark &All"), baseId + 8); >+ if (appCore->getSimulation()->getUniverse()->isMarked(sel, 1)) >+ { >+ popup->insertItem(i18n("&Unmark"), baseId + 7); >+ } >+ else >+ { >+ KPopupMenu *markMenu = new KPopupMenu(this); >+ markMenu->insertItem(i18n("Diamond"), baseId + 10); >+ markMenu->insertItem(i18n("Triangle"), baseId + 11); >+ markMenu->insertItem(i18n("Square"), baseId + 12); >+ markMenu->insertItem(i18n("Plus"), baseId + 13); >+ markMenu->insertItem(i18n("X"), baseId + 14); >+ popup->insertItem(i18n("&Mark"), markMenu); >+ } >+ >+ if (showSubObjects && sel.body() != NULL) >+ { >+ std::vector<std::string>* altSurfaces = sel.body()->getAlternateSurfaceNames(); >+ if (altSurfaces != NULL) >+ { >+ if (altSurfaces->size() != NULL) >+ { >+ KPopupMenu *surfaces = new KPopupMenu(this); >+ surfaces->insertItem(i18n("Normal"), baseId + 20); >+ int j=0; >+ for (std::vector<std::string>::const_iterator i = altSurfaces->begin(); >+ i < altSurfaces->end() && j < MENUMAXSIZE - 1; i++, j++) >+ { >+ surfaces->insertItem(QString((*i).c_str()), baseId + 21 + j); >+ } >+ popup->insertItem(i18n("&Alternate Surfaces"), surfaces); >+ } >+ delete altSurfaces; >+ } >+ >+ const PlanetarySystem* satellites = sel.body()->getSatellites(); >+ if (satellites != NULL && satellites->getSystemSize() != 0) >+ { >+ popup->insertSeparator(); >+ KPopupMenu *planetaryMenu = new KPopupMenu(this); >+ for (int i = 0; i < satellites->getSystemSize() && i < MENUMAXSIZE; i++) >+ { >+ Body* body = satellites->getBody(i); >+ Selection satSel(body); >+ KPopupMenu *satMenu = new KPopupMenu(this); >+ insert(satMenu, satSel, baseId * MENUMAXSIZE + (i + 1) * MENUMAXSIZE); >+ planetaryMenu->insertItem(body->getName().c_str(), satMenu); >+ } >+ popup->insertItem(i18n("Satellites"), planetaryMenu); >+ } >+ } >+ else if (showSubObjects && sel.star() != NULL) >+ { >+ popup->setItemEnabled(baseId + 5, false); >+ Simulation *sim = appCore->getSimulation(); >+ SolarSystemCatalog* solarSystemCatalog = sim->getUniverse()->getSolarSystemCatalog(); >+ SolarSystemCatalog::iterator iter = solarSystemCatalog->find(sel.star()->getCatalogNumber()); >+ if (iter != solarSystemCatalog->end()) >+ { >+ popup->insertSeparator(); >+ SolarSystem* solarSys = iter->second; >+ KPopupMenu* planetsMenu = new KPopupMenu(this); >+ for (int i = 0; i < solarSys->getPlanets()->getSystemSize() && i < MENUMAXSIZE; i++) >+ { >+ Body* body = solarSys->getPlanets()->getBody(i); >+ Selection satSel(body); >+ KPopupMenu *satMenu = new KPopupMenu(this); >+ insert(satMenu, satSel, baseId * MENUMAXSIZE + (i + 1) * MENUMAXSIZE); >+ planetsMenu->insertItem(body->getName().c_str(), satMenu); >+ } >+ popup->insertItem(i18n("Planets"), planetsMenu); >+ } >+ } >+ else if (sel.deepsky() != NULL) >+ { >+ popup->setItemEnabled(baseId + 5, false); >+ } >+} >+ >diff -urN celestia-1.3.1-old/src/celestia/res/Makefile.in celestia-1.3.1/src/celestia/res/Makefile.in >--- celestia-1.3.1-old/src/celestia/res/Makefile.in 2003-12-25 00:21:25.000000000 -0800 >+++ celestia-1.3.1/src/celestia/res/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,15 +253,30 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > noinst_DATA = celestia.rc Clsdfolder.ico Location.ico Openfolder.ico Rootfolder.ico Celestia.ico resource.h > > EXTRA_DIST = $(noinst_DATA) > subdir = src/celestia/res >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -310,9 +311,12 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=sunglasses.bmp crosshair-opaque.cur resource.h location2.bmp folderopened2.bmp Celestia.ico script2.bmp crosshair.cur celestia.rc globe.bmp camcorder2.bmp Openfolder.ico about.bmp Location.ico Clsdfolder.ico stop.bmp clock2.bmp folderclosed2.bmp exit.bmp Rootfolder.ico camera2.bmp config.bmp >+KDE_DIST=location2.bmp celestia.rc crosshair-opaque.cur config.bmp Openfolder.ico exit.bmp about.bmp Clsdfolder.ico stop.bmp Celestia.ico resource.h clock2.bmp Rootfolder.ico Location.ico camera2.bmp sunglasses.bmp camcorder2.bmp folderclosed2.bmp globe.bmp crosshair.cur folderopened2.bmp script2.bmp > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -321,7 +325,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -346,7 +356,6 @@ > all-am: Makefile $(DATA) > > installdirs: >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -407,6 +416,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am > > .PHONY: all all-am check check-am clean clean-generic clean-libtool \ >@@ -416,7 +433,8 @@ > install-info-am install-man install-strip installcheck \ > installcheck-am installdirs maintainer-clean \ > maintainer-clean-generic mostlyclean mostlyclean-generic \ >- mostlyclean-libtool uninstall uninstall-am uninstall-info-am >+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ >+ uninstall-info-am > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/src/celmath/Makefile.in celestia-1.3.1/src/celmath/Makefile.in >--- celestia-1.3.1-old/src/celmath/Makefile.in 2003-12-25 00:21:25.000000000 -0800 >+++ celestia-1.3.1/src/celmath/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > noinst_LIBRARIES = libcelmath.a >@@ -286,6 +286,7 @@ > perlin.cpp > > subdir = src/celmath >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -301,11 +302,7 @@ > @KDE_USE_FINAL_FALSE@libcelmath_a_OBJECTS = $(libcelmath_a_nofinal_OBJECTS) > @KDE_USE_FINAL_TRUE@libcelmath_a_OBJECTS = $(libcelmath_a_final_OBJECTS) > >-DEFS = @DEFS@ > DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) >-CPPFLAGS = @CPPFLAGS@ >-LDFLAGS = @LDFLAGS@ >-LIBS = @LIBS@ > depcomp = $(SHELL) $(top_srcdir)/admin/depcomp > am__depfiles_maybe = depfiles > #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/frustum.Po ./$(DEPDIR)/perlin.Po >@@ -331,7 +328,6 @@ > #>+ 2 > CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ > $(AM_LDFLAGS) $(LDFLAGS) -o $@ >-CXXFLAGS = @CXXFLAGS@ > DIST_SOURCES = $(libcelmath_a_SOURCES) > DATA = $(noinst_DATA) > >@@ -378,23 +374,37 @@ > -rm -rf ./$(DEPDIR) > > .cpp.o: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > .cpp.obj: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` > > .cpp.lo: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >-CXXDEPMODE = @CXXDEPMODE@ >+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > mostlyclean-libtool: > -rm -f *.lo >@@ -409,6 +419,9 @@ > ETAGS = etags > ETAGSFLAGS = > >+CTAGS = ctags >+CTAGSFLAGS = >+ > tags: TAGS > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) >@@ -434,16 +447,31 @@ > || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > $$tags $$unique > >+ctags: CTAGS >+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ >+ $(TAGS_FILES) $(LISP) >+ tags=; \ >+ here=`pwd`; \ >+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ >+ unique=`for i in $$list; do \ >+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ >+ done | \ >+ $(AWK) ' { files[$$0] = 1; } \ >+ END { for (i in files) print i; }'`; \ >+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ >+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ >+ $$tags $$unique >+ > GTAGS: > here=`$(am__cd) $(top_builddir) && pwd` \ > && cd $(top_srcdir) \ > && gtags -i $(GTAGS_ARGS) $$here > > distclean-tags: >- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH >+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=quaternion.h ellipsoid.h celmath.dsp aabox.h mathlib.h distance.h math.mak intersect.h frustum.h ray.h vecmath.h solve.h perlin.h plane.h sphere.h >+KDE_DIST=perlin.h frustum.h math.mak vecmath.h ellipsoid.h intersect.h solve.h plane.h ray.h celmath.dsp aabox.h quaternion.h distance.h mathlib.h sphere.h > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -452,7 +480,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -477,7 +511,6 @@ > all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) > > installdirs: >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -544,18 +577,27 @@ > mostlyclean-am: mostlyclean-compile mostlyclean-generic \ > mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am > >-.PHONY: GTAGS all all-am check check-am clean clean-generic \ >- clean-libtool clean-noinstLIBRARIES distclean distclean-compile \ >- distclean-depend distclean-generic distclean-libtool \ >- distclean-tags distdir dvi dvi-am info info-am install \ >- install-am install-data install-data-am install-exec \ >- install-exec-am install-info install-info-am install-man \ >- install-strip installcheck installcheck-am installdirs \ >- maintainer-clean maintainer-clean-generic mostlyclean \ >- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ >- tags uninstall uninstall-am uninstall-info-am >+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ >+ clean-libtool clean-noinstLIBRARIES ctags distclean \ >+ distclean-compile distclean-depend distclean-generic \ >+ distclean-libtool distclean-tags distdir dvi dvi-am info \ >+ info-am install install-am install-data install-data-am \ >+ install-exec install-exec-am install-info install-info-am \ >+ install-man install-strip installcheck installcheck-am \ >+ installdirs maintainer-clean maintainer-clean-generic \ >+ mostlyclean mostlyclean-compile mostlyclean-generic \ >+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ >+ uninstall-am uninstall-info-am > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/src/celtxf/Makefile.in celestia-1.3.1/src/celtxf/Makefile.in >--- celestia-1.3.1-old/src/celtxf/Makefile.in 2003-12-25 00:21:26.000000000 -0800 >+++ celestia-1.3.1/src/celtxf/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > noinst_LIBRARIES = libceltxf.a >@@ -285,6 +285,7 @@ > texturefont.cpp > > subdir = src/celtxf >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -297,11 +298,7 @@ > #>+ 1 > libceltxf_a_OBJECTS = texturefont.$(OBJEXT) > >-DEFS = @DEFS@ > DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) >-CPPFLAGS = @CPPFLAGS@ >-LDFLAGS = @LDFLAGS@ >-LIBS = @LIBS@ > depcomp = $(SHELL) $(top_srcdir)/admin/depcomp > am__depfiles_maybe = depfiles > #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/texturefont.Po >@@ -326,7 +323,6 @@ > #>+ 2 > CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ > $(AM_LDFLAGS) $(LDFLAGS) -o $@ >-CXXFLAGS = @CXXFLAGS@ > DIST_SOURCES = $(libceltxf_a_SOURCES) > DATA = $(noinst_DATA) > >@@ -372,23 +368,37 @@ > -rm -rf ./$(DEPDIR) > > .cpp.o: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > .cpp.obj: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` > > .cpp.lo: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >-CXXDEPMODE = @CXXDEPMODE@ >+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > mostlyclean-libtool: > -rm -f *.lo >@@ -403,6 +413,9 @@ > ETAGS = etags > ETAGSFLAGS = > >+CTAGS = ctags >+CTAGSFLAGS = >+ > tags: TAGS > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) >@@ -428,16 +441,31 @@ > || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > $$tags $$unique > >+ctags: CTAGS >+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ >+ $(TAGS_FILES) $(LISP) >+ tags=; \ >+ here=`pwd`; \ >+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ >+ unique=`for i in $$list; do \ >+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ >+ done | \ >+ $(AWK) ' { files[$$0] = 1; } \ >+ END { for (i in files) print i; }'`; \ >+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ >+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ >+ $$tags $$unique >+ > GTAGS: > here=`$(am__cd) $(top_builddir) && pwd` \ > && cd $(top_srcdir) \ > && gtags -i $(GTAGS_ARGS) $$here > > distclean-tags: >- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH >+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=celtxf.dsp texturefont.h txf.mak >+KDE_DIST=txf.mak texturefont.h celtxf.dsp > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -446,7 +474,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -471,7 +505,6 @@ > all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) > > installdirs: >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -535,18 +568,27 @@ > mostlyclean-am: mostlyclean-compile mostlyclean-generic \ > mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am > >-.PHONY: GTAGS all all-am check check-am clean clean-generic \ >- clean-libtool clean-noinstLIBRARIES distclean distclean-compile \ >- distclean-depend distclean-generic distclean-libtool \ >- distclean-tags distdir dvi dvi-am info info-am install \ >- install-am install-data install-data-am install-exec \ >- install-exec-am install-info install-info-am install-man \ >- install-strip installcheck installcheck-am installdirs \ >- maintainer-clean maintainer-clean-generic mostlyclean \ >- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ >- tags uninstall uninstall-am uninstall-info-am >+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ >+ clean-libtool clean-noinstLIBRARIES ctags distclean \ >+ distclean-compile distclean-depend distclean-generic \ >+ distclean-libtool distclean-tags distdir dvi dvi-am info \ >+ info-am install install-am install-data install-data-am \ >+ install-exec install-exec-am install-info install-info-am \ >+ install-man install-strip installcheck installcheck-am \ >+ installdirs maintainer-clean maintainer-clean-generic \ >+ mostlyclean mostlyclean-compile mostlyclean-generic \ >+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ >+ uninstall-am uninstall-info-am > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/src/celutil/Makefile.in celestia-1.3.1/src/celutil/Makefile.in >--- celestia-1.3.1-old/src/celutil/Makefile.in 2003-12-25 00:21:26.000000000 -0800 >+++ celestia-1.3.1/src/celutil/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkgdatadir = $(datadir)/@PACKAGE@ > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > noinst_LIBRARIES = libcelutil.a >@@ -299,6 +299,7 @@ > > EXTRA_libcelutil_a_SOURCES = $(WINSOURCES) > subdir = src/celutil >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -320,11 +321,7 @@ > @KDE_USE_FINAL_FALSE@libcelutil_a_OBJECTS = $(libcelutil_a_nofinal_OBJECTS) > @KDE_USE_FINAL_TRUE@libcelutil_a_OBJECTS = $(libcelutil_a_final_OBJECTS) > >-DEFS = @DEFS@ > DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) >-CPPFLAGS = @CPPFLAGS@ >-LDFLAGS = @LDFLAGS@ >-LIBS = @LIBS@ > depcomp = $(SHELL) $(top_srcdir)/admin/depcomp > am__depfiles_maybe = depfiles > #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bigfix.Po ./$(DEPDIR)/color.Po \ >@@ -368,7 +365,6 @@ > #>+ 2 > CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ > $(AM_LDFLAGS) $(LDFLAGS) -o $@ >-CXXFLAGS = @CXXFLAGS@ > DIST_SOURCES = $(libcelutil_a_SOURCES) $(EXTRA_libcelutil_a_SOURCES) > DATA = $(noinst_DATA) > >@@ -425,23 +421,37 @@ > -rm -rf ./$(DEPDIR) > > .cpp.o: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > .cpp.obj: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` >+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` > > .cpp.lo: >-@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< >-CXXDEPMODE = @CXXDEPMODE@ >+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ >+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ >+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ >+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ >+@am__fastdepCXX_TRUE@ fi >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ >+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< > > mostlyclean-libtool: > -rm -f *.lo >@@ -456,6 +466,9 @@ > ETAGS = etags > ETAGSFLAGS = > >+CTAGS = ctags >+CTAGSFLAGS = >+ > tags: TAGS > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) >@@ -481,16 +494,31 @@ > || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > $$tags $$unique > >+ctags: CTAGS >+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ >+ $(TAGS_FILES) $(LISP) >+ tags=; \ >+ here=`pwd`; \ >+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ >+ unique=`for i in $$list; do \ >+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ >+ done | \ >+ $(AWK) ' { files[$$0] = 1; } \ >+ END { for (i in files) print i; }'`; \ >+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ >+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ >+ $$tags $$unique >+ > GTAGS: > here=`$(am__cd) $(top_builddir) && pwd` \ > && cd $(top_srcdir) \ > && gtags -i $(GTAGS_ARGS) $$here > > distclean-tags: >- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH >+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=bytes.h timer.h directory.h reshandle.h filetype.h wintimer.cpp watcher.h util.h resmanager.h formatnum.h celutil.dsp bigfix.h debug.h util.mak winutil.h color.h winutil.cpp windirectory.cpp basictypes.h >+KDE_DIST=filetype.h watcher.h resmanager.h debug.h formatnum.h windirectory.cpp util.h timer.h winutil.h util.mak basictypes.h bytes.h winutil.cpp wintimer.cpp directory.h bigfix.h color.h celutil.dsp reshandle.h > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -499,7 +527,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -524,7 +558,6 @@ > all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) > > installdirs: >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -591,18 +624,27 @@ > mostlyclean-am: mostlyclean-compile mostlyclean-generic \ > mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am > >-.PHONY: GTAGS all all-am check check-am clean clean-generic \ >- clean-libtool clean-noinstLIBRARIES distclean distclean-compile \ >- distclean-depend distclean-generic distclean-libtool \ >- distclean-tags distdir dvi dvi-am info info-am install \ >- install-am install-data install-data-am install-exec \ >- install-exec-am install-info install-info-am install-man \ >- install-strip installcheck installcheck-am installdirs \ >- maintainer-clean maintainer-clean-generic mostlyclean \ >- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ >- tags uninstall uninstall-am uninstall-info-am >+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ >+ clean-libtool clean-noinstLIBRARIES ctags distclean \ >+ distclean-compile distclean-depend distclean-generic \ >+ distclean-libtool distclean-tags distdir dvi dvi-am info \ >+ info-am install install-am install-data install-data-am \ >+ install-exec install-exec-am install-info install-info-am \ >+ install-man install-strip installcheck installcheck-am \ >+ installdirs maintainer-clean maintainer-clean-generic \ >+ mostlyclean mostlyclean-compile mostlyclean-generic \ >+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ >+ uninstall-am uninstall-info-am > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/subdirs celestia-1.3.1/subdirs >--- celestia-1.3.1-old/subdirs 2003-10-28 15:12:00.000000000 -0800 >+++ celestia-1.3.1/subdirs 1969-12-31 16:00:00.000000000 -0800 >@@ -1,11 +0,0 @@ >-admin >-celestia-1.3.0 >-data >-extras >-fonts >-macros >-manual >-models >-shaders >-src >-textures >diff -urN celestia-1.3.1-old/textures/Makefile.in celestia-1.3.1/textures/Makefile.in >--- celestia-1.3.1-old/textures/Makefile.in 2003-12-25 00:21:26.000000000 -0800 >+++ celestia-1.3.1/textures/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = .. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ > pkgdatadir = @datadir@/@PACKAGE@/textures >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -279,6 +279,7 @@ > > EXTRA_DIST = $(pkgdata_DATA) > subdir = textures >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -286,10 +287,11 @@ > DATA = $(pkgdata_DATA) > > >-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ >- uninstall-info-recursive all-recursive install-data-recursive \ >- install-exec-recursive installdirs-recursive install-recursive \ >- uninstall-recursive check-recursive installcheck-recursive >+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ >+ ps-recursive install-info-recursive uninstall-info-recursive \ >+ all-recursive install-data-recursive install-exec-recursive \ >+ installdirs-recursive install-recursive uninstall-recursive \ >+ check-recursive installcheck-recursive > DIST_COMMON = Makefile.am Makefile.in > DIST_SUBDIRS = $(SUBDIRS) > #>- all: all-recursive >@@ -389,10 +391,17 @@ > list='$(SUBDIRS)'; for subdir in $$list; do \ > test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ > done >+ctags-recursive: >+ list='$(SUBDIRS)'; for subdir in $$list; do \ >+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ >+ done > > ETAGS = etags > ETAGSFLAGS = > >+CTAGS = ctags >+CTAGSFLAGS = >+ > tags: TAGS > > ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) >@@ -408,9 +417,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) $(LISP) $(TAGS_FILES)'; \ >@@ -423,16 +438,31 @@ > || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ > $$tags $$unique > >+ctags: CTAGS >+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ >+ $(TAGS_FILES) $(LISP) >+ tags=; \ >+ here=`pwd`; \ >+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ >+ unique=`for i in $$list; do \ >+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ >+ done | \ >+ $(AWK) ' { files[$$0] = 1; } \ >+ END { for (i in files) print i; }'`; \ >+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ >+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ >+ $$tags $$unique >+ > GTAGS: > here=`$(am__cd) $(top_builddir) && pwd` \ > && cd $(top_srcdir) \ > && gtags -i $(GTAGS_ARGS) $$here > > distclean-tags: >- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH >+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=astar.jpg gstar.jpg mstar.jpg bstar.jpg logo.png flare.jpg >+KDE_DIST=gstar.jpg flare.jpg astar.jpg bstar.jpg logo.png mstar.jpg > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -441,7 +471,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -542,23 +578,32 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-recursive >+ >+pdf-am: >+ >+ps: ps-recursive >+ >+ps-am: >+ > uninstall-am: uninstall-info-am uninstall-pkgdataDATA > > uninstall-info: uninstall-info-recursive > >-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ >- clean-generic clean-libtool clean-recursive distclean \ >- distclean-generic distclean-libtool distclean-recursive \ >- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ >- info-recursive install install-am install-data install-data-am \ >- install-data-recursive install-exec install-exec-am \ >- install-exec-recursive install-info install-info-am \ >- install-info-recursive install-man install-pkgdataDATA \ >- install-recursive install-strip installcheck installcheck-am \ >- installdirs installdirs-am installdirs-recursive \ >- maintainer-clean maintainer-clean-generic \ >+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ >+ clean-generic clean-libtool clean-recursive ctags \ >+ ctags-recursive distclean distclean-generic distclean-libtool \ >+ distclean-recursive distclean-tags distdir dvi dvi-am \ >+ dvi-recursive info info-am info-recursive install install-am \ >+ install-data install-data-am install-data-recursive \ >+ install-exec install-exec-am install-exec-recursive \ >+ install-info install-info-am install-info-recursive install-man \ >+ install-pkgdataDATA install-recursive install-strip \ >+ installcheck installcheck-am installdirs installdirs-am \ >+ installdirs-recursive maintainer-clean maintainer-clean-generic \ > maintainer-clean-recursive mostlyclean mostlyclean-generic \ >- mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ >+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ >+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ > uninstall uninstall-am uninstall-info-am \ > uninstall-info-recursive uninstall-pkgdataDATA \ > uninstall-recursive >diff -urN celestia-1.3.1-old/textures/hires/Makefile.in celestia-1.3.1/textures/hires/Makefile.in >--- celestia-1.3.1-old/textures/hires/Makefile.in 2003-12-25 00:21:26.000000000 -0800 >+++ celestia-1.3.1/textures/hires/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ > pkgdatadir = @datadir@/@PACKAGE@/textures/hires >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -277,6 +277,7 @@ > > EXTRA_DIST = $(pkgdata_DATA) > subdir = textures/hires >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -329,13 +330,22 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > > top_distdir = ../.. > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -361,7 +371,6 @@ > > installdirs: > $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -422,6 +431,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am uninstall-pkgdataDATA > > .PHONY: all all-am check check-am clean clean-generic clean-libtool \ >@@ -431,8 +448,8 @@ > install-info-am install-man install-pkgdataDATA install-strip \ > installcheck installcheck-am installdirs maintainer-clean \ > maintainer-clean-generic mostlyclean mostlyclean-generic \ >- mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ >- uninstall-pkgdataDATA >+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ >+ uninstall-info-am uninstall-pkgdataDATA > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/textures/lores/Makefile.in celestia-1.3.1/textures/lores/Makefile.in >--- celestia-1.3.1-old/textures/lores/Makefile.in 2003-12-25 00:21:27.000000000 -0800 >+++ celestia-1.3.1/textures/lores/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ > pkgdatadir = @datadir@/@PACKAGE@/textures/lores >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -277,6 +277,7 @@ > > EXTRA_DIST = $(pkgdata_DATA) > subdir = textures/lores >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -329,9 +330,12 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=jupiter.jpg earth.jpg charon-lok.jpg astar.jpg ganymede.jpg tethys.jpg earth-clouds.png phobos.jpg europa.jpg idamosaic.jpg gstar.jpg umbriel-lok-mask.png pluto-lok.jpg iapetus.jpg hyperion-lok.jpg neptune-rings.png venus.jpg hyperion.jpg gasgiant.jpg janus.jpg uranus-rings.png miranda-lok-mask.png titania.jpg marsbump.jpg pluto-lok-spec.jpg plutobump1k.jpg mercury.jpg moonbump.jpg neptune.jpg rhea.jpg enceladus.jpg earthnight.jpg venuslike.jpg deimos.jpg mstar.jpg gaspramosaic.jpg callisto-lok-mask.png gasgiantnight.jpg uranus.jpg marsbump1k.jpg titan.jpg saturn-rings.png prometheus.jpg bstar.jpg asteroid.jpg titania-lok-mask.png io-lok-mask.png proteus.jpg mercury-lok-mask.png epimetheus.jpg io.jpg ganymede-lok-mask.png mimas-lok-mask.png triton.jpg moon.jpg browndwarf.jpg venussurface.jpg mercurybump.jpg jupiterlike.jpg dione.jpg europa-lok-mask.png ariel.jpg oberon-lok-mask.png earth-spec.png miranda.jpg callisto.jpg oberon.jpg charon-lok-spec.jpg epimetheus-lok.jpg ariel-lok-mask.png amalthea.jpg triton-lok-mask.png mimas.jpg umbriel.jpg eros.jpg saturn.jpg mars.jpg >+KDE_DIST=pluto-lok-spec.jpg io.jpg gstar.jpg ariel-lok-mask.png browndwarf.jpg phobos.jpg dione.jpg jupiter.jpg plutobump1k.jpg idamosaic.jpg gaspramosaic.jpg oberon-lok-mask.png neptune.jpg charon-lok.jpg earth.jpg mercury-lok-mask.png venus.jpg proteus.jpg iapetus.jpg mimas-lok-mask.png titania-lok-mask.png tethys.jpg moonbump.jpg mimas.jpg earth-spec.png moon.jpg neptune-rings.png janus.jpg amalthea.jpg earth-clouds.png triton.jpg titan.jpg gasgiantnight.jpg charon-lok-spec.jpg gasgiant.jpg pluto-lok.jpg umbriel.jpg epimetheus.jpg ganymede-lok-mask.png astar.jpg uranus.jpg rhea.jpg ganymede.jpg eros.jpg venuslike.jpg epimetheus-lok.jpg bstar.jpg venussurface.jpg saturn-rings.png earthnight.jpg titania.jpg marsbump1k.jpg oberon.jpg europa.jpg marsbump.jpg callisto.jpg deimos.jpg europa-lok-mask.png saturn.jpg mercurybump.jpg jupiterlike.jpg enceladus.jpg umbriel-lok-mask.png prometheus.jpg ariel.jpg mstar.jpg triton-lok-mask.png asteroid.jpg callisto-lok-mask.png hyperion.jpg miranda-lok-mask.png uranus-rings.png mars.jpg io-lok-mask.png hyperion-lok.jpg miranda.jpg mercury.jpg > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -340,7 +344,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -366,7 +376,6 @@ > > installdirs: > $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -427,6 +436,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am uninstall-pkgdataDATA > > .PHONY: all all-am check check-am clean clean-generic clean-libtool \ >@@ -436,8 +453,8 @@ > install-info-am install-man install-pkgdataDATA install-strip \ > installcheck installcheck-am installdirs maintainer-clean \ > maintainer-clean-generic mostlyclean mostlyclean-generic \ >- mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ >- uninstall-pkgdataDATA >+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ >+ uninstall-info-am uninstall-pkgdataDATA > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. >diff -urN celestia-1.3.1-old/textures/medres/Makefile.in celestia-1.3.1/textures/medres/Makefile.in >--- celestia-1.3.1-old/textures/medres/Makefile.in 2003-12-25 00:21:27.000000000 -0800 >+++ celestia-1.3.1/textures/medres/Makefile.in 2003-12-25 11:39:02.000000000 -0800 >@@ -1,8 +1,8 @@ >-# Makefile.in generated by automake 1.6.3 from Makefile.am. >+# Makefile.in generated by automake 1.7.6 from Makefile.am. > # KDE tags expanded automatically by am_edit - $Revision: 1.2 $ > # @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, >@@ -14,88 +14,73 @@ > # PARTICULAR PURPOSE. > > @SET_MAKE@ >-SHELL = @SHELL@ > > srcdir = @srcdir@ > top_srcdir = @top_srcdir@ > VPATH = @srcdir@ >-prefix = @prefix@ >-exec_prefix = @exec_prefix@ >- >-bindir = @bindir@ >-sbindir = @sbindir@ >-libexecdir = @libexecdir@ >-datadir = @datadir@ >-sysconfdir = @sysconfdir@ >-sharedstatedir = @sharedstatedir@ >-localstatedir = @localstatedir@ >-libdir = @libdir@ >-infodir = @infodir@ >-mandir = @mandir@ >-includedir = @includedir@ >-oldincludedir = /usr/include > pkglibdir = $(libdir)/@PACKAGE@ > pkgincludedir = $(includedir)/@PACKAGE@ > top_builddir = ../.. > >-ACLOCAL = @ACLOCAL@ >-AUTOCONF = @AUTOCONF@ >-AUTOMAKE = @AUTOMAKE@ >-AUTOHEADER = @AUTOHEADER@ >- > am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd > INSTALL = @INSTALL@ >-INSTALL_PROGRAM = @INSTALL_PROGRAM@ >-INSTALL_DATA = @INSTALL_DATA@ > install_sh_DATA = $(install_sh) -c -m 644 > install_sh_PROGRAM = $(install_sh) -c > install_sh_SCRIPT = $(install_sh) -c >-INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_HEADER = $(INSTALL_DATA) >-transform = @program_transform_name@ >+transform = $(program_transform_name) > NORMAL_INSTALL = : > PRE_INSTALL = : > POST_INSTALL = : > NORMAL_UNINSTALL = : > PRE_UNINSTALL = : > POST_UNINSTALL = : >-build_alias = @build_alias@ > build_triplet = @build@ >-host_alias = @host_alias@ > host_triplet = @host@ >-target_alias = @target_alias@ > target_triplet = @target@ >- >-EXEEXT = @EXEEXT@ >-OBJEXT = @OBJEXT@ >-PATH_SEPARATOR = @PATH_SEPARATOR@ > pkgdatadir = @datadir@/@PACKAGE@/textures/medres >+ACLOCAL = @ACLOCAL@ >+AMDEP_FALSE = @AMDEP_FALSE@ >+AMDEP_TRUE = @AMDEP_TRUE@ > AMTAR = @AMTAR@ > ARTSCCONFIG = @ARTSCCONFIG@ >-AS = @AS@ >+AUTOCONF = @AUTOCONF@ > AUTODIRS = @AUTODIRS@ >+AUTOHEADER = @AUTOHEADER@ >+AUTOMAKE = @AUTOMAKE@ > AWK = @AWK@ > CC = @CC@ >-CONF_FILES = @CONF_FILES@ >+CCDEPMODE = @CCDEPMODE@ >+CFLAGS = @CFLAGS@ > CPP = @CPP@ >+CPPFLAGS = @CPPFLAGS@ > CXX = @CXX@ > CXXCPP = @CXXCPP@ >+CXXDEPMODE = @CXXDEPMODE@ >+CXXFLAGS = @CXXFLAGS@ >+CYGPATH_W = @CYGPATH_W@ > DCOPIDL = @DCOPIDL@ > DCOPIDL2CPP = @DCOPIDL2CPP@ > DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ >+DEFS = @DEFS@ > DEPDIR = @DEPDIR@ >-DLLTOOL = @DLLTOOL@ >-DOXYGEN = @DOXYGEN@ >-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ >-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ >-DPMSINC = @DPMSINC@ >-DPMSLIB = @DPMSLIB@ > ECHO = @ECHO@ >+ECHO_C = @ECHO_C@ >+ECHO_N = @ECHO_N@ >+ECHO_T = @ECHO_T@ >+EGREP = @EGREP@ >+ENABLE_CELX_FALSE = @ENABLE_CELX_FALSE@ >+ENABLE_CELX_TRUE = @ENABLE_CELX_TRUE@ >+ENABLE_GLUT_FALSE = @ENABLE_GLUT_FALSE@ >+ENABLE_GLUT_TRUE = @ENABLE_GLUT_TRUE@ >+ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@ >+ENABLE_GTK_TRUE = @ENABLE_GTK_TRUE@ >+ENABLE_HIPPARCOS_FALSE = @ENABLE_HIPPARCOS_FALSE@ >+ENABLE_HIPPARCOS_TRUE = @ENABLE_HIPPARCOS_TRUE@ >+ENABLE_KDE_FALSE = @ENABLE_KDE_FALSE@ >+ENABLE_KDE_TRUE = @ENABLE_KDE_TRUE@ >+EXEEXT = @EXEEXT@ > FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ >-GCJ = @GCJ@ >-GCJFLAGS = @GCJFLAGS@ >-GLINC = @GLINC@ >-GLLIB = @GLLIB@ > GMSGFMT = @GMSGFMT@ > GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ > GNOMEUI_LIBS = @GNOMEUI_LIBS@ >@@ -113,17 +98,14 @@ > GTK_CONFIG = @GTK_CONFIG@ > GTK_LIBS = @GTK_LIBS@ > HIPDIR = @HIPDIR@ >-IDL = @IDL@ >-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@ >+INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ >+INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ >+INSTALL_DATA = @INSTALL_DATA@ >+INSTALL_PROGRAM = @INSTALL_PROGRAM@ >+INSTALL_SCRIPT = @INSTALL_SCRIPT@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ >-JAR = @JAR@ >-JAVAC = @JAVAC@ >-JAVAH = @JAVAH@ >-JVMLIBS = @JVMLIBS@ > KDECONFIG = @KDECONFIG@ > KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ >-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ >-KDE_HAVE_DOT = @KDE_HAVE_DOT@ > KDE_INCLUDES = @KDE_INCLUDES@ > KDE_LDFLAGS = @KDE_LDFLAGS@ > KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ >@@ -135,27 +117,18 @@ > KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ > KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ > KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ >-LEX = @LEX@ >-LEXLIB = @LEXLIB@ >-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ >-LIBBZ2 = @LIBBZ2@ >+LDFLAGS = @LDFLAGS@ > LIBCOMPAT = @LIBCOMPAT@ > LIBCRYPT = @LIBCRYPT@ > LIBDL = @LIBDL@ >-LIBGEN = @LIBGEN@ > LIBJPEG = @LIBJPEG@ >-LIBMICO = @LIBMICO@ > LIBOBJS = @LIBOBJS@ > LIBPNG = @LIBPNG@ > LIBPTHREAD = @LIBPTHREAD@ >-LIBPYTHON = @LIBPYTHON@ >-LIBQIMGIO = @LIBQIMGIO@ > LIBRESOLV = @LIBRESOLV@ >-LIBSHADOW = @LIBSHADOW@ >+LIBS = @LIBS@ > LIBSM = @LIBSM@ > LIBSOCKET = @LIBSOCKET@ >-LIBSSL = @LIBSSL@ >-LIBTIFF = @LIBTIFF@ > LIBTOOL = @LIBTOOL@ > LIBUCB = @LIBUCB@ > LIBUTIL = @LIBUTIL@ >@@ -169,7 +142,6 @@ > 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@ >@@ -177,46 +149,41 @@ > LIB_POLL = @LIB_POLL@ > LIB_QPE = @LIB_QPE@ > LIB_QT = @LIB_QT@ >-LIB_QTOPIA = @LIB_QTOPIA@ > LIB_SMB = @LIB_SMB@ > LIB_X11 = @LIB_X11@ > LIB_XEXT = @LIB_XEXT@ > LN_S = @LN_S@ >+LTLIBOBJS = @LTLIBOBJS@ >+MAKEINFO = @MAKEINFO@ > MCOPIDL = @MCOPIDL@ > MEINPROC = @MEINPROC@ >-MICO_INCLUDES = @MICO_INCLUDES@ >-MICO_LDFLAGS = @MICO_LDFLAGS@ > MOC = @MOC@ > MSGFMT = @MSGFMT@ > NOOPT_CFLAGS = @NOOPT_CFLAGS@ > NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ > NOREPO = @NOREPO@ >-OBJDUMP = @OBJDUMP@ >+OBJEXT = @OBJEXT@ > ORBIT_CFLAGS = @ORBIT_CFLAGS@ > ORBIT_CONFIG = @ORBIT_CONFIG@ > ORBIT_IDL = @ORBIT_IDL@ > ORBIT_LIBS = @ORBIT_LIBS@ > PACKAGE = @PACKAGE@ >-PAMLIBS = @PAMLIBS@ >-PASSWDLIBS = @PASSWDLIBS@ >+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ >+PACKAGE_NAME = @PACKAGE_NAME@ >+PACKAGE_STRING = @PACKAGE_STRING@ >+PACKAGE_TARNAME = @PACKAGE_TARNAME@ >+PACKAGE_VERSION = @PACKAGE_VERSION@ >+PATH_SEPARATOR = @PATH_SEPARATOR@ > PKGDATADIR = @PKGDATADIR@ > PTHREAD_LIB = @PTHREAD_LIB@ >-PYTHONINC = @PYTHONINC@ >-PYTHONLIB = @PYTHONLIB@ >-PYTHONMODDIR = @PYTHONMODDIR@ >-QTDOCDIR = @QTDOCDIR@ > QTE_NORTTI = @QTE_NORTTI@ >-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@ > QT_INCLUDES = @QT_INCLUDES@ > QT_LDFLAGS = @QT_LDFLAGS@ > RANLIB = @RANLIB@ >-RC = @RC@ > REPO = @REPO@ >-SETUIDFLAGS = @SETUIDFLAGS@ >-SSL_INCLUDES = @SSL_INCLUDES@ >-SSL_LDFLAGS = @SSL_LDFLAGS@ >+SET_MAKE = @SET_MAKE@ >+SHELL = @SHELL@ > STRIP = @STRIP@ >-TOPSUBDIRS = @TOPSUBDIRS@ > UIC = @UIC@ > UIC_TR = @UIC_TR@ > USER_INCLUDES = @USER_INCLUDES@ >@@ -227,8 +194,6 @@ > VERSION = @VERSION@ > WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ > XGETTEXT = @XGETTEXT@ >-XPMINC = @XPMINC@ >-XPMLIB = @XPMLIB@ > XPM_LIBS = @XPM_LIBS@ > X_CFLAGS = @X_CFLAGS@ > X_EXTRA_LIBS = @X_EXTRA_LIBS@ >@@ -237,15 +202,36 @@ > X_LIBS = @X_LIBS@ > X_PRE_LIBS = @X_PRE_LIBS@ > ZVT_LIBS = @ZVT_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@ >+build_alias = @build_alias@ >+build_cpu = @build_cpu@ >+build_os = @build_os@ >+build_vendor = @build_vendor@ > cflags_set = @cflags_set@ >-cxxflags_set = @cxxflags_set@ >-idldir = @idldir@ >+datadir = @datadir@ >+exec_prefix = @exec_prefix@ >+host = @host@ >+host_alias = @host_alias@ >+host_cpu = @host_cpu@ >+host_os = @host_os@ >+host_vendor = @host_vendor@ >+includedir = @includedir@ >+infodir = @infodir@ > install_sh = @install_sh@ >-jni_includes = @jni_includes@ > kde_appsdir = @kde_appsdir@ > kde_bindir = @kde_bindir@ > kde_confdir = @kde_confdir@ >@@ -267,9 +253,23 @@ > kde_templatesdir = @kde_templatesdir@ > kde_wallpaperdir = @kde_wallpaperdir@ > kde_widgetdir = @kde_widgetdir@ >-micodir = @micodir@ >+libdir = @libdir@ >+libexecdir = @libexecdir@ >+localstatedir = @localstatedir@ >+mandir = @mandir@ >+oldincludedir = @oldincludedir@ >+prefix = @prefix@ >+program_transform_name = @program_transform_name@ > qt_includes = @qt_includes@ > qt_libraries = @qt_libraries@ >+sbindir = @sbindir@ >+sharedstatedir = @sharedstatedir@ >+sysconfdir = @sysconfdir@ >+target = @target@ >+target_alias = @target_alias@ >+target_cpu = @target_cpu@ >+target_os = @target_os@ >+target_vendor = @target_vendor@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > >@@ -277,6 +277,7 @@ > > EXTRA_DIST = $(pkgdata_DATA) > subdir = textures/medres >+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs > CONFIG_HEADER = $(top_builddir)/config.h > CONFIG_CLEAN_FILES = >@@ -329,9 +330,12 @@ > tags: TAGS > TAGS: > >+ctags: CTAGS >+CTAGS: >+ > #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > #>+ 4 >-KDE_DIST=jupiter.jpg earth.jpg charon-lok.jpg astar.jpg ganymede.jpg tethys.jpg earth-clouds.png phobos.jpg europa.jpg idamosaic.jpg gstar.jpg pluto-lok.jpg iapetus.jpg hyperion-lok.jpg venus.jpg hyperion.jpg gasgiant.jpg janus.jpg titania.jpg marsbump.jpg pluto-lok-spec.jpg plutobump1k.jpg iss-mc31.jpg mercury.jpg moonbump.jpg rhea.jpg enceladus.jpg iss-mc1.jpg earthnight.jpg venuslike.jpg deimos.jpg mstar.jpg gaspramosaic.jpg gasgiantnight.jpg marsbump1k.jpg prometheus.jpg bstar.jpg asteroid.jpg proteus.jpg epimetheus.jpg io.jpg triton.jpg moon.jpg browndwarf.jpg venussurface.jpg mercurybump.jpg jupiterlike.jpg iss-cap1.jpg dione.jpg ariel.jpg earth-spec.png renova.jpg miranda.jpg callisto.jpg oberon.jpg charon-lok-spec.jpg epimetheus-lok.jpg amalthea.jpg mimas.jpg umbriel.jpg eros.jpg iss-sol1.jpg saturn.jpg mars.jpg >+KDE_DIST=pluto-lok-spec.jpg io.jpg gstar.jpg iss-mc1.jpg browndwarf.jpg phobos.jpg dione.jpg jupiter.jpg plutobump1k.jpg idamosaic.jpg gaspramosaic.jpg charon-lok.jpg earth.jpg venus.jpg proteus.jpg iapetus.jpg tethys.jpg moonbump.jpg mimas.jpg earth-spec.png moon.jpg janus.jpg amalthea.jpg earth-clouds.png triton.jpg iss-mc31.jpg gasgiantnight.jpg charon-lok-spec.jpg gasgiant.jpg pluto-lok.jpg umbriel.jpg epimetheus.jpg astar.jpg rhea.jpg ganymede.jpg eros.jpg venuslike.jpg epimetheus-lok.jpg bstar.jpg venussurface.jpg earthnight.jpg titania.jpg marsbump1k.jpg oberon.jpg europa.jpg marsbump.jpg callisto.jpg deimos.jpg saturn.jpg mercurybump.jpg jupiterlike.jpg enceladus.jpg prometheus.jpg ariel.jpg mstar.jpg asteroid.jpg hyperion.jpg mars.jpg renova.jpg hyperion-lok.jpg miranda.jpg iss-cap1.jpg iss-sol1.jpg mercury.jpg > > DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) > >@@ -340,7 +344,13 @@ > distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) > > distdir: $(DISTFILES) >- @list='$(DISTFILES)'; for file in $$list; do \ >+ @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,/[^/]*$$,,'`; \ > if test "$$dir" != "$$file" && test "$$dir" != "."; then \ >@@ -366,7 +376,6 @@ > > installdirs: > $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) >- > install: install-am > install-exec: install-exec-am > install-data: install-data-am >@@ -427,6 +436,14 @@ > > mostlyclean-am: mostlyclean-generic mostlyclean-libtool > >+pdf: pdf-am >+ >+pdf-am: >+ >+ps: ps-am >+ >+ps-am: >+ > uninstall-am: uninstall-info-am uninstall-pkgdataDATA > > .PHONY: all all-am check check-am clean clean-generic clean-libtool \ >@@ -436,8 +453,8 @@ > install-info-am install-man install-pkgdataDATA install-strip \ > installcheck installcheck-am installdirs maintainer-clean \ > maintainer-clean-generic mostlyclean mostlyclean-generic \ >- mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ >- uninstall-pkgdataDATA >+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ >+ uninstall-info-am uninstall-pkgdataDATA > > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded.
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=24207">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 38184
:
24206
| 24207 |
28103
