From 2218b95a7236860cfa4bef83d91efb747c980513 Mon Sep 17 00:00:00 2001 From: Deon Ramsey Date: Tue, 18 Dec 2001 23:00:26 +0000 Subject: [PATCH] Autoconf distribute extension & bugfixes --- ChangeLog | 12 +- INSTALL | 12 +- Makefile.am | 14 +- Makefile.in | 15 +- acconfig.h | 4 + aclocal.m4 | 776 +++++----- config.h.in | 7 + configure | 2728 +++++++++++++++++++-------------- configure.in | 117 +- data/Makefile.am | 2 +- devguide.txt | 15 +- fonts/Makefile.am | 2 +- macros/ChangeLog | 1102 +++++++++++++ macros/Makefile | 88 +- macros/Makefile.am | 10 +- macros/Makefile.in | 52 +- macros/autogen.sh | 106 +- macros/compiler-flags.m4 | 4 +- macros/curses.m4 | 18 +- macros/gnome-bonobo-check.m4 | 24 +- macros/gnome-common.m4 | 4 +- macros/gnome-gettext.m4 | 8 +- macros/gnome-ghttp-check.m4 | 2 +- macros/gnome-libgtop-check.m4 | 55 +- macros/gnome-objc-checks.m4 | 8 +- macros/gnome-print-check.m4 | 180 +-- macros/gnome-vfs.m4 | 2 +- macros/gnome-xml-check.m4 | 4 +- macros/gnome.m4 | 4 + macros/gperf-check.m4 | 79 + macros/linger.m4 | 2 +- macros/need-declaration.m4 | 4 +- manual/Makefile.am | 5 + manual/Makefile.in | 226 +++ models/Makefile.am | 2 +- src/Makefile.am | 7 + src/Makefile.in | 158 +- src/buildstardb.cpp | 2 +- src/cel3ds/3dsmodel.cpp | 4 +- src/cel3ds/3dsread.cpp | 12 +- src/cel3ds/Makefile.am | 6 +- src/cel3ds/Makefile.in | 12 +- src/celengine/Makefile.am | 6 + src/celengine/Makefile.in | 12 +- src/celengine/asterism.cpp | 5 +- src/celengine/astro.h | 2 +- src/celengine/celestia.h | 4 + src/celengine/cmdparser.cpp | 6 +- src/celengine/customorbit.cpp | 6 +- src/celengine/galaxy.cpp | 10 +- src/celengine/glext.h | 2 +- src/celengine/meshmanager.cpp | 12 +- src/celengine/octree.cpp | 8 +- src/celengine/orbit.cpp | 3 +- src/celengine/parser.cpp | 2 +- src/celengine/render.cpp | 17 +- src/celengine/solarsys.cpp | 7 +- src/celengine/stardb.cpp | 6 +- src/celengine/texmanager.cpp | 2 +- src/celengine/texture.cpp | 10 +- src/celestia/Makefile.am | 11 + src/celestia/Makefile.in | 19 +- src/celestia/glutmain.cpp | 15 +- src/celestia/gtkmain.cpp | 18 +- src/celmath/Makefile.am | 5 + src/celmath/Makefile.in | 12 +- src/celtxf/Makefile.am | 5 + src/celtxf/Makefile.in | 12 +- src/celtxf/texturefont.cpp | 14 +- src/celutil/Makefile.am | 10 + src/celutil/Makefile.in | 21 +- src/celutil/debug.cpp | 3 + textures/Makefile.am | 2 +- 73 files changed, 4154 insertions(+), 2007 deletions(-) create mode 100644 macros/ChangeLog create mode 100644 macros/gperf-check.m4 create mode 100644 manual/Makefile.am create mode 100644 manual/Makefile.in diff --git a/ChangeLog b/ChangeLog index 36129d980..cfb3d5f03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -149,7 +149,6 @@ Code revisions: * New script commands: renderflags, labels, orbit * Implemented a scripted demo mode * Placed ISS in Earth orbit -<<<<<<< ChangeLog 1.08 @@ -360,4 +359,13 @@ Code: * Windows: added slider for controlling number of stars displayed by star browser. * Windows: vastly improved full screen support -* Unix: fixed problems with '--enable-debug' under Unix automake (dramsey) +* Unix: fixed problems with '--enable-debug' under automake (dramsey) +* Unix: Enhanced autoconfigure to enable automated distribution build, as well + as building the buildstardb program used to create stars.dat (dramsey) +* Unix: Fixed Problem with --enable-debug=no acting as if --enable-debug=yes + had been given. (dramsey) +* Unix: Changed --enable-gtk into --with-gtk, and made it automatic if Gtk+ and + GtkGLArea is present. (dramsey) +* Unix: Inserted testing code for GtkGLArea into configure.in (dramsey) +* Unix: Integrated a current gnome macros package. (dramsey) +* Removed many errors and compiler warnings (dramsey) diff --git a/INSTALL b/INSTALL index 1a36bf52c..8dabae334 100644 --- a/INSTALL +++ b/INSTALL @@ -11,14 +11,14 @@ what you need to do to build and run Celestia: make make install -There are two versions of Celestia which can be built--the default version -uses GLUT and has no GUI. The other version uses Gtk+ to provide a basic -menu bar similar to the one in Celestia for Windows. To build Celestia with -Gtk+ support, run configure with --enable-gtk: +Celestia can be built with or without support for Gtk, by default the Gtk+ +version will be built if you have Gtk+ and GtkGLArea available, otherwise it +just uses GLUT and has no GUI. If you need/want to build the non-Gtk+ version +even though you have Gtk+ and GtkGLArea, run configure with --without-gtk: - configure --enable-gtk + configure --without-gtk -The GtkGLArea widget is required in order build Celestia with Gtk+. It can +The GtkGLArea widget thats is required in order to build Celestia with Gtk+ may be downloaded from http://www.student.oulu.fi/~jlof/gtkglarea/ Celestia will be installed into /usr/local by default, with data files landing diff --git a/Makefile.am b/Makefile.am index 17155ee10..2cef070a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,15 @@ +dosstuff = celestia.mak $(wildcard *.bat) Celestia.dsp +noinst_DATA = $(wildcard *.txt) $(dosstuff) pkgdata_DATA = celestia.cfg $(wildcard *.cel) -DIST = $(pkgdata_DATA) +EXTRA_DIST = $(pkgdata_DATA) $(noinst_DATA) -SUBDIRS = src data textures models shaders fonts +SUBDIRS = src data textures models shaders fonts res macros manual + +## include some basic Makefiles and config files, who knows, they might even +## work, and they're better than nothing. ++dist-hook: + cp Makefile $(distdir)/Makefile + cp Makefile $(distdir)/Makefile.orig + cp config.h $(distdir)/config.h + cp config.h $(distdir)/config.h.orig diff --git a/Makefile.in b/Makefile.in index e2ec40432..64b9598a8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -68,6 +68,7 @@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ GNOME_CONFIG = @GNOME_CONFIG@ +GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@ GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ GNOME_LIBDIR = @GNOME_LIBDIR@ GNOME_LIBS = @GNOME_LIBS@ @@ -91,16 +92,18 @@ ZVT_LIBS = @ZVT_LIBS@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ +dosstuff = celestia.mak $(wildcard *.bat) Celestia.dsp +noinst_DATA = $(wildcard *.txt) $(dosstuff) pkgdata_DATA = celestia.cfg $(wildcard *.cel) -DIST = $(pkgdata_DATA) +EXTRA_DIST = $(pkgdata_DATA) $(noinst_DATA) -SUBDIRS = src data textures models shaders fonts +SUBDIRS = src data textures models shaders fonts res macros manual ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = -DATA = $(pkgdata_DATA) +DATA = $(noinst_DATA) $(pkgdata_DATA) DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \ @@ -404,6 +407,12 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean ++dist-hook: + cp Makefile $(distdir)/Makefile + cp Makefile $(distdir)/Makefile.orig + cp config.h $(distdir)/config.h + cp config.h $(distdir)/config.h.orig + # 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. .NOEXPORT: diff --git a/acconfig.h b/acconfig.h index a95b188e3..9f3d6c34a 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,4 +1,8 @@ #undef HAVE_LIBSM +/* The directory where our data will be installed in */ #undef CONFIG_DATA_DIR +/* Are we debugging ? */ +#undef DEBUG + diff --git a/aclocal.m4 b/aclocal.m4 index d282ab00f..3c8421831 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -155,392 +155,6 @@ else $1_FALSE= fi]) -dnl -dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits]) -dnl -dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh -dnl is not found. -dnl - -AC_DEFUN([GNOME_INIT_HOOK],[ - AC_SUBST(GNOME_LIBS) - AC_SUBST(GNOMEUI_LIBS) - AC_SUBST(GNOMEGNORBA_LIBS) - AC_SUBST(GTKXMHTML_LIBS) - AC_SUBST(ZVT_LIBS) - AC_SUBST(GNOME_LIBDIR) - AC_SUBST(GNOME_INCLUDEDIR) - - AC_ARG_WITH(gnome-includes, - [ --with-gnome-includes Specify location of GNOME headers],[ - CFLAGS="$CFLAGS -I$withval" - ]) - - AC_ARG_WITH(gnome-libs, - [ --with-gnome-libs Specify location of GNOME libs],[ - LDFLAGS="$LDFLAGS -L$withval" - gnome_prefix=$withval - ]) - - AC_ARG_WITH(gnome, - [ --with-gnome Specify prefix for GNOME files], - if test x$withval = xyes; then - want_gnome=yes - dnl Note that an empty true branch is not - dnl valid sh syntax. - ifelse([$1], [], :, [$1]) - else - if test "x$withval" = xno; then - want_gnome=no - else - want_gnome=yes - LDFLAGS="$LDFLAGS -L$withval/lib" - CFLAGS="$CFLAGS -I$withval/include" - gnome_prefix=$withval/lib - fi - fi, - want_gnome=yes) - - if test "x$want_gnome" = xyes; then - - AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) - if test "$GNOME_CONFIG" = "no"; then - no_gnome_config="yes" - else - AC_MSG_CHECKING(if $GNOME_CONFIG works) - if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then - AC_MSG_RESULT(yes) - GNOME_GNORBA_HOOK([],$2) - GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`" - GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" - GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" - GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" - ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" - GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" - GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" - $1 - else - AC_MSG_RESULT(no) - no_gnome_config="yes" - fi - fi - - if test x$exec_prefix = xNONE; then - if test x$prefix = xNONE; then - gnome_prefix=$ac_default_prefix/lib - else - gnome_prefix=$prefix/lib - fi - else - gnome_prefix=`eval echo \`echo $libdir\`` - fi - - if test "$no_gnome_config" = "yes"; then - AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) - if test -f $gnome_prefix/gnomeConf.sh; then - AC_MSG_RESULT(found) - echo "loading gnome configuration from" \ - "$gnome_prefix/gnomeConf.sh" - . $gnome_prefix/gnomeConf.sh - $1 - else - AC_MSG_RESULT(not found) - if test x$2 = xfail; then - AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) - fi - fi - fi - fi - - if test -n "$3"; then - n="$3" - for i in $n; do - AC_MSG_CHECKING(extra library \"$i\") - case $i in - applets) - AC_SUBST(GNOME_APPLETS_LIBS) - GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` - AC_MSG_RESULT($GNOME_APPLETS_LIBS);; - capplet) - AC_SUBST(GNOME_CAPPLET_LIBS) - GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` - AC_MSG_RESULT($GNOME_CAPPLET_LIBS);; - *) - AC_MSG_RESULT(unknown library) - esac - done - fi -]) - -dnl -dnl GNOME_INIT ([additional-inits]) -dnl - -AC_DEFUN([GNOME_INIT],[ - GNOME_INIT_HOOK([],fail,$1) -]) - -dnl -dnl GNOME_GNORBA_HOOK (script-if-gnorba-found, failflag) -dnl -dnl if failflag is "failure" it aborts if gnorba is not found. -dnl - -AC_DEFUN([GNOME_GNORBA_HOOK],[ - GNOME_ORBIT_HOOK([],$2) - AC_CACHE_CHECK([for gnorba libraries],gnome_cv_gnorba_found,[ - gnome_cv_gnorba_found=no - if test x$gnome_cv_orbit_found = xyes; then - GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" - GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" - if test -n "$GNORBA_LIBS"; then - gnome_cv_gnorba_found=yes - fi - fi - ]) - AM_CONDITIONAL(HAVE_GNORBA, test x$gnome_cv_gnorba_found = xyes) - if test x$gnome_cv_orbit_found = xyes; then - $1 - GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" - GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" - AC_SUBST(GNORBA_CFLAGS) - AC_SUBST(GNORBA_LIBS) - else - if test x$2 = xfailure; then - AC_MSG_ERROR(gnorba library not installed or installation problem) - fi - fi -]) - -AC_DEFUN([GNOME_GNORBA_CHECK], [ - GNOME_GNORBA_HOOK([],failure) -]) - -dnl -dnl GNOME_ORBIT_HOOK (script-if-orbit-found, failflag) -dnl -dnl if failflag is "failure" it aborts if orbit is not found. -dnl - -AC_DEFUN([GNOME_ORBIT_HOOK],[ - AC_PATH_PROG(ORBIT_CONFIG,orbit-config,no) - AC_PATH_PROG(ORBIT_IDL,orbit-idl,no) - AC_CACHE_CHECK([for working ORBit environment],gnome_cv_orbit_found,[ - if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then - gnome_cv_orbit_found=no - else - gnome_cv_orbit_found=yes - fi - ]) - AM_CONDITIONAL(HAVE_ORBIT, test x$gnome_cv_orbit_found = xyes) - if test x$gnome_cv_orbit_found = xyes; then - $1 - ORBIT_CFLAGS=`orbit-config --cflags client server` - ORBIT_LIBS=`orbit-config --use-service=name --libs client server` - AC_SUBST(ORBIT_CFLAGS) - AC_SUBST(ORBIT_LIBS) - else - if test x$2 = xfailure; then - AC_MSG_ERROR(ORBit not installed or installation problem) - fi - fi -]) - -AC_DEFUN([GNOME_ORBIT_CHECK], [ - GNOME_ORBIT_HOOK([],failure) -]) - -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings -dnl For now, only works on GCC -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ - AC_ARG_ENABLE(compile-warnings, - [ --enable-compile-warnings=[no/minimum/yes] Turn on compiler warnings.],,enable_compile_warnings=minimum) - - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - warnCFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - - if test "x$enable_compile_warnings" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCFLAGS="-Wall -Wunused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_compile_warnings" = "xyes"; then - warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith" - fi - fi - fi - AC_MSG_RESULT($warnCFLAGS) - - AC_ARG_ENABLE(iso-c, - [ --enable-iso-c Try to warn if code is not ISO C ],, - enable_iso_c=no) - - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) - if test "x$cflags_set" != "xyes"; then - CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS" - cflags_set=yes - AC_SUBST(cflags_set) - fi -]) - -dnl For C++, do basically the same thing. - -AC_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - [ --enable-cxx-warnings=[no/minimum/yes] Turn on compiler warnings.],,enable_cxx_warnings=minimum) - - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) - - AC_ARG_ENABLE(iso-cxx, - [ --enable-iso-cxx Try to warn if code is not ISO C++ ],, - enable_iso_cxx=no) - - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac - - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) - if test "x$cxxflags_set" != "xyes"; then - CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - cxxflags_set=yes - AC_SUBST(cxxflags_set) - fi -]) - -dnl GNOME_X_CHECKS -dnl -dnl Basic X11 related checks for X11. At the end, the following will be -dnl defined/changed: -dnl GTK_{CFLAGS,LIBS} From AM_PATH_GTK -dnl CPPFLAGS Will include $X_CFLAGS -dnl GNOME_HAVE_SM `true' or `false' depending on whether session -dnl management is available. It is available if -dnl both -lSM and X11/SM/SMlib.h exist. (Some -dnl Solaris boxes have the library but not the header) -dnl XPM_LIBS -lXpm if Xpm library is present, otherwise "" -dnl -dnl The following configure cache variables are defined (but not used): -dnl gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS} -dnl -AC_DEFUN([GNOME_X_CHECKS], -[ - AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path)) - dnl Hope that GTK_CFLAGS have only -I and -D. Otherwise, we could - dnl test -z "$x_includes" || CPPFLAGS="$CPPFLAGS -I$x_includes" - dnl - dnl Use CPPFLAGS instead of CFLAGS because AC_CHECK_HEADERS uses - dnl CPPFLAGS, not CFLAGS - CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" - - saved_ldflags="$LDFLAGS" - LDFLAGS="$LDFLAGS $GTK_LIBS" - - gnome_cv_passdown_x_libs="$GTK_LIBS" - gnome_cv_passdown_X_LIBS="$GTK_LIBS" - gnome_cv_passdown_X_CFLAGS="$GTK_CFLAGS" - gnome_cv_passdown_GTK_LIBS="$GTK_LIBS" - - LDFLAGS="$saved_ldflags $GTK_LIBS" - -dnl We are requiring GTK >= 1.1.1, which means this will be fine anyhow. - USE_DEVGTK=true - -dnl AC_MSG_CHECKING([whether to use features from (unstable) GTK+ 1.1.x]) -dnl AC_EGREP_CPP(answer_affirmatively, -dnl [#include -dnl #ifdef GTK_HAVE_FEATURES_1_1_0 -dnl answer_affirmatively -dnl #endif -dnl ], dev_gtk=yes, dev_gtk=no) -dnl if test "$dev_gtk" = "yes"; then -dnl USE_DEVGTK=true -dnl fi -dnl AC_MSG_RESULT("$dev_gtk") - - GNOME_HAVE_SM=true - case "$GTK_LIBS" in - *-lSM*) - dnl Already found it. - ;; - *) - dnl Assume that if we have -lSM then we also have -lICE. - AC_CHECK_LIB(SM, SmcSaveYourselfDone, - [GTK_LIBS="-lSM -lICE $GTK_LIBS"],GNOME_HAVE_SM=false, - $x_libs -lICE) - ;; - esac - - if test "$GNOME_HAVE_SM" = true; then - AC_CHECK_HEADERS(X11/SM/SMlib.h,,GNOME_HAVE_SM=false) - fi - - if test "$GNOME_HAVE_SM" = true; then - AC_DEFINE(HAVE_LIBSM) - fi - - XPM_LIBS="" - AC_CHECK_LIB(Xpm, XpmFreeXpmImage, [XPM_LIBS="-lXpm"], , $x_libs) - AC_SUBST(XPM_LIBS) - - AC_REQUIRE([GNOME_PTHREAD_CHECK]) - LDFLAGS="$saved_ldflags" - - AC_PROVIDE([GNOME_X_CHECKS]) -]) - # Configure paths for GTK+ # Owen Taylor 97-11-3 @@ -736,6 +350,396 @@ main () rm -f conf.gtktest ]) +dnl +dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits]) +dnl +dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh +dnl is not found. +dnl + +AC_DEFUN([GNOME_INIT_HOOK],[ + AC_SUBST(GNOME_LIBS) + AC_SUBST(GNOMEUI_LIBS) + AC_SUBST(GNOMEGNORBA_LIBS) + AC_SUBST(GTKXMHTML_LIBS) + AC_SUBST(ZVT_LIBS) + AC_SUBST(GNOME_LIBDIR) + AC_SUBST(GNOME_INCLUDEDIR) + + AC_ARG_WITH(gnome-includes, + [ --with-gnome-includes Specify location of GNOME headers],[ + CFLAGS="$CFLAGS -I$withval" + ]) + + AC_ARG_WITH(gnome-libs, + [ --with-gnome-libs Specify location of GNOME libs],[ + LDFLAGS="$LDFLAGS -L$withval" + gnome_prefix=$withval + ]) + + AC_ARG_WITH(gnome, + [ --with-gnome Specify prefix for GNOME files], + if test x$withval = xyes; then + want_gnome=yes + dnl Note that an empty true branch is not + dnl valid sh syntax. + ifelse([$1], [], :, [$1]) + else + if test "x$withval" = xno; then + want_gnome=no + else + want_gnome=yes + LDFLAGS="$LDFLAGS -L$withval/lib" + CFLAGS="$CFLAGS -I$withval/include" + gnome_prefix=$withval/lib + fi + fi, + want_gnome=yes) + + if test "x$want_gnome" = xyes; then + + AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) + if test "$GNOME_CONFIG" = "no"; then + no_gnome_config="yes" + else + AC_MSG_CHECKING(if $GNOME_CONFIG works) + if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then + AC_MSG_RESULT(yes) + GNOME_GNORBA_HOOK([],$2) + GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`" + GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" + GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" + GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" + ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" + GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" + GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" + $1 + else + AC_MSG_RESULT(no) + no_gnome_config="yes" + fi + fi + + if test x$exec_prefix = xNONE; then + if test x$prefix = xNONE; then + gnome_prefix=$ac_default_prefix/lib + else + gnome_prefix=$prefix/lib + fi + else + gnome_prefix=`eval echo \`echo $libdir\`` + fi + + if test "$no_gnome_config" = "yes"; then + AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) + if test -f $gnome_prefix/gnomeConf.sh; then + AC_MSG_RESULT(found) + echo "loading gnome configuration from" \ + "$gnome_prefix/gnomeConf.sh" + . $gnome_prefix/gnomeConf.sh + $1 + else + AC_MSG_RESULT(not found) + if test x$2 = xfail; then + AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) + fi + fi + fi + fi + + if test -n "$3"; then + n="$3" + for i in $n; do + AC_MSG_CHECKING(extra library \"$i\") + case $i in + applets) + AC_SUBST(GNOME_APPLETS_LIBS) + GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` + AC_MSG_RESULT($GNOME_APPLETS_LIBS);; + docklets) + AC_SUBST(GNOME_DOCKLETS_LIBS) + GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets` + AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);; + capplet) + AC_SUBST(GNOME_CAPPLET_LIBS) + GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` + AC_MSG_RESULT($GNOME_CAPPLET_LIBS);; + *) + AC_MSG_RESULT(unknown library) + esac + done + fi +]) + +dnl +dnl GNOME_INIT ([additional-inits]) +dnl + +AC_DEFUN([GNOME_INIT],[ + GNOME_INIT_HOOK([],fail,$1) +]) + +dnl +dnl GNOME_GNORBA_HOOK (script-if-gnorba-found, failflag) +dnl +dnl if failflag is "failure" it aborts if gnorba is not found. +dnl + +AC_DEFUN([GNOME_GNORBA_HOOK],[ + GNOME_ORBIT_HOOK([],$2) + AC_CACHE_CHECK([for gnorba libraries],gnome_cv_gnorba_found,[ + gnome_cv_gnorba_found=no + if test x$gnome_cv_orbit_found = xyes; then + GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" + GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + if test -n "$GNORBA_LIBS"; then + gnome_cv_gnorba_found=yes + fi + fi + ]) + AM_CONDITIONAL(HAVE_GNORBA, test x$gnome_cv_gnorba_found = xyes) + if test x$gnome_cv_orbit_found = xyes; then + $1 + GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" + GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + AC_SUBST(GNORBA_CFLAGS) + AC_SUBST(GNORBA_LIBS) + else + if test x$2 = xfailure; then + AC_MSG_ERROR(gnorba library not installed or installation problem) + fi + fi +]) + +AC_DEFUN([GNOME_GNORBA_CHECK], [ + GNOME_GNORBA_HOOK([],failure) +]) + +dnl +dnl GNOME_ORBIT_HOOK (script-if-orbit-found, failflag) +dnl +dnl if failflag is "failure" it aborts if orbit is not found. +dnl + +AC_DEFUN([GNOME_ORBIT_HOOK],[ + AC_PATH_PROG(ORBIT_CONFIG,orbit-config,no) + AC_PATH_PROG(ORBIT_IDL,orbit-idl,no) + AC_CACHE_CHECK([for working ORBit environment],gnome_cv_orbit_found,[ + if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then + gnome_cv_orbit_found=no + else + gnome_cv_orbit_found=yes + fi + ]) + AM_CONDITIONAL(HAVE_ORBIT, test x$gnome_cv_orbit_found = xyes) + if test x$gnome_cv_orbit_found = xyes; then + $1 + ORBIT_CFLAGS=`orbit-config --cflags client server` + ORBIT_LIBS=`orbit-config --use-service=name --libs client server` + AC_SUBST(ORBIT_CFLAGS) + AC_SUBST(ORBIT_LIBS) + else + if test x$2 = xfailure; then + AC_MSG_ERROR(ORBit not installed or installation problem) + fi + fi +]) + +AC_DEFUN([GNOME_ORBIT_CHECK], [ + GNOME_ORBIT_HOOK([],failure) +]) + +dnl GNOME_COMPILE_WARNINGS +dnl Turn on many useful compiler warnings +dnl For now, only works on GCC +AC_DEFUN([GNOME_COMPILE_WARNINGS],[ + AC_ARG_ENABLE(compile-warnings, + [ --enable-compile-warnings=[no/minimum/yes] Turn on compiler warnings.],,enable_compile_warnings=minimum) + + AC_MSG_CHECKING(what warning flags to pass to the C compiler) + warnCFLAGS= + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi + + if test "x$enable_compile_warnings" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; + *) warnCFLAGS="-Wall -Wunused" ;; + esac + + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_compile_warnings" = "xyes"; then + warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations" + fi + fi + fi + AC_MSG_RESULT($warnCFLAGS) + + AC_ARG_ENABLE(iso-c, + [ --enable-iso-c Try to warn if code is not ISO C ],, + enable_iso_c=no) + + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + + case " $CFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCFLAGS) + if test "x$cflags_set" != "xyes"; then + CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS" + cflags_set=yes + AC_SUBST(cflags_set) + fi +]) + +dnl For C++, do basically the same thing. + +AC_DEFUN([GNOME_CXX_WARNINGS],[ + AC_ARG_ENABLE(cxx-warnings, + [ --enable-cxx-warnings=[no/minimum/yes] Turn on compiler warnings.],,enable_cxx_warnings=minimum) + + AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) + warnCXXFLAGS= + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi + if test "x$enable_cxx_warnings" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; + *) warnCXXFLAGS="-Wall -Wno-unused" ;; + esac + + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_cxx_warnings" = "xyes"; then + warnCXXFLAGS="$warnCXXFLAGS -Wmissing-prototypes -Wmissing-declarations -Wshadow -Woverloaded-virtual" + fi + fi + fi + AC_MSG_RESULT($warnCXXFLAGS) + + AC_ARG_ENABLE(iso-cxx, + [ --enable-iso-cxx Try to warn if code is not ISO C++ ],, + enable_iso_cxx=no) + + AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) + complCXXFLAGS= + if test "x$enable_iso_cxx" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; + esac + + case " $CXXFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCXXFLAGS) + if test "x$cxxflags_set" != "xyes"; then + CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" + cxxflags_set=yes + AC_SUBST(cxxflags_set) + fi +]) + +dnl GNOME_X_CHECKS +dnl +dnl Basic X11 related checks for X11. At the end, the following will be +dnl defined/changed: +dnl GTK_{CFLAGS,LIBS} From AM_PATH_GTK +dnl CPPFLAGS Will include $X_CFLAGS +dnl GNOME_HAVE_SM `true' or `false' depending on whether session +dnl management is available. It is available if +dnl both -lSM and X11/SM/SMlib.h exist. (Some +dnl Solaris boxes have the library but not the header) +dnl XPM_LIBS -lXpm if Xpm library is present, otherwise "" +dnl +dnl The following configure cache variables are defined (but not used): +dnl gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS} +dnl +AC_DEFUN([GNOME_X_CHECKS], +[ + AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path)) + dnl Hope that GTK_CFLAGS have only -I and -D. Otherwise, we could + dnl test -z "$x_includes" || CPPFLAGS="$CPPFLAGS -I$x_includes" + dnl + dnl Use CPPFLAGS instead of CFLAGS because AC_CHECK_HEADERS uses + dnl CPPFLAGS, not CFLAGS + CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" + + saved_ldflags="$LDFLAGS" + LDFLAGS="$LDFLAGS $GTK_LIBS" + + gnome_cv_passdown_x_libs="$GTK_LIBS" + gnome_cv_passdown_X_LIBS="$GTK_LIBS" + gnome_cv_passdown_X_CFLAGS="$GTK_CFLAGS" + gnome_cv_passdown_GTK_LIBS="$GTK_LIBS" + + LDFLAGS="$saved_ldflags $GTK_LIBS" + +dnl We are requiring GTK >= 1.1.1, which means this will be fine anyhow. + USE_DEVGTK=true + +dnl AC_MSG_CHECKING([whether to use features from (unstable) GTK+ 1.1.x]) +dnl AC_EGREP_CPP(answer_affirmatively, +dnl [#include +dnl #ifdef GTK_HAVE_FEATURES_1_1_0 +dnl answer_affirmatively +dnl #endif +dnl ], dev_gtk=yes, dev_gtk=no) +dnl if test "$dev_gtk" = "yes"; then +dnl USE_DEVGTK=true +dnl fi +dnl AC_MSG_RESULT("$dev_gtk") + + GNOME_HAVE_SM=true + case "$GTK_LIBS" in + *-lSM*) + dnl Already found it. + ;; + *) + dnl Assume that if we have -lSM then we also have -lICE. + AC_CHECK_LIB(SM, SmcSaveYourselfDone, + [GTK_LIBS="-lSM -lICE $GTK_LIBS"],GNOME_HAVE_SM=false, + $x_libs -lICE) + ;; + esac + + if test "$GNOME_HAVE_SM" = true; then + AC_CHECK_HEADERS(X11/SM/SMlib.h,,GNOME_HAVE_SM=false) + fi + + if test "$GNOME_HAVE_SM" = true; then + AC_DEFINE(HAVE_LIBSM) + fi + + XPM_LIBS="" + AC_CHECK_LIB(Xpm, XpmFreeXpmImage, [XPM_LIBS="-lXpm"], , $x_libs) + AC_SUBST(XPM_LIBS) + + AC_REQUIRE([GNOME_PTHREAD_CHECK]) + LDFLAGS="$saved_ldflags" + + AC_PROVIDE([GNOME_X_CHECKS]) +]) + dnl dnl And better, use gthreads instead... dnl diff --git a/config.h.in b/config.h.in index 2afbe75aa..8731f64be 100644 --- a/config.h.in +++ b/config.h.in @@ -1,8 +1,12 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ #undef HAVE_LIBSM +/* The directory where our data will be installed in */ #undef CONFIG_DATA_DIR +/* Are we debugging ? */ +#undef DEBUG + /* Define if you have the header file. */ #undef HAVE_BYTESWAP_H @@ -22,6 +26,9 @@ /* Define if you have the `glut' library (-lglut). */ #undef HAVE_LIBGLUT +/* Define if you have the `gtkgl' library (-lgtkgl). */ +#undef HAVE_LIBGTKGL + /* Define if you have the `jpeg' library (-ljpeg). */ #undef HAVE_LIBJPEG diff --git a/configure b/configure index 5a28b7109..6a18b2f3e 100755 --- a/configure +++ b/configure @@ -654,11 +654,10 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-debug Produce an executable with debugging symbols --enable-pedantic Enable -pedantic (and -ansi for C) when compiling - --enable-profile Produce a profiled executable - --enable-gtk Use Gtk for an enhanced GUI + --enable-profile Produce a profiled executabledefault=no + --disable-gtktest Do not try to compile and run a test GTK program --enable-compile-warnings=no/minimum/yes Turn on compiler warnings. --enable-iso-c Try to warn if code is not ISO C - --disable-gtktest Do not try to compile and run a test GTK program Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -667,11 +666,12 @@ Optional Packages: --with-gl-inc=DIR Specify OpenGL header file location --with-glut-libs=DIR Specify GLUT library location --with-glut-inc=DIR Specify GLUT header file location + --with-gtk-prefix=PFX Prefix where GTK is installed (optional) + --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) + --with-gtk Use Gtk for an enhanced GUI --with-gnome-includes Specify location of GNOME headers --with-gnome-libs Specify location of GNOME libs --with-gnome Specify prefix for GNOME files - --with-gtk-prefix=PFX Prefix where GTK is installed (optional) - --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) --with-x use the X Window System Some influential environment variables: @@ -1155,7 +1155,7 @@ echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi -PACKAGE=Celestia +PACKAGE=celestia VERSION=1.1.5 @@ -2863,28 +2863,61 @@ else fi CELESTIA_CPPFLAGS="" -CELESTIA_CFLAGS="-O2 -Wall -fomit-frame-pointer -ffast-math -fexpensive-optimizations" -CELESTIA_CXXFLAGS="-O2 -Wall -fomit-frame-pointer -ffast-math -fexpensive-optimizations" +CELESTIA_CFLAGS="-O2 -Wall -ffast-math -fexpensive-optimizations" +CELESTIA_CXXFLAGS="-O2 -Wall -ffast-math -fexpensive-optimizations" +echo "$as_me:2869: checking wether to include debugging code" >&5 +echo $ECHO_N "checking wether to include debugging code... $ECHO_C" >&6 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" - CELESTIA_CFLAGS="-g -Wall -DDEBUG"; CELESTIA_CXXFLAGS="-g -Wall -DDEBUG" -else - CELESTIA_CPPFLAGS="$CELESTIA_CPPFLAGS -DCELESTIA_NO_ASSERT=1" -fi; +else + enable_debug="no" +fi; +if test "$enable_debug" == "yes" ; then + CELESTIA_CFLAGS="-g -Wall"; CELESTIA_CXXFLAGS="-g -Wall" + cat >>confdefs.h <<\EOF +#define DEBUG 1 +EOF + +fi +echo "$as_me:2885: result: $enable_debug" >&5 +echo "${ECHO_T}$enable_debug" >&6 + +echo "$as_me:2888: checking wether to be pedantic" >&5 +echo $ECHO_N "checking wether to be pedantic... $ECHO_C" >&6 # Check whether --enable-pedantic or --disable-pedantic was given. if test "${enable_pedantic+set}" = set; then enableval="$enable_pedantic" - CELESTIA_CFLAGS="$CELESTIA_CFLAGS -ansi -pedantic"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -pedantic" -fi; +else + enable_pedantic="no" +fi; +if test "$enable_pedantic" == "yes" ; then + CELESTIA_CFLAGS="$CELESTIA_CFLAGS -ansi -pedantic"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -pedantic" +fi +echo "$as_me:2900: result: $enable_pedantic" >&5 +echo "${ECHO_T}$enable_pedantic" >&6 + +echo "$as_me:2903: checking wether to do profiling" >&5 +echo $ECHO_N "checking wether to do profiling... $ECHO_C" >&6 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then enableval="$enable_profile" - CELESTIA_CFLAGS="$CELESTIA_CFLAGS -pg"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -pg" + +else + enable_profile="no" fi; +if test "$enable_profile" == "yes" ; then + CELESTIA_CFLAGS="$CELESTIA_CFLAGS -pg"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -pg" +else + if test "$enable_debug" != "yes" ; then + CELESTIA_CFLAGS="$CELESTIA_CFLAGS -fomit-frame-pointer"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -fomit-frame-pointer" + fi +fi +echo "$as_me:2919: result: $enable_profile" >&5 +echo "${ECHO_T}$enable_profile" >&6 # Check whether --with-gl-libs or --without-gl-libs was given. if test "${with_gl_libs+set}" = set; then @@ -2910,611 +2943,321 @@ if test "${with_glut_inc+set}" = set; then CELESTIAFLAGS="$CELESTIAFLAGS -I$withval" fi; +LIBS="$LIBS -lm" + +echo "$as_me:2948: checking for glNewList in -lGL" >&5 +echo $ECHO_N "checking for glNewList in -lGL... $ECHO_C" >&6 +if test "${ac_cv_lib_GL_glNewList+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lGL $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 2956 "configure" +#include "confdefs.h" + +/* 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 glNewList (); +int +main () +{ +glNewList (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:2975: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2978: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:2981: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2984: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_GL_glNewList=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_GL_glNewList=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:2995: result: $ac_cv_lib_GL_glNewList" >&5 +echo "${ECHO_T}$ac_cv_lib_GL_glNewList" >&6 +if test $ac_cv_lib_GL_glNewList = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for glNewList in -lMesaGL... $ECHO_C" >&6 +if test "${ac_cv_lib_MesaGL_glNewList+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lMesaGL $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 3016 "configure" +#include "confdefs.h" + +/* 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 glNewList (); +int +main () +{ +glNewList (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3035: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3038: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3041: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3044: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_MesaGL_glNewList=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_MesaGL_glNewList=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:3055: result: $ac_cv_lib_MesaGL_glNewList" >&5 +echo "${ECHO_T}$ac_cv_lib_MesaGL_glNewList" >&6 +if test $ac_cv_lib_MesaGL_glNewList = yes; then + cat >>confdefs.h <&5 +echo "$as_me: error: GL library was not found" >&2;} + { (exit 1); exit 1; }; } +fi + +fi + +echo "$as_me:3072: checking for gluLookAt in -lGLU" >&5 +echo $ECHO_N "checking for gluLookAt in -lGLU... $ECHO_C" >&6 +if test "${ac_cv_lib_GLU_gluLookAt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lGLU $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 3080 "configure" +#include "confdefs.h" + +/* 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 gluLookAt (); +int +main () +{ +gluLookAt (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3099: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3102: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3105: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3108: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_GLU_gluLookAt=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_GLU_gluLookAt=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:3119: result: $ac_cv_lib_GLU_gluLookAt" >&5 +echo "${ECHO_T}$ac_cv_lib_GLU_gluLookAt" >&6 +if test $ac_cv_lib_GLU_gluLookAt = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for gluLookAt in -lMesaGLU... $ECHO_C" >&6 +if test "${ac_cv_lib_MesaGLU_gluLookAt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lMesaGLU $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 3140 "configure" +#include "confdefs.h" + +/* 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 gluLookAt (); +int +main () +{ +gluLookAt (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3159: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3162: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3165: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3168: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_MesaGLU_gluLookAt=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_MesaGLU_gluLookAt=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:3179: result: $ac_cv_lib_MesaGLU_gluLookAt" >&5 +echo "${ECHO_T}$ac_cv_lib_MesaGLU_gluLookAt" >&6 +if test $ac_cv_lib_MesaGLU_gluLookAt = yes; then + cat >>confdefs.h <&5 +echo "$as_me: error: GLU library was not found" >&2;} + { (exit 1); exit 1; }; } +fi + +fi + +echo "$as_me:3196: checking for glutKeyboardUpFunc in -lglut" >&5 +echo $ECHO_N "checking for glutKeyboardUpFunc in -lglut... $ECHO_C" >&6 +if test "${ac_cv_lib_glut_glutKeyboardUpFunc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lglut $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 3204 "configure" +#include "confdefs.h" + +/* 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 glutKeyboardUpFunc (); +int +main () +{ +glutKeyboardUpFunc (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3223: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3226: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3229: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3232: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_glut_glutKeyboardUpFunc=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_glut_glutKeyboardUpFunc=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:3243: result: $ac_cv_lib_glut_glutKeyboardUpFunc" >&5 +echo "${ECHO_T}$ac_cv_lib_glut_glutKeyboardUpFunc" >&6 +if test $ac_cv_lib_glut_glutKeyboardUpFunc = yes; then + cat >>confdefs.h <= 3.7 not found" >&5 +echo "$as_me: error: GLUT library version >= 3.7 not found" >&2;} + { (exit 1); exit 1; }; } +fi + GTK_LIBS="" GTKGL_LIBS="" - -# Check whether --enable-gtk or --disable-gtk was given. -if test "${enable_gtk+set}" = set; then - enableval="$enable_gtk" - enable_gtk="yes" -else - enable_gtk="no" -fi; - -if test "$enable_gtk" == "yes" ; then - -# Check whether --with-gnome-includes or --without-gnome-includes was given. -if test "${with_gnome_includes+set}" = set; then - withval="$with_gnome_includes" - - CFLAGS="$CFLAGS -I$withval" - -fi; - -# Check whether --with-gnome-libs or --without-gnome-libs was given. -if test "${with_gnome_libs+set}" = set; then - withval="$with_gnome_libs" - - LDFLAGS="$LDFLAGS -L$withval" - gnome_prefix=$withval - -fi; - -# Check whether --with-gnome or --without-gnome was given. -if test "${with_gnome+set}" = set; then - withval="$with_gnome" - if test x$withval = xyes; then - want_gnome=yes - : - else - if test "x$withval" = xno; then - want_gnome=no - else - want_gnome=yes - LDFLAGS="$LDFLAGS -L$withval/lib" - CFLAGS="$CFLAGS -I$withval/include" - gnome_prefix=$withval/lib - fi - fi -else - want_gnome=yes -fi; - - if test "x$want_gnome" = xyes; then - - # Extract the first word of "gnome-config", so it can be a program name with args. -set dummy gnome-config; ac_word=$2 -echo "$as_me:2967: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GNOME_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GNOME_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_GNOME_CONFIG="$ac_dir/$ac_word" - echo "$as_me:2984: found $ac_dir/$ac_word" >&5 - break -fi -done - - test -z "$ac_cv_path_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no" - ;; -esac -fi -GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG - -if test -n "$GNOME_CONFIG"; then - echo "$as_me:2996: result: $GNOME_CONFIG" >&5 -echo "${ECHO_T}$GNOME_CONFIG" >&6 -else - echo "$as_me:2999: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - if test "$GNOME_CONFIG" = "no"; then - no_gnome_config="yes" - else - echo "$as_me:3006: checking if $GNOME_CONFIG works" >&5 -echo $ECHO_N "checking if $GNOME_CONFIG works... $ECHO_C" >&6 - if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then - echo "$as_me:3009: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - - # Extract the first word of "orbit-config", so it can be a program name with args. -set dummy orbit-config; ac_word=$2 -echo "$as_me:3014: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_ORBIT_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ORBIT_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ORBIT_CONFIG="$ORBIT_CONFIG" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_ORBIT_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3031: found $ac_dir/$ac_word" >&5 - break -fi -done - - test -z "$ac_cv_path_ORBIT_CONFIG" && ac_cv_path_ORBIT_CONFIG="no" - ;; -esac -fi -ORBIT_CONFIG=$ac_cv_path_ORBIT_CONFIG - -if test -n "$ORBIT_CONFIG"; then - echo "$as_me:3043: result: $ORBIT_CONFIG" >&5 -echo "${ECHO_T}$ORBIT_CONFIG" >&6 -else - echo "$as_me:3046: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "orbit-idl", so it can be a program name with args. -set dummy orbit-idl; ac_word=$2 -echo "$as_me:3052: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_ORBIT_IDL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ORBIT_IDL in - [\\/]* | ?:[\\/]*) - ac_cv_path_ORBIT_IDL="$ORBIT_IDL" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_ORBIT_IDL="$ac_dir/$ac_word" - echo "$as_me:3069: found $ac_dir/$ac_word" >&5 - break -fi -done - - test -z "$ac_cv_path_ORBIT_IDL" && ac_cv_path_ORBIT_IDL="no" - ;; -esac -fi -ORBIT_IDL=$ac_cv_path_ORBIT_IDL - -if test -n "$ORBIT_IDL"; then - echo "$as_me:3081: result: $ORBIT_IDL" >&5 -echo "${ECHO_T}$ORBIT_IDL" >&6 -else - echo "$as_me:3084: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - echo "$as_me:3088: checking for working ORBit environment" >&5 -echo $ECHO_N "checking for working ORBit environment... $ECHO_C" >&6 -if test "${gnome_cv_orbit_found+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then - gnome_cv_orbit_found=no - else - gnome_cv_orbit_found=yes - fi - -fi -echo "$as_me:3101: result: $gnome_cv_orbit_found" >&5 -echo "${ECHO_T}$gnome_cv_orbit_found" >&6 - -if test x$gnome_cv_orbit_found = xyes; then - HAVE_ORBIT_TRUE= - HAVE_ORBIT_FALSE='#' -else - HAVE_ORBIT_TRUE='#' - HAVE_ORBIT_FALSE= -fi - if test x$gnome_cv_orbit_found = xyes; then - - ORBIT_CFLAGS=`orbit-config --cflags client server` - ORBIT_LIBS=`orbit-config --use-service=name --libs client server` - - else - if test xfail = xfailure; then - { { echo "$as_me:3118: error: ORBit not installed or installation problem" >&5 -echo "$as_me: error: ORBit not installed or installation problem" >&2;} - { (exit 1); exit 1; }; } - fi - fi - - echo "$as_me:3124: checking for gnorba libraries" >&5 -echo $ECHO_N "checking for gnorba libraries... $ECHO_C" >&6 -if test "${gnome_cv_gnorba_found+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - gnome_cv_gnorba_found=no - if test x$gnome_cv_orbit_found = xyes; then - GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" - GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" - if test -n "$GNORBA_LIBS"; then - gnome_cv_gnorba_found=yes - fi - fi - -fi -echo "$as_me:3140: result: $gnome_cv_gnorba_found" >&5 -echo "${ECHO_T}$gnome_cv_gnorba_found" >&6 - -if test x$gnome_cv_gnorba_found = xyes; then - HAVE_GNORBA_TRUE= - HAVE_GNORBA_FALSE='#' -else - HAVE_GNORBA_TRUE='#' - HAVE_GNORBA_FALSE= -fi - if test x$gnome_cv_orbit_found = xyes; then - - GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" - GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" - - else - if test xfail = xfailure; then - { { echo "$as_me:3157: error: gnorba library not installed or installation problem" >&5 -echo "$as_me: error: gnorba library not installed or installation problem" >&2;} - { (exit 1); exit 1; }; } - fi - fi - - GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`" - GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" - GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" - GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" - ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" - GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" - GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" - - else - echo "$as_me:3172: result: no" >&5 -echo "${ECHO_T}no" >&6 - no_gnome_config="yes" - fi - fi - - if test x$exec_prefix = xNONE; then - if test x$prefix = xNONE; then - gnome_prefix=$ac_default_prefix/lib - else - gnome_prefix=$prefix/lib - fi - else - gnome_prefix=`eval echo \`echo $libdir\`` - fi - - if test "$no_gnome_config" = "yes"; then - echo "$as_me:3189: checking for gnomeConf.sh file in $gnome_prefix" >&5 -echo $ECHO_N "checking for gnomeConf.sh file in $gnome_prefix... $ECHO_C" >&6 - if test -f $gnome_prefix/gnomeConf.sh; then - echo "$as_me:3192: result: found" >&5 -echo "${ECHO_T}found" >&6 - echo "loading gnome configuration from" \ - "$gnome_prefix/gnomeConf.sh" - . $gnome_prefix/gnomeConf.sh - - else - echo "$as_me:3199: result: not found" >&5 -echo "${ECHO_T}not found" >&6 - if test xfail = xfail; then - { { echo "$as_me:3202: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" >&5 -echo "$as_me: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" >&2;} - { (exit 1); exit 1; }; } - fi - fi - fi - fi - - if test -n ""; then - n="" - for i in $n; do - echo "$as_me:3213: checking extra library \"$i\"" >&5 -echo $ECHO_N "checking extra library \"$i\"... $ECHO_C" >&6 - case $i in - applets) - - GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` - echo "$as_me:3219: result: $GNOME_APPLETS_LIBS" >&5 -echo "${ECHO_T}$GNOME_APPLETS_LIBS" >&6;; - capplet) - - GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` - echo "$as_me:3224: result: $GNOME_CAPPLET_LIBS" >&5 -echo "${ECHO_T}$GNOME_CAPPLET_LIBS" >&6;; - *) - echo "$as_me:3227: result: unknown library" >&5 -echo "${ECHO_T}unknown library" >&6 - esac - done - fi - - # Check whether --enable-compile-warnings or --disable-compile-warnings was given. -if test "${enable_compile_warnings+set}" = set; then - enableval="$enable_compile_warnings" - -else - enable_compile_warnings=minimum -fi; - - echo "$as_me:3241: checking what warning flags to pass to the C compiler" >&5 -echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6 - warnCFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - - if test "x$enable_compile_warnings" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *\ \ -Wall\ \ *) ;; - *) warnCFLAGS="-Wall -Wunused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_compile_warnings" = "xyes"; then - warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith" - fi - fi - fi - echo "$as_me:3262: result: $warnCFLAGS" >&5 -echo "${ECHO_T}$warnCFLAGS" >&6 - - # Check whether --enable-iso-c or --disable-iso-c was given. -if test "${enable_iso_c+set}" = set; then - enableval="$enable_iso_c" - -else - enable_iso_c=no -fi; - - echo "$as_me:3273: checking what language compliance flags to pass to the C compiler" >&5 -echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6 - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *\ \ -ansi\ \ *) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - - case " $CFLAGS " in - *\ \ -pedantic\ \ *) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - echo "$as_me:3289: result: $complCFLAGS" >&5 -echo "${ECHO_T}$complCFLAGS" >&6 - if test "x$cflags_set" != "xyes"; then - CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS" - cflags_set=yes - - fi - - PTHREAD_LIB="" - echo "$as_me:3298: checking for pthread_create in -lpthread" >&5 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3306 "configure" -#include "confdefs.h" - -/* 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 (); -int -main () -{ -pthread_create (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3325: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3328: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3331: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3334: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_pthread_pthread_create=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_pthread_pthread_create=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:3345: result: $ac_cv_lib_pthread_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 -if test $ac_cv_lib_pthread_pthread_create = yes; then - PTHREAD_LIB="-lpthread" -else - echo "$as_me:3350: checking for pthread_create in -lpthreads" >&5 -echo $ECHO_N "checking for pthread_create in -lpthreads... $ECHO_C" >&6 -if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthreads $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3358 "configure" -#include "confdefs.h" - -/* 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 (); -int -main () -{ -pthread_create (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3377: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3380: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3383: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3386: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_pthreads_pthread_create=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_pthreads_pthread_create=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:3397: result: $ac_cv_lib_pthreads_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_create" >&6 -if test $ac_cv_lib_pthreads_pthread_create = yes; then - PTHREAD_LIB="-lpthreads" -else - echo "$as_me:3402: checking for pthread_create in -lc_r" >&5 -echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6 -if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc_r $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3410 "configure" -#include "confdefs.h" - -/* 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 (); -int -main () -{ -pthread_create (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3429: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3432: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3435: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3438: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_c_r_pthread_create=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_c_r_pthread_create=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:3449: result: $ac_cv_lib_c_r_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6 -if test $ac_cv_lib_c_r_pthread_create = yes; then - PTHREAD_LIB="-lc_r" -else - echo "$as_me:3454: checking for pthread_create" >&5 -echo $ECHO_N "checking for pthread_create... $ECHO_C" >&6 -if test "${ac_cv_func_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 3460 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_create (); below. */ -#include -/* 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) (); - -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; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3491: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3494: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3497: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3500: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_pthread_create=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_pthread_create=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:3510: result: $ac_cv_func_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_create" >&6 - -fi - -fi - -fi +GTK_CFLAGS="" # Check whether --with-gtk-prefix or --without-gtk-prefix was given. if test "${with_gtk_prefix+set}" = set; then @@ -3563,7 +3306,7 @@ fi; # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 -echo "$as_me:3566: checking for $ac_word" >&5 +echo "$as_me:3309: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GTK_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3580,7 +3323,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3583: found $ac_dir/$ac_word" >&5 + echo "$as_me:3326: found $ac_dir/$ac_word" >&5 break fi done @@ -3592,15 +3335,15 @@ fi GTK_CONFIG=$ac_cv_path_GTK_CONFIG if test -n "$GTK_CONFIG"; then - echo "$as_me:3595: result: $GTK_CONFIG" >&5 + echo "$as_me:3338: result: $GTK_CONFIG" >&5 echo "${ECHO_T}$GTK_CONFIG" >&6 else - echo "$as_me:3598: result: no" >&5 + echo "$as_me:3341: result: no" >&5 echo "${ECHO_T}no" >&6 fi min_gtk_version=1.2.0 - echo "$as_me:3603: checking for GTK - version >= $min_gtk_version" >&5 + echo "$as_me:3346: checking for GTK - version >= $min_gtk_version" >&5 echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 no_gtk="" if test "$GTK_CONFIG" = "no" ; then @@ -3624,7 +3367,7 @@ echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat >conftest.$ac_ext <<_ACEOF -#line 3627 "configure" +#line 3370 "configure" #include "confdefs.h" #include @@ -3703,15 +3446,15 @@ main () _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:3706: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3449: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3709: \$? = $ac_status" >&5 + echo "$as_me:3452: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3711: \"$ac_try\"") >&5 + { (eval echo "$as_me:3454: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3714: \$? = $ac_status" >&5 + echo "$as_me:3457: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3727,11 +3470,11 @@ fi fi fi if test "x$no_gtk" = x ; then - echo "$as_me:3730: result: yes" >&5 + echo "$as_me:3473: result: yes" >&5 echo "${ECHO_T}yes" >&6 - : + enable_gtk_default="yes" else - echo "$as_me:3734: result: no" >&5 + echo "$as_me:3477: result: no" >&5 echo "${ECHO_T}no" >&6 if test "$GTK_CONFIG" = "no" ; then echo "*** The gtk-config script installed by GTK could not be found" @@ -3746,7 +3489,7 @@ echo "${ECHO_T}no" >&6 CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3749 "configure" +#line 3492 "configure" #include "confdefs.h" #include @@ -3761,16 +3504,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3764: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3507: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3767: \$? = $ac_status" >&5 + echo "$as_me:3510: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3770: \"$ac_try\"") >&5 + { (eval echo "$as_me:3513: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3773: \$? = $ac_status" >&5 + echo "$as_me:3516: \$? = $ac_status" >&5 (exit $ac_status); }; }; then echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -3801,7 +3544,977 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi GTK_CFLAGS="" GTK_LIBS="" - { { echo "$as_me:3804: error: GTK not installed" >&5 + enable_gtk_default="no" + fi + + rm -f conf.gtktest + +if test "$enable_gtk_default" == "yes" ; then + OLD_LIBS="$LIBS" + LIBS="$LIBS $GTK_LIBS -lGL" + +echo "$as_me:3556: checking for gdk_gl_query in -lgtkgl" >&5 +echo $ECHO_N "checking for gdk_gl_query in -lgtkgl... $ECHO_C" >&6 +if test "${ac_cv_lib_gtkgl_gdk_gl_query+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgtkgl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 3564 "configure" +#include "confdefs.h" + +/* 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 gdk_gl_query (); +int +main () +{ +gdk_gl_query (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3583: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3586: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3589: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3592: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gtkgl_gdk_gl_query=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_gtkgl_gdk_gl_query=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:3603: result: $ac_cv_lib_gtkgl_gdk_gl_query" >&5 +echo "${ECHO_T}$ac_cv_lib_gtkgl_gdk_gl_query" >&6 +if test $ac_cv_lib_gtkgl_gdk_gl_query = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking wether to use GTK.... $ECHO_C" >&6 + +# Check whether --with-gtk or --without-gtk was given. +if test "${with_gtk+set}" = set; then + withval="$with_gtk" + enable_gtk="$withval" +else + enable_gtk="$enable_gtk_default" +fi; +echo "$as_me:3629: result: $enable_gtk" >&5 +echo "${ECHO_T}$enable_gtk" >&6 + +if test "$enable_gtk" == "yes" ; then + +# Check whether --with-gnome-includes or --without-gnome-includes was given. +if test "${with_gnome_includes+set}" = set; then + withval="$with_gnome_includes" + + CFLAGS="$CFLAGS -I$withval" + +fi; + +# Check whether --with-gnome-libs or --without-gnome-libs was given. +if test "${with_gnome_libs+set}" = set; then + withval="$with_gnome_libs" + + LDFLAGS="$LDFLAGS -L$withval" + gnome_prefix=$withval + +fi; + +# Check whether --with-gnome or --without-gnome was given. +if test "${with_gnome+set}" = set; then + withval="$with_gnome" + if test x$withval = xyes; then + want_gnome=yes + : + else + if test "x$withval" = xno; then + want_gnome=no + else + want_gnome=yes + LDFLAGS="$LDFLAGS -L$withval/lib" + CFLAGS="$CFLAGS -I$withval/include" + gnome_prefix=$withval/lib + fi + fi +else + want_gnome=yes +fi; + + if test "x$want_gnome" = xyes; then + + # Extract the first word of "gnome-config", so it can be a program name with args. +set dummy gnome-config; ac_word=$2 +echo "$as_me:3675: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GNOME_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GNOME_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_GNOME_CONFIG="$ac_dir/$ac_word" + echo "$as_me:3692: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no" + ;; +esac +fi +GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG + +if test -n "$GNOME_CONFIG"; then + echo "$as_me:3704: result: $GNOME_CONFIG" >&5 +echo "${ECHO_T}$GNOME_CONFIG" >&6 +else + echo "$as_me:3707: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "$GNOME_CONFIG" = "no"; then + no_gnome_config="yes" + else + echo "$as_me:3714: checking if $GNOME_CONFIG works" >&5 +echo $ECHO_N "checking if $GNOME_CONFIG works... $ECHO_C" >&6 + if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then + echo "$as_me:3717: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + + # Extract the first word of "orbit-config", so it can be a program name with args. +set dummy orbit-config; ac_word=$2 +echo "$as_me:3722: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ORBIT_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ORBIT_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ORBIT_CONFIG="$ORBIT_CONFIG" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_ORBIT_CONFIG="$ac_dir/$ac_word" + echo "$as_me:3739: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_ORBIT_CONFIG" && ac_cv_path_ORBIT_CONFIG="no" + ;; +esac +fi +ORBIT_CONFIG=$ac_cv_path_ORBIT_CONFIG + +if test -n "$ORBIT_CONFIG"; then + echo "$as_me:3751: result: $ORBIT_CONFIG" >&5 +echo "${ECHO_T}$ORBIT_CONFIG" >&6 +else + echo "$as_me:3754: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + # Extract the first word of "orbit-idl", so it can be a program name with args. +set dummy orbit-idl; ac_word=$2 +echo "$as_me:3760: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ORBIT_IDL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ORBIT_IDL in + [\\/]* | ?:[\\/]*) + ac_cv_path_ORBIT_IDL="$ORBIT_IDL" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_ORBIT_IDL="$ac_dir/$ac_word" + echo "$as_me:3777: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_ORBIT_IDL" && ac_cv_path_ORBIT_IDL="no" + ;; +esac +fi +ORBIT_IDL=$ac_cv_path_ORBIT_IDL + +if test -n "$ORBIT_IDL"; then + echo "$as_me:3789: result: $ORBIT_IDL" >&5 +echo "${ECHO_T}$ORBIT_IDL" >&6 +else + echo "$as_me:3792: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + echo "$as_me:3796: checking for working ORBit environment" >&5 +echo $ECHO_N "checking for working ORBit environment... $ECHO_C" >&6 +if test "${gnome_cv_orbit_found+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then + gnome_cv_orbit_found=no + else + gnome_cv_orbit_found=yes + fi + +fi +echo "$as_me:3809: result: $gnome_cv_orbit_found" >&5 +echo "${ECHO_T}$gnome_cv_orbit_found" >&6 + +if test x$gnome_cv_orbit_found = xyes; then + HAVE_ORBIT_TRUE= + HAVE_ORBIT_FALSE='#' +else + HAVE_ORBIT_TRUE='#' + HAVE_ORBIT_FALSE= +fi + if test x$gnome_cv_orbit_found = xyes; then + + ORBIT_CFLAGS=`orbit-config --cflags client server` + ORBIT_LIBS=`orbit-config --use-service=name --libs client server` + + else + if test xfail = xfailure; then + { { echo "$as_me:3826: error: ORBit not installed or installation problem" >&5 +echo "$as_me: error: ORBit not installed or installation problem" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + echo "$as_me:3832: checking for gnorba libraries" >&5 +echo $ECHO_N "checking for gnorba libraries... $ECHO_C" >&6 +if test "${gnome_cv_gnorba_found+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + gnome_cv_gnorba_found=no + if test x$gnome_cv_orbit_found = xyes; then + GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" + GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + if test -n "$GNORBA_LIBS"; then + gnome_cv_gnorba_found=yes + fi + fi + +fi +echo "$as_me:3848: result: $gnome_cv_gnorba_found" >&5 +echo "${ECHO_T}$gnome_cv_gnorba_found" >&6 + +if test x$gnome_cv_gnorba_found = xyes; then + HAVE_GNORBA_TRUE= + HAVE_GNORBA_FALSE='#' +else + HAVE_GNORBA_TRUE='#' + HAVE_GNORBA_FALSE= +fi + if test x$gnome_cv_orbit_found = xyes; then + + GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" + GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + + else + if test xfail = xfailure; then + { { echo "$as_me:3865: error: gnorba library not installed or installation problem" >&5 +echo "$as_me: error: gnorba library not installed or installation problem" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`" + GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" + GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" + GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" + ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" + GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" + GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" + + else + echo "$as_me:3880: result: no" >&5 +echo "${ECHO_T}no" >&6 + no_gnome_config="yes" + fi + fi + + if test x$exec_prefix = xNONE; then + if test x$prefix = xNONE; then + gnome_prefix=$ac_default_prefix/lib + else + gnome_prefix=$prefix/lib + fi + else + gnome_prefix=`eval echo \`echo $libdir\`` + fi + + if test "$no_gnome_config" = "yes"; then + echo "$as_me:3897: checking for gnomeConf.sh file in $gnome_prefix" >&5 +echo $ECHO_N "checking for gnomeConf.sh file in $gnome_prefix... $ECHO_C" >&6 + if test -f $gnome_prefix/gnomeConf.sh; then + echo "$as_me:3900: result: found" >&5 +echo "${ECHO_T}found" >&6 + echo "loading gnome configuration from" \ + "$gnome_prefix/gnomeConf.sh" + . $gnome_prefix/gnomeConf.sh + + else + echo "$as_me:3907: result: not found" >&5 +echo "${ECHO_T}not found" >&6 + if test xfail = xfail; then + { { echo "$as_me:3910: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" >&5 +echo "$as_me: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" >&2;} + { (exit 1); exit 1; }; } + fi + fi + fi + fi + + if test -n ""; then + n="" + for i in $n; do + echo "$as_me:3921: checking extra library \"$i\"" >&5 +echo $ECHO_N "checking extra library \"$i\"... $ECHO_C" >&6 + case $i in + applets) + + GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` + echo "$as_me:3927: result: $GNOME_APPLETS_LIBS" >&5 +echo "${ECHO_T}$GNOME_APPLETS_LIBS" >&6;; + docklets) + + GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets` + echo "$as_me:3932: result: $GNOME_DOCKLETS_LIBS" >&5 +echo "${ECHO_T}$GNOME_DOCKLETS_LIBS" >&6;; + capplet) + + GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` + echo "$as_me:3937: result: $GNOME_CAPPLET_LIBS" >&5 +echo "${ECHO_T}$GNOME_CAPPLET_LIBS" >&6;; + *) + echo "$as_me:3940: result: unknown library" >&5 +echo "${ECHO_T}unknown library" >&6 + esac + done + fi + + # Check whether --enable-compile-warnings or --disable-compile-warnings was given. +if test "${enable_compile_warnings+set}" = set; then + enableval="$enable_compile_warnings" + +else + enable_compile_warnings=minimum +fi; + + echo "$as_me:3954: checking what warning flags to pass to the C compiler" >&5 +echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6 + warnCFLAGS= + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi + + if test "x$enable_compile_warnings" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *\ \ -Wall\ \ *) ;; + *) warnCFLAGS="-Wall -Wunused" ;; + esac + + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_compile_warnings" = "xyes"; then + warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations" + fi + fi + fi + echo "$as_me:3975: result: $warnCFLAGS" >&5 +echo "${ECHO_T}$warnCFLAGS" >&6 + + # Check whether --enable-iso-c or --disable-iso-c was given. +if test "${enable_iso_c+set}" = set; then + enableval="$enable_iso_c" + +else + enable_iso_c=no +fi; + + echo "$as_me:3986: checking what language compliance flags to pass to the C compiler" >&5 +echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6 + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *\ \ -ansi\ \ *) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + + case " $CFLAGS " in + *\ \ -pedantic\ \ *) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + echo "$as_me:4002: result: $complCFLAGS" >&5 +echo "${ECHO_T}$complCFLAGS" >&6 + if test "x$cflags_set" != "xyes"; then + CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS" + cflags_set=yes + + fi + + PTHREAD_LIB="" + echo "$as_me:4011: checking for pthread_create in -lpthread" >&5 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 +if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 4019 "configure" +#include "confdefs.h" + +/* 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 (); +int +main () +{ +pthread_create (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4038: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4041: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4044: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4047: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pthread_pthread_create=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pthread_pthread_create=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4058: result: $ac_cv_lib_pthread_pthread_create" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 +if test $ac_cv_lib_pthread_pthread_create = yes; then + PTHREAD_LIB="-lpthread" +else + echo "$as_me:4063: checking for pthread_create in -lpthreads" >&5 +echo $ECHO_N "checking for pthread_create in -lpthreads... $ECHO_C" >&6 +if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthreads $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 4071 "configure" +#include "confdefs.h" + +/* 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 (); +int +main () +{ +pthread_create (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4090: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4093: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4096: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4099: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pthreads_pthread_create=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pthreads_pthread_create=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4110: result: $ac_cv_lib_pthreads_pthread_create" >&5 +echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_create" >&6 +if test $ac_cv_lib_pthreads_pthread_create = yes; then + PTHREAD_LIB="-lpthreads" +else + echo "$as_me:4115: checking for pthread_create in -lc_r" >&5 +echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6 +if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lc_r $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 4123 "configure" +#include "confdefs.h" + +/* 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 (); +int +main () +{ +pthread_create (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4142: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4145: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4148: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4151: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_c_r_pthread_create=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_c_r_pthread_create=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4162: result: $ac_cv_lib_c_r_pthread_create" >&5 +echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6 +if test $ac_cv_lib_c_r_pthread_create = yes; then + PTHREAD_LIB="-lc_r" +else + echo "$as_me:4167: checking for pthread_create" >&5 +echo $ECHO_N "checking for pthread_create... $ECHO_C" >&6 +if test "${ac_cv_func_pthread_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 4173 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char pthread_create (); below. */ +#include +/* 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) (); + +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; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4204: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4207: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4210: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4213: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_pthread_create=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_pthread_create=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:4223: result: $ac_cv_func_pthread_create" >&5 +echo "${ECHO_T}$ac_cv_func_pthread_create" >&6 + +fi + +fi + +fi + +# Check whether --with-gtk-prefix or --without-gtk-prefix was given. +if test "${with_gtk_prefix+set}" = set; then + withval="$with_gtk_prefix" + gtk_config_prefix="$withval" +else + gtk_config_prefix="" +fi; + +# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. +if test "${with_gtk_exec_prefix+set}" = set; then + withval="$with_gtk_exec_prefix" + gtk_config_exec_prefix="$withval" +else + gtk_config_exec_prefix="" +fi; +# Check whether --enable-gtktest or --disable-gtktest was given. +if test "${enable_gtktest+set}" = set; then + enableval="$enable_gtktest" + +else + enable_gtktest=yes +fi; + + for module in . + do + case "$module" in + gthread) + gtk_config_args="$gtk_config_args gthread" + ;; + esac + done + + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + fi + fi + + # Extract the first word of "gtk-config", so it can be a program name with args. +set dummy gtk-config; ac_word=$2 +echo "$as_me:4279: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GTK_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GTK_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" + echo "$as_me:4296: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" + ;; +esac +fi +GTK_CONFIG=$ac_cv_path_GTK_CONFIG + +if test -n "$GTK_CONFIG"; then + echo "$as_me:4308: result: $GTK_CONFIG" >&5 +echo "${ECHO_T}$GTK_CONFIG" >&6 +else + echo "$as_me:4311: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + min_gtk_version=1.2.0 + echo "$as_me:4316: checking for GTK - version >= $min_gtk_version" >&5 +echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes + else + GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` + GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` + gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + if test "x$enable_gtktest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$GTK_LIBS $LIBS" + rm -f conf.gtktest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" +else + cat >conftest.$ac_ext <<_ACEOF +#line 4340 "configure" +#include "confdefs.h" + +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.gtktest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_gtk_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } + + if ((gtk_major_version != $gtk_config_major_version) || + (gtk_minor_version != $gtk_config_minor_version) || + (gtk_micro_version != $gtk_config_micro_version)) + { + printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf ("*** was found! If gtk-config was correct, then it is best\n"); + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); + printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } +#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) + { + printf("*** GTK+ header files (version %d.%d.%d) do not match\n", + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + } +#endif /* defined (GTK_MAJOR_VERSION) ... */ + else + { + if ((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); + printf("*** correct copy of gtk-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:4419: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4422: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:4424: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4427: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +no_gtk=yes +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gtk" = x ; then + echo "$as_me:4443: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + : + else + echo "$as_me:4447: result: no" >&5 +echo "${ECHO_T}no" >&6 + if test "$GTK_CONFIG" = "no" ; then + echo "*** The gtk-config script installed by GTK could not be found" + echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GTK_CONFIG environment variable to the" + echo "*** full path to gtk-config." + else + if test -f conf.gtktest ; then + : + else + echo "*** Could not run GTK test program, checking why..." + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 4462 "configure" +#include "confdefs.h" + +#include +#include + +int +main () +{ + return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4477: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4480: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4483: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4486: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK or finding the wrong" + echo "*** version of GTK. If it is not finding GTK, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" + echo "*** came with the system with the command" + echo "***" + echo "*** rpm --erase --nodeps gtk gtk-devel" +else + echo "$as_me: failed program was:" >&5 +cat 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" + echo "*** may want to edit the gtk-config script: $GTK_CONFIG" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GTK_CFLAGS="" + GTK_LIBS="" + { { echo "$as_me:4517: error: GTK not installed" >&5 echo "$as_me: error: GTK not installed" >&2;} { (exit or gtk-config not in path); exit or gtk-config not in path; }; } fi @@ -3827,7 +4540,7 @@ echo "$as_me: error: GTK not installed" >&2;} *-lSM*) ;; *) - echo "$as_me:3830: checking for SmcSaveYourselfDone in -lSM" >&5 + echo "$as_me:4543: checking for SmcSaveYourselfDone in -lSM" >&5 echo $ECHO_N "checking for SmcSaveYourselfDone in -lSM... $ECHO_C" >&6 if test "${ac_cv_lib_SM_SmcSaveYourselfDone+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3835,7 +4548,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lSM $x_libs -lICE $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3838 "configure" +#line 4551 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3854,16 +4567,16 @@ SmcSaveYourselfDone (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3857: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4570: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3860: \$? = $ac_status" >&5 + echo "$as_me:4573: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3863: \"$ac_try\"") >&5 + { (eval echo "$as_me:4576: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3866: \$? = $ac_status" >&5 + echo "$as_me:4579: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_SM_SmcSaveYourselfDone=yes else @@ -3874,7 +4587,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3877: result: $ac_cv_lib_SM_SmcSaveYourselfDone" >&5 +echo "$as_me:4590: result: $ac_cv_lib_SM_SmcSaveYourselfDone" >&5 echo "${ECHO_T}$ac_cv_lib_SM_SmcSaveYourselfDone" >&6 if test $ac_cv_lib_SM_SmcSaveYourselfDone = yes; then GTK_LIBS="-lSM -lICE $GTK_LIBS" @@ -3890,23 +4603,23 @@ fi for ac_header in X11/SM/SMlib.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3893: checking for $ac_header" >&5 +echo "$as_me:4606: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3899 "configure" +#line 4612 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3903: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4616: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3909: \$? = $ac_status" >&5 + echo "$as_me:4622: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3925,7 +4638,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:3928: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4641: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 + echo "$as_me:4663: checking for XpmFreeXpmImage in -lXpm" >&5 echo $ECHO_N "checking for XpmFreeXpmImage in -lXpm... $ECHO_C" >&6 if test "${ac_cv_lib_Xpm_XpmFreeXpmImage+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3955,7 +4668,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm $x_libs $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3958 "configure" +#line 4671 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3974,16 +4687,16 @@ XpmFreeXpmImage (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3977: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4690: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3980: \$? = $ac_status" >&5 + echo "$as_me:4693: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3983: \"$ac_try\"") >&5 + { (eval echo "$as_me:4696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3986: \$? = $ac_status" >&5 + echo "$as_me:4699: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xpm_XpmFreeXpmImage=yes else @@ -3994,7 +4707,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3997: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5 +echo "$as_me:4710: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5 echo "${ECHO_T}$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6 if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then XPM_LIBS="-lXpm" @@ -4004,7 +4717,7 @@ fi GTKGL_LIBS=-lgtkgl else - echo "$as_me:4007: checking for X" >&5 + echo "$as_me:4720: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -4101,17 +4814,17 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF -#line 4104 "configure" +#line 4817 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:4108: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4821: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4114: \$? = $ac_status" >&5 + echo "$as_me:4827: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4144,7 +4857,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4147 "configure" +#line 4860 "configure" #include "confdefs.h" #include int @@ -4156,16 +4869,16 @@ XtMalloc (0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4159: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4872: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4162: \$? = $ac_status" >&5 + echo "$as_me:4875: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4165: \"$ac_try\"") >&5 + { (eval echo "$as_me:4878: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4168: \$? = $ac_status" >&5 + echo "$as_me:4881: \$? = $ac_status" >&5 (exit $ac_status); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -4203,7 +4916,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:4206: result: $have_x" >&5 + echo "$as_me:4919: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -4213,7 +4926,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:4216: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:4929: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -4237,11 +4950,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:4240: checking whether -R must be followed by a space" >&5 + echo "$as_me:4953: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 4244 "configure" +#line 4957 "configure" #include "confdefs.h" int @@ -4253,16 +4966,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4256: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4969: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4259: \$? = $ac_status" >&5 + echo "$as_me:4972: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4262: \"$ac_try\"") >&5 + { (eval echo "$as_me:4975: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4265: \$? = $ac_status" >&5 + echo "$as_me:4978: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_nospace=yes else @@ -4272,13 +4985,13 @@ ac_R_nospace=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$as_me:4275: result: no" >&5 + echo "$as_me:4988: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 4281 "configure" +#line 4994 "configure" #include "confdefs.h" int @@ -4290,16 +5003,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4293: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5006: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4296: \$? = $ac_status" >&5 + echo "$as_me:5009: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4299: \"$ac_try\"") >&5 + { (eval echo "$as_me:5012: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4302: \$? = $ac_status" >&5 + echo "$as_me:5015: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_space=yes else @@ -4309,11 +5022,11 @@ ac_R_space=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$as_me:4312: result: yes" >&5 + echo "$as_me:5025: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:4316: result: neither works" >&5 + echo "$as_me:5029: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -4333,7 +5046,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF -#line 4336 "configure" +#line 5049 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4352,22 +5065,22 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4355: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5068: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4358: \$? = $ac_status" >&5 + echo "$as_me:5071: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4361: \"$ac_try\"") >&5 + { (eval echo "$as_me:5074: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4364: \$? = $ac_status" >&5 + echo "$as_me:5077: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:4370: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:5083: 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 echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4375,7 +5088,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4378 "configure" +#line 5091 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4394,16 +5107,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4397: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5110: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4400: \$? = $ac_status" >&5 + echo "$as_me:5113: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4403: \"$ac_try\"") >&5 + { (eval echo "$as_me:5116: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4406: \$? = $ac_status" >&5 + echo "$as_me:5119: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -4414,14 +5127,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4417: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:5130: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:4424: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:5137: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4429,7 +5142,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4432 "configure" +#line 5145 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4448,16 +5161,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4451: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5164: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4454: \$? = $ac_status" >&5 + echo "$as_me:5167: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4457: \"$ac_try\"") >&5 + { (eval echo "$as_me:5170: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4460: \$? = $ac_status" >&5 + echo "$as_me:5173: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -4468,7 +5181,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4471: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:5184: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -4487,13 +5200,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:4490: checking for gethostbyname" >&5 + echo "$as_me:5203: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4496 "configure" +#line 5209 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. */ @@ -4524,16 +5237,16 @@ f = gethostbyname; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4527: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5240: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4530: \$? = $ac_status" >&5 + echo "$as_me:5243: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4533: \"$ac_try\"") >&5 + { (eval echo "$as_me:5246: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4536: \$? = $ac_status" >&5 + echo "$as_me:5249: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gethostbyname=yes else @@ -4543,11 +5256,11 @@ ac_cv_func_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4546: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:5259: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:4550: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:5263: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4555,7 +5268,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4558 "configure" +#line 5271 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4574,16 +5287,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4577: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5290: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4580: \$? = $ac_status" >&5 + echo "$as_me:5293: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4583: \"$ac_try\"") >&5 + { (eval echo "$as_me:5296: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4586: \$? = $ac_status" >&5 + echo "$as_me:5299: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -4594,14 +5307,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4597: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:5310: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:4604: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:5317: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4609,7 +5322,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4612 "configure" +#line 5325 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4628,16 +5341,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4631: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5344: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4634: \$? = $ac_status" >&5 + echo "$as_me:5347: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4637: \"$ac_try\"") >&5 + { (eval echo "$as_me:5350: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4640: \$? = $ac_status" >&5 + echo "$as_me:5353: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -4648,7 +5361,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4651: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:5364: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -4664,13 +5377,13 @@ fi # variants that don't use the nameserver (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:4667: checking for connect" >&5 + echo "$as_me:5380: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4673 "configure" +#line 5386 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. */ @@ -4701,16 +5414,16 @@ f = connect; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4704: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5417: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4707: \$? = $ac_status" >&5 + echo "$as_me:5420: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4710: \"$ac_try\"") >&5 + { (eval echo "$as_me:5423: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4713: \$? = $ac_status" >&5 + echo "$as_me:5426: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_connect=yes else @@ -4720,11 +5433,11 @@ ac_cv_func_connect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4723: result: $ac_cv_func_connect" >&5 +echo "$as_me:5436: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:4727: checking for connect in -lsocket" >&5 + echo "$as_me:5440: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4732,7 +5445,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4735 "configure" +#line 5448 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4751,16 +5464,16 @@ connect (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4754: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5467: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4757: \$? = $ac_status" >&5 + echo "$as_me:5470: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4760: \"$ac_try\"") >&5 + { (eval echo "$as_me:5473: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4763: \$? = $ac_status" >&5 + echo "$as_me:5476: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else @@ -4771,7 +5484,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4774: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:5487: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -4780,13 +5493,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:4783: checking for remove" >&5 + echo "$as_me:5496: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4789 "configure" +#line 5502 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. */ @@ -4817,16 +5530,16 @@ f = remove; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4820: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5533: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4823: \$? = $ac_status" >&5 + echo "$as_me:5536: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4826: \"$ac_try\"") >&5 + { (eval echo "$as_me:5539: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4829: \$? = $ac_status" >&5 + echo "$as_me:5542: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_remove=yes else @@ -4836,11 +5549,11 @@ ac_cv_func_remove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4839: result: $ac_cv_func_remove" >&5 +echo "$as_me:5552: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:4843: checking for remove in -lposix" >&5 + echo "$as_me:5556: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4848,7 +5561,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4851 "configure" +#line 5564 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4867,16 +5580,16 @@ remove (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4870: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5583: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4873: \$? = $ac_status" >&5 + echo "$as_me:5586: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4876: \"$ac_try\"") >&5 + { (eval echo "$as_me:5589: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4879: \$? = $ac_status" >&5 + echo "$as_me:5592: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_posix_remove=yes else @@ -4887,7 +5600,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4890: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:5603: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -4896,13 +5609,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:4899: checking for shmat" >&5 + echo "$as_me:5612: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4905 "configure" +#line 5618 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. */ @@ -4933,16 +5646,16 @@ f = shmat; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4936: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5649: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4939: \$? = $ac_status" >&5 + echo "$as_me:5652: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4942: \"$ac_try\"") >&5 + { (eval echo "$as_me:5655: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4945: \$? = $ac_status" >&5 + echo "$as_me:5658: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shmat=yes else @@ -4952,11 +5665,11 @@ ac_cv_func_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4955: result: $ac_cv_func_shmat" >&5 +echo "$as_me:5668: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:4959: checking for shmat in -lipc" >&5 + echo "$as_me:5672: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4964,7 +5677,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4967 "configure" +#line 5680 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4983,16 +5696,16 @@ shmat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4986: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5699: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4989: \$? = $ac_status" >&5 + echo "$as_me:5702: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4992: \"$ac_try\"") >&5 + { (eval echo "$as_me:5705: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4995: \$? = $ac_status" >&5 + echo "$as_me:5708: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -5003,7 +5716,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5006: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:5719: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -5021,7 +5734,7 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:5024: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:5737: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5029,7 +5742,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5032 "configure" +#line 5745 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5048,16 +5761,16 @@ IceConnectionNumber (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5051: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5764: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5054: \$? = $ac_status" >&5 + echo "$as_me:5767: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5057: \"$ac_try\"") >&5 + { (eval echo "$as_me:5770: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5060: \$? = $ac_status" >&5 + echo "$as_me:5773: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -5068,7 +5781,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5071: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:5784: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -5092,319 +5805,10 @@ fi CFLAGS="$CFLAGS $CELESTIAFLAGS $CELESTIA_CFLAGS $GTK_CFLAGS $GNOME_CFLAGS" CXXFLAGS="$CXXFLAGS $CELESTIAFLAGS $CELESTIA_CXXFLAGS $GTK_CFLAGS $GNOME_CFLAGS $GNOME_INCLUDEDIR" -LIBS="$LIBS $CELESTIA_LIBS $GTK_LIBS $GNOME_LIBS $GNOMEUI_LIBS $GTKGL_LIBS" +LIBS="$LIBS $CELESTIALIBS $GTK_LIBS $GNOME_LIBS $GNOMEUI_LIBS $GTKGL_LIBS" +LDFLAGS="$LDFLAGS $GNOME_LIBDIR" -echo "$as_me:5097: checking for glNewList in -lGL" >&5 -echo $ECHO_N "checking for glNewList in -lGL... $ECHO_C" >&6 -if test "${ac_cv_lib_GL_glNewList+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lGL $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5105 "configure" -#include "confdefs.h" - -/* 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 glNewList (); -int -main () -{ -glNewList (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5124: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5127: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5130: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5133: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_GL_glNewList=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_GL_glNewList=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:5144: result: $ac_cv_lib_GL_glNewList" >&5 -echo "${ECHO_T}$ac_cv_lib_GL_glNewList" >&6 -if test $ac_cv_lib_GL_glNewList = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for glNewList in -lMesaGL... $ECHO_C" >&6 -if test "${ac_cv_lib_MesaGL_glNewList+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lMesaGL $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5165 "configure" -#include "confdefs.h" - -/* 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 glNewList (); -int -main () -{ -glNewList (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5184: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5187: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5190: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5193: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_MesaGL_glNewList=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_MesaGL_glNewList=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:5204: result: $ac_cv_lib_MesaGL_glNewList" >&5 -echo "${ECHO_T}$ac_cv_lib_MesaGL_glNewList" >&6 -if test $ac_cv_lib_MesaGL_glNewList = yes; then - cat >>confdefs.h <&5 -echo "$as_me: error: GL library was not found" >&2;} - { (exit 1); exit 1; }; } -fi - -fi - -echo "$as_me:5221: checking for gluLookAt in -lGLU" >&5 -echo $ECHO_N "checking for gluLookAt in -lGLU... $ECHO_C" >&6 -if test "${ac_cv_lib_GLU_gluLookAt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLU $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5229 "configure" -#include "confdefs.h" - -/* 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 gluLookAt (); -int -main () -{ -gluLookAt (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5248: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5251: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5254: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5257: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_GLU_gluLookAt=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_GLU_gluLookAt=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:5268: result: $ac_cv_lib_GLU_gluLookAt" >&5 -echo "${ECHO_T}$ac_cv_lib_GLU_gluLookAt" >&6 -if test $ac_cv_lib_GLU_gluLookAt = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for gluLookAt in -lMesaGLU... $ECHO_C" >&6 -if test "${ac_cv_lib_MesaGLU_gluLookAt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lMesaGLU $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5289 "configure" -#include "confdefs.h" - -/* 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 gluLookAt (); -int -main () -{ -gluLookAt (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5308: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5311: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5314: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5317: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_MesaGLU_gluLookAt=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_MesaGLU_gluLookAt=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:5328: result: $ac_cv_lib_MesaGLU_gluLookAt" >&5 -echo "${ECHO_T}$ac_cv_lib_MesaGLU_gluLookAt" >&6 -if test $ac_cv_lib_MesaGLU_gluLookAt = yes; then - cat >>confdefs.h <&5 -echo "$as_me: error: GLU library was not found" >&2;} - { (exit 1); exit 1; }; } -fi - -fi - -echo "$as_me:5345: checking for glutKeyboardUpFunc in -lglut" >&5 -echo $ECHO_N "checking for glutKeyboardUpFunc in -lglut... $ECHO_C" >&6 -if test "${ac_cv_lib_glut_glutKeyboardUpFunc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglut $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5353 "configure" -#include "confdefs.h" - -/* 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 glutKeyboardUpFunc (); -int -main () -{ -glutKeyboardUpFunc (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5372: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5375: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5378: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5381: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_glut_glutKeyboardUpFunc=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_glut_glutKeyboardUpFunc=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:5392: result: $ac_cv_lib_glut_glutKeyboardUpFunc" >&5 -echo "${ECHO_T}$ac_cv_lib_glut_glutKeyboardUpFunc" >&6 -if test $ac_cv_lib_glut_glutKeyboardUpFunc = yes; then - cat >>confdefs.h <= 3.7 not found" >&5 -echo "$as_me: error: GLUT library version >= 3.7 not found" >&2;} - { (exit 1); exit 1; }; } -fi - -echo "$as_me:5407: checking for jpeg_start_decompress in -ljpeg" >&5 +echo "$as_me:5811: checking for jpeg_start_decompress in -ljpeg" >&5 echo $ECHO_N "checking for jpeg_start_decompress in -ljpeg... $ECHO_C" >&6 if test "${ac_cv_lib_jpeg_jpeg_start_decompress+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5412,7 +5816,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5415 "configure" +#line 5819 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5431,16 +5835,16 @@ jpeg_start_decompress (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5434: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5838: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5437: \$? = $ac_status" >&5 + echo "$as_me:5841: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5440: \"$ac_try\"") >&5 + { (eval echo "$as_me:5844: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5443: \$? = $ac_status" >&5 + echo "$as_me:5847: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_jpeg_jpeg_start_decompress=yes else @@ -5451,7 +5855,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5454: result: $ac_cv_lib_jpeg_jpeg_start_decompress" >&5 +echo "$as_me:5858: result: $ac_cv_lib_jpeg_jpeg_start_decompress" >&5 echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_start_decompress" >&6 if test $ac_cv_lib_jpeg_jpeg_start_decompress = yes; then cat >>confdefs.h <&5 + { { echo "$as_me:5868: error: jpeg library not found" >&5 echo "$as_me: error: jpeg library not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:5469: checking for png_create_info_struct in -lpng" >&5 +echo "$as_me:5873: checking for png_create_info_struct in -lpng" >&5 echo $ECHO_N "checking for png_create_info_struct in -lpng... $ECHO_C" >&6 if test "${ac_cv_lib_png_png_create_info_struct+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5474,7 +5878,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lpng $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5477 "configure" +#line 5881 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5493,16 +5897,16 @@ png_create_info_struct (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5496: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5900: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5499: \$? = $ac_status" >&5 + echo "$as_me:5903: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5502: \"$ac_try\"") >&5 + { (eval echo "$as_me:5906: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5505: \$? = $ac_status" >&5 + echo "$as_me:5909: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_png_png_create_info_struct=yes else @@ -5513,7 +5917,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5516: result: $ac_cv_lib_png_png_create_info_struct" >&5 +echo "$as_me:5920: result: $ac_cv_lib_png_png_create_info_struct" >&5 echo "${ECHO_T}$ac_cv_lib_png_png_create_info_struct" >&6 if test $ac_cv_lib_png_png_create_info_struct = yes; then cat >>confdefs.h <&5 + { { echo "$as_me:5930: error: png library not found" >&5 echo "$as_me: error: png library not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:5531: checking for ANSI C header files" >&5 +echo "$as_me:5935: 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5537 "configure" +#line 5941 "configure" #include "confdefs.h" #include #include @@ -5542,13 +5946,13 @@ else #include _ACEOF -if { (eval echo "$as_me:5545: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5949: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5551: \$? = $ac_status" >&5 + echo "$as_me:5955: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5570,7 +5974,7 @@ rm -f conftest.err 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 5573 "configure" +#line 5977 "configure" #include "confdefs.h" #include @@ -5588,7 +5992,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 5591 "configure" +#line 5995 "configure" #include "confdefs.h" #include @@ -5609,7 +6013,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 5612 "configure" +#line 6016 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -5635,15 +6039,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5638: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6042: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5641: \$? = $ac_status" >&5 + echo "$as_me:6045: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5643: \"$ac_try\"") >&5 + { (eval echo "$as_me:6047: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5646: \$? = $ac_status" >&5 + echo "$as_me:6050: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -5656,7 +6060,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:5659: result: $ac_cv_header_stdc" >&5 +echo "$as_me:6063: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -5669,23 +6073,23 @@ fi for ac_header in GL/gl.h GL/glut.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5672: checking for $ac_header" >&5 +echo "$as_me:6076: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5678 "configure" +#line 6082 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5682: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:6086: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5688: \$? = $ac_status" >&5 + echo "$as_me:6092: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5704,7 +6108,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5707: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:6111: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:6129: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5731 "configure" +#line 6135 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5735: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:6139: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5741: \$? = $ac_status" >&5 + echo "$as_me:6145: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5757,7 +6161,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5760: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:6164: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:6174: checking whether byte ordering is bigendian" >&5 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 if test "${ac_cv_c_bigendian+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5775,7 +6179,7 @@ else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat >conftest.$ac_ext <<_ACEOF -#line 5778 "configure" +#line 6182 "configure" #include "confdefs.h" #include #include @@ -5792,20 +6196,20 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5795: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6199: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5798: \$? = $ac_status" >&5 + echo "$as_me:6202: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5801: \"$ac_try\"") >&5 + { (eval echo "$as_me:6205: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5804: \$? = $ac_status" >&5 + echo "$as_me:6208: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF -#line 5808 "configure" +#line 6212 "configure" #include "confdefs.h" #include #include @@ -5822,16 +6226,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5825: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6229: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5828: \$? = $ac_status" >&5 + echo "$as_me:6232: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5831: \"$ac_try\"") >&5 + { (eval echo "$as_me:6235: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5834: \$? = $ac_status" >&5 + echo "$as_me:6238: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_bigendian=yes else @@ -5847,12 +6251,12 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then if test "$cross_compiling" = yes; then - { { echo "$as_me:5850: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:6254: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 5855 "configure" +#line 6259 "configure" #include "confdefs.h" int main () @@ -5868,15 +6272,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5871: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6275: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5874: \$? = $ac_status" >&5 + echo "$as_me:6278: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5876: \"$ac_try\"") >&5 + { (eval echo "$as_me:6280: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5879: \$? = $ac_status" >&5 + echo "$as_me:6283: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_bigendian=no else @@ -5889,7 +6293,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:5892: result: $ac_cv_c_bigendian" >&5 +echo "$as_me:6296: result: $ac_cv_c_bigendian" >&5 echo "${ECHO_T}$ac_cv_c_bigendian" >&6 if test $ac_cv_c_bigendian = yes; then @@ -5907,7 +6311,7 @@ cat >>confdefs.h <confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -5987,7 +6391,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:5990: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:6394: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -6163,7 +6567,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:6166: error: ambiguous option: $1 + { { echo "$as_me:6570: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -6182,7 +6586,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:6185: error: unrecognized option: $1 + -*) { { echo "$as_me:6589: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -6237,9 +6641,12 @@ do "models/Makefile" ) CONFIG_FILES="$CONFIG_FILES models/Makefile" ;; "shaders/Makefile" ) CONFIG_FILES="$CONFIG_FILES shaders/Makefile" ;; "fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;; + "res/Makefile" ) CONFIG_FILES="$CONFIG_FILES res/Makefile" ;; + "macros/Makefile" ) CONFIG_FILES="$CONFIG_FILES macros/Makefile" ;; + "manual/Makefile" ) CONFIG_FILES="$CONFIG_FILES manual/Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:6242: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:6649: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -6356,6 +6763,9 @@ s,@CPP@,$CPP,;t t s,@CXXCPP@,$CXXCPP,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +s,@GTK_CONFIG@,$GTK_CONFIG,;t t +s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t +s,@GTK_LIBS@,$GTK_LIBS,;t t s,@GNOME_LIBS@,$GNOME_LIBS,;t t s,@GNOMEUI_LIBS@,$GNOMEUI_LIBS,;t t s,@GNOMEGNORBA_LIBS@,$GNOMEGNORBA_LIBS,;t t @@ -6375,11 +6785,9 @@ s,@HAVE_GNORBA_FALSE@,$HAVE_GNORBA_FALSE,;t t s,@GNORBA_CFLAGS@,$GNORBA_CFLAGS,;t t s,@GNORBA_LIBS@,$GNORBA_LIBS,;t t s,@GNOME_APPLETS_LIBS@,$GNOME_APPLETS_LIBS,;t t +s,@GNOME_DOCKLETS_LIBS@,$GNOME_DOCKLETS_LIBS,;t t s,@GNOME_CAPPLET_LIBS@,$GNOME_CAPPLET_LIBS,;t t s,@cflags_set@,$cflags_set,;t t -s,@GTK_CONFIG@,$GTK_CONFIG,;t t -s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t -s,@GTK_LIBS@,$GTK_LIBS,;t t s,@XPM_LIBS@,$XPM_LIBS,;t t s,@PTHREAD_LIB@,$PTHREAD_LIB,;t t s,@X_CFLAGS@,$X_CFLAGS,;t t @@ -6502,7 +6910,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:6505: creating $ac_file" >&5 + { echo "$as_me:6913: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -6520,7 +6928,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:6523: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:6931: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -6533,7 +6941,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:6536: error: cannot find input file: $f" >&5 + { { echo "$as_me:6944: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -6594,7 +7002,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:6597: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:7005: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -6605,7 +7013,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:6608: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:7016: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -6618,7 +7026,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:6621: error: cannot find input file: $f" >&5 + { { echo "$as_me:7029: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -6735,7 +7143,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:6738: $ac_file is unchanged" >&5 + { echo "$as_me:7146: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -6816,19 +7224,19 @@ if test "$no_create" != yes; then $ac_cs_success || { (exit 1); exit 1; } fi -echo "$as_me:6819: result: " >&5 +echo "$as_me:7227: result: " >&5 echo "${ECHO_T}" >&6 -echo "$as_me:6821: result: " >&5 +echo "$as_me:7229: result: " >&5 echo "${ECHO_T}" >&6 -echo "$as_me:6823: result: ********************************************************************" >&5 +echo "$as_me:7231: result: ********************************************************************" >&5 echo "${ECHO_T}********************************************************************" >&6 -echo "$as_me:6825: result: *** Celestia configuration complete. Now do a 'make' followed ***" >&5 +echo "$as_me:7233: result: *** Celestia configuration complete. Now do a 'make' followed ***" >&5 echo "${ECHO_T}*** Celestia configuration complete. Now do a 'make' followed ***" >&6 -echo "$as_me:6827: result: *** by 'make install' ***" >&5 +echo "$as_me:7235: result: *** by 'make install' ***" >&5 echo "${ECHO_T}*** by 'make install' ***" >&6 -echo "$as_me:6829: result: ********************************************************************" >&5 +echo "$as_me:7237: result: ********************************************************************" >&5 echo "${ECHO_T}********************************************************************" >&6 -echo "$as_me:6831: result: " >&5 +echo "$as_me:7239: result: " >&5 echo "${ECHO_T}" >&6 -echo "$as_me:6833: result: " >&5 +echo "$as_me:7241: result: " >&5 echo "${ECHO_T}" >&6 diff --git a/configure.in b/configure.in index 638c822b9..173611670 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to make a configure script dnl AC_INIT(configure.in) -AM_INIT_AUTOMAKE(Celestia, 1.1.5) +AM_INIT_AUTOMAKE(celestia, 1.1.5) AM_CONFIG_HEADER(config.h) AM_ACLOCAL_INCLUDE(macros) @@ -38,8 +38,8 @@ dnl Compilation options dnl CELESTIA_CPPFLAGS="" -CELESTIA_CFLAGS="-O2 -Wall -fomit-frame-pointer -ffast-math -fexpensive-optimizations" -CELESTIA_CXXFLAGS="-O2 -Wall -fomit-frame-pointer -ffast-math -fexpensive-optimizations" +CELESTIA_CFLAGS="-O2 -Wall -ffast-math -fexpensive-optimizations" +CELESTIA_CXXFLAGS="-O2 -Wall -ffast-math -fexpensive-optimizations" dnl CELESTIA_CFLAGS="-O2 -g -Wall" dnl CELESTIA_CXXFLAGS="-O2 -g -Wall" @@ -49,13 +49,33 @@ dnl CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -malign-loops=2 -malign-jumps dnl alpha*-*-linux-*) CELESTIA_CFLAGS="$CELESTIA_CFLAGS -mieee";; dnl esac -AC_ARG_ENABLE(debug, [ --enable-debug Produce an executable with debugging symbols], - [CELESTIA_CFLAGS="-g -Wall -DDEBUG"; CELESTIA_CXXFLAGS="-g -Wall -DDEBUG"], - [CELESTIA_CPPFLAGS="$CELESTIA_CPPFLAGS -DCELESTIA_NO_ASSERT=1"]) +AC_MSG_CHECKING([wether to include debugging code]) +AC_ARG_ENABLE(debug, [ --enable-debug Produce an executable with debugging symbols], , enable_debug="no") +if test "$enable_debug" == "yes" ; then + CELESTIA_CFLAGS="-g -Wall"; CELESTIA_CXXFLAGS="-g -Wall" + AC_DEFINE(DEBUG) +fi +AC_MSG_RESULT($enable_debug) -AC_ARG_ENABLE(pedantic, [ --enable-pedantic Enable -pedantic (and -ansi for C) when compiling], CELESTIA_CFLAGS="$CELESTIA_CFLAGS -ansi -pedantic"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -pedantic") +AC_MSG_CHECKING([wether to be pedantic]) +AC_ARG_ENABLE(pedantic, [ --enable-pedantic Enable -pedantic (and -ansi for C) when compiling], , enable_pedantic="no") +if test "$enable_pedantic" == "yes" ; then + CELESTIA_CFLAGS="$CELESTIA_CFLAGS -ansi -pedantic"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -pedantic" +fi +AC_MSG_RESULT($enable_pedantic) -AC_ARG_ENABLE(profile,[ --enable-profile Produce a profiled executable], [CELESTIA_CFLAGS="$CELESTIA_CFLAGS -pg"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -pg"]) +AC_MSG_CHECKING([wether to do profiling]) +AC_ARG_ENABLE(profile,[ --enable-profile Produce a profiled executable[default=no]], , enable_profile="no") +if test "$enable_profile" == "yes" ; then + CELESTIA_CFLAGS="$CELESTIA_CFLAGS -pg"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -pg" +else + if test "$enable_debug" != "yes" ; then + dnl must be set here instead of above because -pg and + dnl -fomit-frame-pointer are incompatible + CELESTIA_CFLAGS="$CELESTIA_CFLAGS -fomit-frame-pointer"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -fomit-frame-pointer" + fi +fi +AC_MSG_RESULT($enable_profile) dnl @@ -83,12 +103,47 @@ AC_ARG_WITH( CELESTIAFLAGS="$CELESTIAFLAGS -I$withval") +LIBS="$LIBS -lm" +dnl Check for OpenGL. Taken partly from the plib sources. +AC_CHECK_LIB(GL,glNewList) + +if test "x$ac_cv_lib_GL_glNewList" = "xno" ; then + dnl Check for MesaGL. + AC_CHECK_LIB(MesaGL, glNewList,, + AC_MSG_ERROR(GL library was not found)) +fi + +AC_CHECK_LIB(GLU,gluLookAt) + +if test "x$ac_cv_lib_GLU_gluLookAt" = "xno"; then + dnl Check for MesaGLU. + AC_CHECK_LIB(MesaGLU, gluLookAt,, + AC_MSG_ERROR(GLU library was not found)) +fi + + +dnl Check for GLUT. +AC_CHECK_LIB(glut, glutKeyboardUpFunc,, + AC_MSG_ERROR(GLUT library version >= 3.7 not found)) + + dnl Use Gtk if requested GTK_LIBS="" GTKGL_LIBS="" +GTK_CFLAGS="" -AC_ARG_ENABLE(gtk, [ --enable-gtk Use Gtk for an enhanced GUI], - enable_gtk="yes", enable_gtk="no") +AM_PATH_GTK(1.2.0,enable_gtk_default="yes",enable_gtk_default="no") +if test "$enable_gtk_default" == "yes" ; then + OLD_LIBS="$LIBS" + LIBS="$LIBS $GTK_LIBS -lGL" + AC_CHECK_LIB(gtkgl,gdk_gl_query,,enable_gtk_default="no") + LIBS="$OLD_LIBS" +fi + +AC_MSG_CHECKING([wether to use GTK.]) +AC_ARG_WITH(gtk, [ --with-gtk Use Gtk for an enhanced GUI], + enable_gtk="$withval", enable_gtk="$enable_gtk_default") +AC_MSG_RESULT($enable_gtk) if test "$enable_gtk" == "yes" ; then GNOME_INIT @@ -107,29 +162,8 @@ AM_CONDITIONAL(ENABLE_GTK, test "$enable_gtk" == "yes") CFLAGS="$CFLAGS $CELESTIAFLAGS $CELESTIA_CFLAGS $GTK_CFLAGS $GNOME_CFLAGS" CXXFLAGS="$CXXFLAGS $CELESTIAFLAGS $CELESTIA_CXXFLAGS $GTK_CFLAGS $GNOME_CFLAGS $GNOME_INCLUDEDIR" -LIBS="$LIBS $CELESTIA_LIBS $GTK_LIBS $GNOME_LIBS $GNOMEUI_LIBS $GTKGL_LIBS" - -dnl Check for OpenGL. Taken partly from the plib sources. -AC_CHECK_LIB(GL,glNewList) - -if test "x$ac_cv_lib_GL_glNewList" = "xno" ; then - dnl Check for MesaGL. - AC_CHECK_LIB(MesaGL, glNewList,, - AC_MSG_ERROR(GL library was not found)) -fi - -AC_CHECK_LIB(GLU,gluLookAt) - -if test "x$ac_cv_lib_GLU_gluLookAt" = "xno"; then - dnl Check for MesaGLU. - AC_CHECK_LIB(MesaGLU, gluLookAt,, - AC_MSG_ERROR(GLU library was not found)) -fi - - -dnl Check for GLUT. -AC_CHECK_LIB(glut, glutKeyboardUpFunc,, - AC_MSG_ERROR(GLUT library version >= 3.7 not found)) +LIBS="$LIBS $CELESTIALIBS $GTK_LIBS $GNOME_LIBS $GNOMEUI_LIBS $GTKGL_LIBS" +LDFLAGS="$LDFLAGS $GNOME_LIBDIR" dnl Check for JPEG library. AC_CHECK_LIB(jpeg, jpeg_start_decompress,, @@ -159,19 +193,22 @@ fi PKGDATADIR=`eval echo "${datadir}/$PACKAGE"` AC_DEFINE_UNQUOTED(CONFIG_DATA_DIR, "$PKGDATADIR") -AC_OUTPUT( Makefile \ - src/Makefile \ +AC_OUTPUT( Makefile \ + src/Makefile \ src/celutil/Makefile \ src/celmath/Makefile \ src/cel3ds/Makefile \ src/celtxf/Makefile \ src/celengine/Makefile \ src/celestia/Makefile \ - data/Makefile \ - textures/Makefile \ - models/Makefile \ - shaders/Makefile \ - fonts/Makefile \ + data/Makefile \ + textures/Makefile \ + models/Makefile \ + shaders/Makefile \ + fonts/Makefile \ + res/Makefile \ + macros/Makefile \ + manual/Makefile \ ) AC_MSG_RESULT() diff --git a/data/Makefile.am b/data/Makefile.am index a787e4857..e86050be6 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,4 +2,4 @@ pkgdatadir = $(datadir)/@PACKAGE@/data pkgdata_DATA = $(wildcard *.ssc) $(wildcard *.dat) -DIST = $(pkgdata_DATA) +EXTRA_DIST = $(pkgdata_DATA) diff --git a/devguide.txt b/devguide.txt index e2835bd0d..d3e64781a 100644 --- a/devguide.txt +++ b/devguide.txt @@ -132,18 +132,11 @@ File Overview * texfont.cpp Mark J. Kilgard's texture font package -* rng.cpp -* gui.cpp - These aren't used any more . . . gui.cpp should be removed. - -* slurp.c -* startest.cpp -* packnames.cpp -* packdb.cpp -* readstars.cpp - Miscellaneous test code and small programs used to munge the HIPPARCOS data - set into a star database. +* buildstardb.cpp + The program used to munge the HIPPARCOS data set into x the star database. +* starcat.c + A utility program to show some stuff about some of the HIPPARCOS stars. The Star Database diff --git a/fonts/Makefile.am b/fonts/Makefile.am index 520e9b4d2..23a5d4327 100644 --- a/fonts/Makefile.am +++ b/fonts/Makefile.am @@ -2,4 +2,4 @@ pkgdatadir = $(datadir)/@PACKAGE@/fonts pkgdata_DATA = $(wildcard *.txf) -DIST = $(pkgdata_DATA) +EXTRA_DIST = $(pkgdata_DATA) diff --git a/macros/ChangeLog b/macros/ChangeLog new file mode 100644 index 000000000..83a85565c --- /dev/null +++ b/macros/ChangeLog @@ -0,0 +1,1102 @@ +2001-12-18 Deon Ramsey + + * Imported macros package from gnome-core-1.4.0.4 package + +2001-04-16 Jaka Mocnik + + * gnome-print-check.m4: change $(cmd) to `cmd` in order to make it + usable in non-bash bourne shells. + +2001-03-01 JP Rosevear + + * gnome-pilot.m4: quote a test and make sure incdir is always set + so 'cat' works + +2001-02-21 Lauris Kaplinski + + * gnome-print-check.m4: Replaced the awk alchemy with sed alchemy. + I seems to work now as long as gnome-config is working - but that is + the whole point of gnome-config, isn't it? + +2001-02-19 JP Rosevear + + * gnome-pilot.m4: Revert my previous patch now that gnome-pim and + evolution are fixed to accomodate the change + +2001-02-19 JP Rosevear + + * gnome-pilot.m4: AC_SUBST the PISOCK_LIBDIR var + +2001-02-17 Lauris Kaplinski + + * gnome-print-check.m4: Remove most of stuff here, but now + it at least WORKS + +2001-02-07 Kenneth Christiansen + + * autogen.sh: Added test for xml-i18n-tools if + AM_PROG_XML_I18N_TOOLS is found. + +2001-01-05 Maciej Stachowiak + + * autogen.sh: Added missing PROG. + +2001-01-05 Maciej Stachowiak + + * autogen.sh: xml-i18n-toolize if AM_PROG_XML_I18N_TOOLS is found + in configure.in. + +2000-11-05 Martin Baulig + + * gnome-bonobo-check.m4 (BONOBO_CFLAGS, BONOBO_LIBS): Added + stuff for `bonobox'. + +2000-08-01 Pavel Roskin + + * curses.m4: AC_WARN replaced with AC_MSG_WARN in comments + +2000-06-23 Stanislav Brabec + + * gnome-pilot.m4: Use 'PISOCK_INCLUDEDIR' in pisock version check. + +2000-06-17 Dan Winship + + * autogen.sh: exit immediately if aclocal, autoheader, automake, + or autoconf fails, rather than continuing on with broken state. + (In the aclocal case, print a hopefully-useful explanatory + message.) + +2000-06-13 Martin Baulig + + * gnome-bonobo-check.am (AM_BONOBO_USES_OAF): New macro. + Checks whether Bonobo uses OAF and defines `BONOBO_USES_OAF' + if appropriate. Also provides `BONOBO_USES_OAF' automake + conditional. + +2000-06-13 Martin Baulig + + * Makefile.am (EXTRA_DIST): Added `gnome-gettext.m4'. + (gnome_aclocal_DATA): Added `gnome-gettext.m4'. + +2000-05-29 Martin Baulig + + * gnome-autogen.sh: Moved to the `bin/' directory. + +2000-05-29 Martin Baulig + + * gnome-autogen.sh: If `USE_GNOME_2_MACROS' is set, use the + GNOME 2.0 macros from the `macros2' directory. + +2000-05-29 Martin Baulig + + * gnome-common.m4, Makefile.am: Install macros to + `$(datadir)/aclocal/gnome-macros' when INSIDE_GNOME_COMMON. + + * gnome-autogen.sh: New file. When using gnome-common instead + of the macros/ directory, use this in your autogen.sh. + +2000-05-15 Russell Steinthal + + * gnome-pilot.m4 (PILOT_LIBS): An attempt to fix the gnome-pilot + check on Solaris (`$GNOME_CONFIG ...` returns more than one word, + so we need quotes around it to keep test from bombing out) + +2000-05-01 Dan Winship + + * gnome-pilot.m4 (PILOT_LIBS): "But that trick NEVER works!" + "This time for sure!" + +Sun Apr 23 12:15:14 2000 George Lebl + + * gnome.m4: add an extra lib of docklets. These checks are + braindamaged though, they don't fail and thus gnome-core for + example compiles without gnomecc. There need to be separate .m4 + files or checks + +2000-04-19 Eskil Heyn Olsen + + * gnome-pilot.m4 (PILOT_LIBS): Changed the error string for gnome-pilot + (PILOT_LIBS): Fixes the gnome-config check + +2000-04-10 Dan Winship + + * gnome-pilot.m4 (PILOT_LIBS): Fix a bug introduced in the + gnome-pilot-config to "gnome-config gpilot" change that caused not + having pilot-link installed to become a fatal error. + +2000-02-26 James Henstridge + + * gnome-gettext.m4: fix up check of LINGUAS variable so that we don't + get problems when LINGUAS contains `en' and ALL_LINGUAS contains + `en_GB' for instance. + +2000-02-22 Martin Baulig + + * autogen.sh: Don't run libtoolize when `NO_LIBTOOLIZE' is set. + +2000-02-09 Raja R Harinath + + * autogen.sh: Fix GNUism introduced in the previous fix. + +2000-02-08 Miguel de Icaza + + * autogen.sh: Handle non GNU find programs. + +2000-02-05 Martin Baulig + + * gnome-libgtop-types.m4 (AC_LIBGTOP_CHECK_TYPE): New macro. This + is an improved version of AC_CHECK_TYPE which takes into account + that we need to #include some other header files on some systems + to get some types. + (GNOME_LIBGTOP_TYPES): Check for for Tru64 and + use AC_LIBGTOP_CHECK_TYPE rather than AC_CHECK_TYPE. + +2000-01-26 Dave Camp + + * gnome-bonobo-check.m4 Include rather than + + +2000-01-26 Dave Camp + + * gnome-bonobo-check.m4: Check for bonobo_object_get_type() rather + than gnome_object_get_type(). + +2000-01-23 Peter Teichman + + * gnome-pilot.m4: i broke the version-checking macro for other + distribs in my last commit. fixing that now. + +2000-01-22 Peter Teichman + + * gnome-pilot.m4 (PILOT_LIBS): fix the version-checking macro for + debian + +2000-01-20 Raja R Harinath + + * gnome-objc-checks.m4: Look for sched_yield in -lrt, too. + Suggested by Drazen Kazar . + +2000-01-16 Vadim Strizhevsky + + * gnome-pilot.m4: Fix typo in PILOT_LINK_HOOK. + +2000-01-15 Eskil Heyn Olsen + + * gnome-pilot.m4: PILOT_LINK_HOOK now check pilot-link version. + GNOME_PILOT_CHECK defaults to requiring 0.9.3. + +2000-01-09 Martin Baulig + + * gnome-libgtop-check.m4: Applied patch from R. Bernstein + - print a better error message when + LibGTop's major version number mismatches. + +1999-12-25 Martin Baulig + + * gnome-pilot.m4: Applied patch from Colin Walters to make + it compile under Debian GNU/Linux. + +1999-12-05 Martin Baulig + + * gnome-libgtop-checks.m4: Removed all guile variables. + +1999-11-18 Jeff Garzik + + * gnome-xml-check.m4: Better scoping of below fix. + +1999-11-16 Jeff Garzik + + * gnome-xml-check.m4: always AC_SUBST GNOME_XML_LIB, so that + output variable will always be present. + +1999-11-09 Eskil Heyn Olsen + + * gnome-pilot.m4: uses test -r instead of test -e, was reported as + a portability bug wrt solaris. + +1999-10-31 Eskil Heyn Olsen + + * gnome-pilot.m4: added PILOT_LINK_CHECK, used by + GNOME_PILOT_CHECK. Adds --with-pisock=$dir_for_pilot_link. + +1999-10-24 Jacob Berkman + + * gnome-ghttp-check.m4: this should be a better fix + +1999-10-21 Jacob Berkman + + * gnome-ghttp-check.m4: use a temp value until we know that + ghttp exists. This will hopefully fix building on Solaris + machines + +1999-09-26 Jody Goldberg + + * compiler-flags.m4 : Remove -Wpointer-arith. It generates large + numbers of warnings under glibc2.1.2 with a recent egcs release. + The glibc maintainers have suggested removing this flag because it + is useless. + +1999-09-01 Havoc Pennington + + * gnome-xml-check.m4: If you're going to AC_PATH_PROG then use the + prog you find :-) + +1999-08-02 Peter Teichman + + * removed gnome-conduit-check.m4 - it should be distributed with + gnome-pilot + +1999-07-30 Peter Teichman + + * gnome-conduit-check.m4: added new file of checks. anything that + provides a pilot conduit is going to want this + +1999-07-07 Tuomas J. Lukka + * gnome-x-checks.m4: add a comment on how to get gtk-1.3 and + glib 1.3 from CVS + +1999-07-06 Tuomas J. Lukka + + * gnome-x-checks.m4: forbid compiling with Gtk-1.3 for now. + gnome only works with 1.2 so far. + +1999-07-05 Raja R Harinath + + * gnome.m4: Make "extra library" message slightly easier to read. + +Sat Jun 26 01:47:53 1999 Tim Janik + + * compiler-flags.m4: give -Wunused to gcc instead of -Wno-unused. + +1999-06-11 Tuomas J. Lukka + + * gnome-guile-checks.m4: Debian has qt_null in -lqthreads but + no main. Changed both checks for 'main' to qt_null. + I hope this is correct - it shouldn't break anything. + +1999-05-11 Raja R Harinath + + * Makefile.am (MACROS): Add `gnome-bonobo-check.m4'. + +1999-05-09 Jacob Berkman + + * gnome-bonobo-check.m4: made test program return 0, + changed BONOBO_CHECK to not return "failure" on success + +1999-04-16 Raja R Harinath + + * gnome-print-check.m4 (GNOME_PRINT_CHECK): Fix invocation of + AM_PATH_GNOME_PRINT. + * Makefile.am (MACROS): Sort lines. + +Sun Mar 28 23:39:48 1999 Norbert Warmuth + + * gnome-vfs.m4: Add --with-vfs option. GNOME_VFS_LIBS still needs + to be fixed but that's not a problem because there's no libvfs, yet. + +1999-03-10 Tomislav Vujec + + * aclocal-include.m4 (AM_ACLOCAL_INCLUDE): Add ACLOCAL_FLAGS in + ACLOCAL. This allows maintainer rules to work if any of the macros + change. + +1999-03-10 Tomislav Vujec + + * gnome.m4 (GNOME_INIT_HOOK): Wrapped position parameter in + testing for additional inits. It gets expanded while generating + configure, resulting in an empty parameter list - syntax error in + for statement. + +1999-03-09 Raja R Harinath + + * gnome.m4 (GNOME_INIT): Add a new paramater, which is passed to + GNOME_INIT_HOOK. + (GNOME_INIT_HOOK): New parameter "additional inits". This is a + list like "applets capplet", and the corresponding + GNOME_APPLETS_LIBS and GNOME_CAPPLETS_LIBS are defined. + +1998-03-01 Mark Crichton + + * gnome-objc-checks : Added HAVE_GNOME_OBJC conditional + +1998-02-27 Gregory McLean + + * gnome-x-checks.m4 : Require at least gtk+ 1.2 (pointless getting + bug reports with an old glib/gtk/gdk set..) + +1999-02-25 Martin Baulig + + * gnome-libgtop-checks.m4: Require LibGTop >= 1.0.0. + +1999-02-22 Miguel de Icaza + + * compiler-flags.m4: Only add the compilation warnings if the + compiler is GCC. + +1999-02-20 Timur Bakeyev + + * gnome.m4: Added and exported ZVT_LIBS. + +Tue Feb 16 19:35:42 1999 Owen Taylor + + * gnome-x-checks.m4: Require GTK+-1.1.16. + +1999-02-15 Timur Bakeyev + + * gnome-gettext.m4: Work around a bug in BSDI's native sh, which in- + correctly expands ${LINGUAS=$ALL_LINGUAS}. Switched to if/fi variant. + +1999-02-15 Chris Lahey + + * gnome-print-check.m4: Copied this from libhnj/libhnj.m4. Almost + completely replaced the old version. The only usage difference is + that it defines GNOME_PRINT_LIBS instead of GNOME_PRINT_LIB and + defines GNOME_PRINT_CFLAGS as well. + +1999-02-10 Martin Baulig + + * gnome-objc-checks.m4: Applied a patch from Kenneth Stailey; + use $CFLAGS when invoking $OBJC so the user can add additional + include paths. + +1999-02-05 Martin Baulig + + * compiler-flags.m4: Don't add warning and compiler flags to + the CFLAGS and CXXFLAGS when they're cached. This fixes the + problem that CFLAGS and CXXFLAGS get longer and longer each + time you run a `config.status --recheck'. + +1999-02-04 Martin Baulig + + * aclocal-include.m4 (INSIDE_GNOME_COMMON): New automake + conditional that's always false. + + * gnome-common.m4: New file. This defines a `GNOME_COMMON_INIT' + macro that should be used in all GNOME Applications outside + the CVS tree. + + * Makefile.am: If we are `INSIDE_GNOME_COMMON', install all + $(MACROS), autogen.sh, gnome-common.m4 and a newly created + gnome-macros.dep in `$(datadir)/aclocal/gnome'. + +1999-01-24 Timur Bakeyev + + * gnome-pthread-check.m4: Add recognition of 2 more libraries - + pthreads and pthread-support build in libc (as on BSDI). + +1999-01-23 Martin Baulig + + * gnome-libgtop-checks.m4 (GNOME_LIBGTOP_DOCU): New macro. This + checks whether you have the LibGTop documentation installed and + defines `HAVE_LIBGTOP_DOCU' if appropriate. Also provides automake + conditional. + +1999-01-20 Martin Baulig + + * acinclude.m4 (ac_result): Unset CATOBJEXT so + that the macros and Makefiles correctly handle + disabling NLS when no gettext is found. + +1999-01-19 Raja R Harinath + + * gnome-cxx-check.m4 (GNOME_CHECK_CXX): Rewrite to be saner. + Don't limit yourself to a fixed set of names for the compiler. + +1999-01-06 Nat Friedman + + * Makefile.am (MACROS): Added gnome-print-check.m4 to MACROS + +1999-01-05 Raja R Harinath + + * gnome-support.m4: Include dirent.h before checking whether + `scandir' needs to be declared. + * need-declaration.m4: Revert change. + +1999-01-05 Miguel de Icaza + + * need-declaration.m4, gnome-support.m4: Fixed the scandir detection. + +1998-12-22 Jeff Garzik + + * gnome.m4: Added and exported GNOME_APPLET_LIBS. + +1998-12-16 Sebastian Wilhelmi + + * gnome-support.m4: Removed all the stuff for argp, that was + causing gnomesupport not to build. + +1998-12-15 Martin Baulig + + * gnome-gettext.m4: Add the hacked version of the gettext + macros that is used in Gtk+ here. + + * autogen.sh: Accept both AM_GNU_GETTEXT and AM_GNOME_GETTEXT. + +1998-12-15 Martin Baulig + + * gnome-libgtop-check.m4: All parts of GNOME will now require + LibGTop >= 0.99.0 which is the latest version from CVS and + already feature-freezed for GNOME 1.0. + +1998-12-09 Martin Baulig + + * aclocal-include.m4 (AM_ACLOCAL_INCLUDE): Make this work + with more than one directory. + +1998-12-08 Martin Baulig + + * gnome-libgtop-sysdeps.m4: Moved into the LibGTop module. + This file contains too much stuff that should only be used + internally in LibGTop, so it's better to have it there. + +1998-12-06 Martin Baulig + + * gnome-libgtop-sysdeps.m4: Recognice OpenBSD as a valid + system and use the `freebsd' sysdeps directory for it. + +Sat Dec 5 23:30:01 PST 1998 Manish Singh + + * gnome-guile-checks.m4: clear GUILE_LIBS and GUILE_INCS if + guile isn't there (quick fix) + +1998-12-05 Martin Baulig + + * gnome-libgtop-sysdeps.m4: Recognice NetBSD as a valid + system and use the `freebsd' sysdeps directory for it. + +1998-12-03 Martin Baulig + + * gnome-libgtop-sysdeps.m4 (GLIBTOP_LINUX_VERSION_CODE): + Define this to be the same as LINUX_VERSION_CODE either from + or from the running kernel. + +1998-12-02 Raja R Harinath + + * autogen.sh: "Improve" indentation and messages somewhat. + +1998-12-01 Jeff Garzik + + * autogen.sh: + Platform fixes. grep -q is not portable, do not use. + +1998-12-01 Changwoo Ryu + + * autogen.sh: Run gettextize if needed. + : Run libtoolize only if configure.in has "^AM_PROG_LIBTOOL". + +1998-11-30 Jeff Garzik + + * gnome.m4: Re-arranged tests such that "--without-gnome" is + fully supported. Not only is the logic now correct, programs + can test "want_gnome=yes/no" for the results of this arg. + +1998-11-27 Martin Baulig + + * gnome-libgtop-check.m4: All parts of GNOME will now require + LibGTop >= 0.29.0 which is the latest version from CVS. + +1998-11-20 James Henstridge + + * gnome.m4(GNOME_INIT_HOOK): Changed the call to GNOME_GNORBA_CHECK + to GNOME_GNORBA_HOOK([],$2). Before if you specified that the + macro should not exit on errors, and you didn't have ORBit, the + script would fail anyway. + +1998-11-17 Martin Baulig + + * gnome-libgtop-sysdeps.m4: We need to check for + and conditionally include it before in the code + that check for I4B to make it work on FreeBSD 3.0. + +1998-10-25 Marius Vollmer + + * gnome-guile-checks.m4: Add GUILE_LIBS to LIBS when checking + whether guile works. Adding them to LDFLAGS does not work on all + systems. (Thanks to Rusty Chris Holleman) + +1998-11-12 Andrew T. Veliath + + * gnome-orbit-check.m4: Remove AC_DEFINE(HAVE_ORBIT). Add + AM_CONDITIONAL for HAVE_ORBIT. gnome-gnorba-check.m4: Same with + HAVE_GNORBA. Change GNOME_ORBIT_HOOK and GNOME_GNORBA_HOOK to use + AC_CACHE_CHECK, setting both gnome_cv_orbit_found and + gnome_cv_gnorba_found. + + * gnome.m4: (GNOME_INIT_HOOK): Add GNOME_GNORBA_CHECK if + gnome-config is found. New GNOMEGNORBA_LIBS library variable + (GNOMEGNORBA_LIBS is a superset of GNOMEUI_LIBS). Update + GNOME_LIBDIR and GNOME_INCLUDEDIR to to include the required + Gnorba info, if it is in a different location. + + * Makefile.am (MACROS): Add gnome-gnorba-check.m4 to Makefile. + + * gnome-gnorba-check.m4: New file. + +1998-11-12 Raja R Harinath + + * gnome-support.m4 (vsnprintf): Remove easy-vsnprintf hack -- it + doesn't work for Solaris 2.5 binaries running on Solaris 2.6. + From Frederic Devernay . + +1998-11-06 Raja R Harinath + + * gnome-support.m4: Fix stupid type (sterror_r -> strerror_r). + +1998-11-04 Raja R Harinath + + * gnome-support.m4 (need_gnome_support): Set this unconditionally + to `yes'. We'll soon be losing this variable. + +1998-10-20 Andrew Veliath + + * gnome-orbit-check.m4 (GNOME_ORBIT_HOOK): Add ORBIT_IDL + detection; fix failure flag. + +1998-10-12 Martin Baulig + + * compiler-flags.m4 (warnCFLAGS): Added `-Wno-unused'. + +1998-10-11 Martin Baulig + + * gnome-libgtop-sysdeps.m4 (libgtop_postinstall): Use `:' instead + of the empty string if there is nothing to do since the empty string + is no valid shell sytax. + +1998-10-11 Marius Vollmer + + * gnome-guile-checks.m4: Check for "guile-config" and then for + "build-guile", if guile-config couldn't be found. Do not + explicitely include output from "info libdir", it is already + included in "link". Use "compile" instead of "info includedir". Do + not include "1.2" in error message when Guile can't be found at + all. + +1998-10-11 Martin Baulig + + * gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): Added optional + third parameter which is the `script-if-enabled' parameter of + the GNOME_LIBGTOP_HOOOK. + +1998-10-05 Karl Eichwalder + + * gnome-xml-check.m4: Fix typo while signaling the error. + +1998-10-05 Raja R Harinath + + * compiler-flags.m4 (warnCFLAGS): Remove `-W'. + (warn-unused): Remove. + +1998-10-01 Martin Baulig + + * gnome-libgtop-sysdeps.m4 (libgtop_postinstall): + Added `AC_SUBST(libgtop_postinstall)'. This is used in + `src/daemon/Makefile.am' to make the server suid root or + sgid kmem if required. + +1998-09-28 Martin Baulig + + * gnome-libgtop-check.m4: Make it accept libgtop >= 0.25.0 again. + + * gnome-libgtop-sysdeps.m4: Make the default not to build the + LibGTop examples. + + * compiler-flags.m4 (--enable-warn-unused): New configure parameter + to add `-Wunused' to the warning flags. + +1998-09-27 Martin Baulig + + * gnome-libgtop-check.m4: Make it require libgtop >= 0.26.2. + +1998-09-24 Raja R Harinath + + * gnome-ghttp-check.m4: Add checks for -lsocket -lnsl. + +1998-09-18 Raja R Harinath + + * gnome-support.m4: Remove commented out code. + +1998-09-12 Martin Baulig + + * gnome-libgtop-sysdeps.m4: Added (AC_SUBST): `libgtop_have_sysinfo'. + +1998-09-09 Martin Baulig + + * gnome-libgtop-sysdeps.m4: Added check for SMP support. + (--with-libgtop-smp): New parameter, default is to enable + it only if you're running configure on a SMP system. + Added (AC_DEFINE): `HAVE_LIBGTOP_SMP' if enabled. + (LIBGTOP_SMP): New automake conditional. + +1998-09-02 Raja R Harinath + + * gnome-support.m4: Remove check for `canonicalize_file_name'. + +1998-09-02 Martin Baulig + + * gnome-support.m4: Check for canonicalize_file_name () and + realpath () and add `canonicalize.o' to LIBOBJS if required. + +1998-08-30 Martin Baulig + + * gnome-libgtop-check.m4: Added (AC_SUBST): `LIBGTOP_VERSION_CODE'. + Added (AC_DEFINE_UNQUOTED): `LIBGTOP_VERSION', `LIBGTOP_VERSION_CODE', + `LIBGTOP_{MAJOR,MINOR,MICRO,SERVER}_VERSION'. + +1998-08-29 Martin Baulig + + * gnome-libgtop-check.m4: Make it require libgtop >= 0.26.0. + Added (AC_SUBST): `LIBGTOP_INTERFACE_AGE' and `LIBGTOP_BINARY_AGE'. + +1998-08-27 Christopher Blizzard + + * gnome-ghttp-check.m4: Umm...I think this works better. Doesn't + break anything anyway. + Oooo...it actually works now. Forgot a , + +1998-08-26 Martin Baulig + + * gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): Make it work + with a brain-dead /bin/sh and a brain-dead /bin/test. + + * gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): Use `AC_MSG_WARN' + if LibGTop cannot be found and the `fail' argument is not given. + +1998-08-24 Martin Baulig + + * gnome-support.m4 (GCC_NEED_DECLARATIONS): Added `setreuid', + `setregid' and `getpagesize'. + (AC_TYPE_UID_T): New check. + +1998-08-24 Christopher Blizzard + + * Makefile.am (MACROS): Add gnome-ghttp-check.m4 to the Makefile. + +1998-08-23 Martin Baulig + + * gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): You can give + this macro two parameters: the required version number and + an optional `fail' argument to make it fail if LibGTop is + not found. + +1998-08-22 Martin Baulig + + * gnome-guile-checks.m4: Added check for `-lnsl' and `-lsocket' + if `build-guile' cannot be found. + +1998-08-20 Raja R Harinath + + * compiler-flags.m4: New file. Defines the + GNOME_COMPILER_WARNINGS macro. + * autogen.sh (conf_flags): Add `--enable-compile-warnings' to list + of flags passed to `configure'. + * Makefile.am (MACROS): Add compiler-flags.m4. + +1998-08-18 Martin Baulig + + * gnome-libgtop-check.m4: make it require libgtop >= 0.25.0. + Added (AC_SUBST): `LIBGTOP_MICRO_VERSION' and `LIBGTOP_EXTRA_LIBS'. + +1998-08-17 Martin Baulig + + * gnome-libgtop-check.m4: Completely rewrote this file. It + uses now the `libgtop-config' script and also checks for + correct libgtop version. + +1998-08-06 Martin Baulig + + * gnome-libgtop-sysdeps.m4: Added `freebsd' directory. + +1998-08-04 Raja R Harinath + + * gnome-x-checks.m4: Define USE_DEVGTK unconditionally to `true'. + +1998-08-04 Stuart Parmenter + + * gnome-x-checks.m4: (AM_PATH_GTK) make it require GTK >= 1.1.1 + dnl'd the dev_gtk since they will have to anyways. + +1998-08-04 Sebastian Wilhelmi + + * gnome.m4: (GNOME_INIT_HOOK): Call $1 also, if `gnome-config' is + found and used + +1998-08-02 Raja R Harinath + + * gnome.m4 (GNOME_CONFIG): Use the `gnome-config' program if it + exists. + +1998-08-01 Raja R Harinath + + * Makefile.am (EXTRA_DIST): Remove `macros.dep'. + +1998-07-30 Martin Baulig + + * gnome-libgtop-check.m4 (GNOME_LIBGTOP_TYPES): New macro. + Checks for `u_int64_t' and `int64_t'. + +1998-07-29 Martin Baulig + + * gnome-libgtop-check.m4: Added (AC_SUBST): + `LIBGTOP_NAMES_LIBS', `LIBGTOP_NAMES_INCS', + `LIBGTOP_GUILE_LIBS', `LIBGTOP_GUILE_NAMES_LIBS', + `LIBGTOP_MAJOR_VERSION', `LIBGTOP_MINOR_VERSION', + `LIBGTOP_VERSION'. + + * gnome-libgtop-sysdeps.m4 (libgtop_sysdeps_dir): + Added `AC_SUBST(libgtop_sysdeps_dir)'. + +1998-07-29 Raja R Harinath + + * gnome-support.m4: Check for functions that `error.c' looks for. + +1998-07-29 Martin Baulig + + * gnome-fileutils.m4 (AM_FUNC_ERROR_AT_LINE): Removed. + + * gnome-support.m4 (AM_FUNC_ERROR_AT_LINE): New check. + +1998-07-27 Federico Mena Quintero + + * gnome-x-checks.m4: Changed Gtk version test to use + GTK_HAVE_FEATURES_1_1_0. + +Sun Jul 26 13:59:53 EDT 1998 Daniel Veillard + + * Makefile.am (MACROS): Added gnome-xml-check.m4 + * gnome-xml-check.m4: New file. + +1998-07-24 Martin Baulig + + * gnome-libgtop-check.m4: No longer requiring + `GNOME_LIBGTOP_SYSDEPS'. + +Fri Jul 24 00:45:38 1998 Tom Tromey + + * Makefile.am (MACROS): Added linger.m4. + * linger.m4: New file. + +Thu Jul 23 22:41:23 1998 Tom Tromey + + * Makefile.am (MACROS): Added gnome-undelfs.m4, gnome-vfs.m4. + * gnome-undelfs.m4: New file. + * gnome-vfs.m4: New file. + +1998-07-22 Martin Baulig + + * gnome-fileutils.m4: Added some reasonable defaults to allow + cross compiling; removed `mountlist.o' and `fsusage.o' from + LIBOBJS. + +Tue Jul 21 23:44:53 1998 Tom Tromey + + * gnome-guile-checks.m4: If no build-guile, link against readline + before termcap. + +1998-07-15 Raja R Harinath + + * Makefile.am (MACROS): Add `need-declaration.m4'. + + * gnome-support.m4 (AC_REPLACE_FUNCS): Add memmove, strtod, + strtol, strtoul. + (GCC_NEED_DECLARATIONS): New check. Check whether `gethostname' + needs to be declared. + + * need-declaration.m4: New file. Stolen from EGCS. + +1998-07-13 Raja R Harinath + + * gnome-support.m4 (AC_REPLACE_FUNCS): Add check for `mkstemp'. + +Wed Jul 1 13:50:39 1998 Scott D. Heavner + + * curses.m4: add some docs and start using with tcd + +1998-06-29 Raja R Harinath + + * Makefile.am (MACROS): Add all the `.m4' files here. + +Mon Jun 29 11:12:04 1998 Scott D. Heavner + + * curses.m4: Need AC_SUBST(CURSES_INCLUDEDIR) not CURSES_INCLUDES + +Mon Jun 29 10:35:22 1998 Scott D. Heavner + + * curses.m4: rm conftext* should read rm conftest*, was leaving + conftest.c files around. + +1998-06-27 Christopher Blizzard + + * gnome-objc-checks.m4: Use egcs if it's available. The gcc that + ships with RedHat 5.1 doesn't do objc, egcs does. + +Fri Jun 26 14:36:08 1998 Scott D. Heavner + + * curses.m4 (AC_CHECK_CURSES): New check. mangled out of mc's + configure.in + +1998-06-24 Raja R Harinath + + * gnome-fileutils.m4 (AM_FUNC_ERROR_AT_LINE): New check. + (vprintf): New check. + (ftruncate.c): Remove check. + This needs to be further cleaned up to only list what is + needed for gdiskfree. + * Makefile.am (MACROS): Add gnome-fileutils.m4. + +1998-06-14 Martin Baulig + + * gnome-libgtop-sysdeps.m4 (LINUX_TABLE): New automake conditional; + also defines HAVE_LINUX_TABLE. + +1998-06-13 Martin Baulig + + * gnome-libgtop-sysdeps.m4: Added check for the table () + system call in the linux kernel. + +1998-06-11 Raja R Harinath + + * gnome-x-checks.m4 (USE_DEVGTK): Use AC_EGREP_CPP rather than + AC_CHECK_HEADER. AC_CHECK_HEADER is fooled by warnings. + + * gnome-support.m4 (AC_PROG_AWK): Look for awk. + (CROSS_COMPILING): Remove conditional. + +Wed Jun 10 14:19:39 EDT 1998 Gregory McLean + + * gnome-x-checks.m4: More tweeks to make building against gtk 1.0 + and gtk1.1 less painful. + +1998-06-08 Martin Baulig + + * gnome-support.m4 (CROSS_COMPILING): New automake conditional; + (need_gnome_support): added `AC_SUBST(need_gnome_support)'. + +1998-06-07 Martin Baulig + + * gnome-guile-checks.m4 (GNOME_CHECK_GUILE): When + cross-compiling, we now check for `$host_alias-buile-guile'. + +1998-06-03 Martin Baulig + + * gnome-guile-checks.m4 (GNOME_CHECK_GUILE): Looks also + in $GNOME_LIBDIR; added failflag: GNOME_CHECK_GUILE(fail) + will abort if guile cannot be found. + +1998-05-23 Martin Baulig + + * gnome-libgtop-sysdeps.m4 (GNOME_LIBGTOP_HOOK): + (libgtop_use_machine_h): Set this to true on SunOS. + +1998-05-22 Martin Baulig + + * gnome-fileutils.m4 (GNOME_FILEUTILS_CHECKS): New file. + Imported from `configure.in' in GNU fileutils 3.16. It does + all the checks that are needed for the diskusage applet. + +1998-05-22 Martin Baulig + + * gnome-libgtop-check.m4 (GNOME_LIBGTOP_HOOK): New file. + Checks whether libgtop is installed and reads its `libgtopConf.sh' + file if it can be found. Defines HAVE_LIBGTOP on success and + provides HAVE_LIBGTOP automake conditional. + +1998-05-21 Martin Baulig + + * gnome-libgtop-sysdeps.m4 (GNOME_LIBGTOP_SYSDEPS): New file. + (libgtop_sysdeps_dir): sysdeps directory libgtop uses. + (libgtop_use_machine_h): define HAVE_GLIBTOP_MACHINE_H if this + is `yes'. + (libgtop_need_server): we only need the libgtop server, when + this has a value of `yes'. Defines NEED_LIBGTOP and NEED_LIBGTOP + automake conditional. + +1998-05-19 Raja R Harinath + + * gnome-support.m4 (strerror): New check. + (sys_errlist): Check for this variable, needed for `strerror'. + (program_invocation_name, program_invocation_short_name): Change + method used to check for these. + +1998-05-09 Raja R Harinath + + * autogen.sh: Remove simple-minded check for `gtk+'. + +Fri Apr 24 16:43:38 1998 Owen Taylor + + * autogen.sh: Pass the results of the environment variable + ACLOCAL_FLAGS to aclocal. This allows, for instance, + + ACLOCAL_FLAGS="-I /home/owen/share/aclocal/" autogen.sh + +Sun Apr 19 01:35:53 EDT 1998 Gregory McLean + + * gnome-x-checks.m4: Updated the gtk check to check for 1.0.0. + +1998-04-08 Raja R Harinath + + * autogen.sh: Update to list newer versions of packages. + * gnome-support.m4: Add `scandir' to AC_REPLACE_FUNCS. + Also run AC_HEADER_DIRENT. + +1998-03-31 Raja R Harinath + + * gnome-support.m4 (AC_REPLACE_FUNCS): Look for vasprintf. + +Thu Mar 19 23:23:30 1998 Tom Tromey + + * gnome.m4: An empty true branch of an `if' statement is not valid + sh syntax. If GNOME_INIT_HOOK argument $1 is empty, use ":" + instead. + +1998-03-19 Miguel de Icaza + + * gnome.m4 (GNOME_INIT_HOOK): Provide a way to hook some code to + execute; Accept a probe mode. + + (GNOME_INIT): Define in terms of GNOME_INIT_HOOK. + +Thu Mar 19 00:17:46 1998 Tom Tromey + + * gnome-support.m4: Cache results of check for + program_invocation_short_name, program_invocation_name. Check to + make sure argp functions are in a library. + + * gnome-support.m4: Cache results of argp check. + +Sun Mar 15 15:54:43 1998 Owen Taylor + + * gnome-x-checks.m4: Replaced checks for X and GTK + with AM_PATH_GTK. x_include, X_LIBS, etc, variables no longer + defined. + +1998-03-12 Raja R Harinath + + * gnome-support.m4: Add a check for -- this enables + some optimizations when compiling `argp'. + +Mon Mar 9 19:32:42 1998 Tom Tromey + + * gnome-support.m4: Build vsnprintf.o, not vsnprint.o. + +1998-03-09 Raja R Harinath + + * gnome-support.m4: Add check for `vsnprintf'. + +Sun Mar 8 17:04:28 1998 Tom Tromey + + * gnome-support.m4: Set need_gnome_support shell variable. Define + BUILD_GNOME_SUPPORT automake conditional. Define LTLIBOBJS. Look + for argp_domain element in struct argp. + +Sat Mar 7 00:04:22 1998 Tom Tromey + + * gnome-support.m4 (GNOME_SUPPORT_CHECKS): Add argp-pvh.o to + LIBOBJS. + + * gnome-support.m4 (GNOME_SUPPORT_CHECKS): Check for strnlen(). + +Wed Mar 4 01:02:55 1998 Tom Tromey + + * gnome-support.m4 (GNOME_SUPPORT_CHECKS): Check for argp code, + strndup, program_invocation_name, program_invocation_short_name. + +Mon Mar 2 15:27:44 1998 Tom Tromey + + * gnome-x-checks.m4 (GNOME_X_CHECKS): Also check for SMlib.h; some + Solaris systems have -lSM but not SMlib.h. + +Sun Mar 1 17:49:42 1998 Tom Tromey + + * gnome.m4 (GNOME_INIT): Changed spacing so --help output looks + right. + +Fri Feb 27 10:05:34 1998 Tom Tromey + + * gnome-objc-checks.m4 (GNOME_CHECK_OBJC): Set OBJECTIVE_C shell + variable. + +1998-02-26 Raja R Harinath + + * gnome-x-checks.m4 (CPPFLAGS): Put $X_CFLAGS here, not in + $CFLAGS. + (GNOME_HAVE_SM): New var. `true' if we have libSM, `false' + otherwise. + +1998-02-19 Raja R Harinath + + * gnome.m4: Remove `GNOME_CHECK_GNOME'. + +1998-02-18 Raja R Harinath + + * gnome-support.m4 (GNOME_SUPPORT_CHECKS): Replace `strcasecmp' if + necessary. + +1998-02-15 Raja R Harinath + + * Makefile.am (MACROS): Add `gnome-pthread-check.m4'. + * gnome-pthread-check.m4: New file. Moved pthread check from + gnome-x-checks.m4 to here. + * gnome-objc-checks.m4: Use `gnome-pthread-check'. + (OBJC_LIBS): New config var. + * gnome-x-checks.m4: Add `AC_DEFINE(HAVE_LIBSM)' if `-lSM' is + already part of `$x_libs'. + Move pthread check to new file. + +Sat Feb 14 12:45:35 1998 Tom Tromey + + * Makefile.am (macros.dep): Use single quotes, not double quotes. + Otherwise bash will interpret `$(...)' incorrectly. + (EXTRA_DIST): Include macros.dep in distribution. + +1998-02-14 Raja R Harinath + + * Makefile.am (macros.dep): Put back doubled `$'. We want the + expansion to occur in the including Makefile, not here. + Otherwise, there will be an extra `../' in the rule. + +Sat Feb 14 17:41:28 KST 1998 Changwoo Ryu + + * autogen.sh: multilple aclocal -I directories. + +Sat Feb 14 01:09:37 1998 Tom Tromey + + * Makefile.am (macros.dep): Removed extra `$' from rule. + + * gnome-x-checks.m4: Only check for -lSM if not already in + x_libs. + +1998-02-13 Raja R Harinath + + * Makefile.am (EXTRA_DIST): Add `autogen.sh'. + + * gnome-objc-checks.m4 (GNOME_INIT_OBJC): Solaris /bin/sh doesn't + understand `test -e'. + + * autogen.sh: New file. + + * gnome.m4 (GNOME_INIT): Look for gnomeConf.sh in $libdir, where + the installation actually installs it. + + * Makefile.am (macros.dep): New maintainer rule for handling + automatic rebuilding of aclocal.m4 if any of the macros change. + (MACROS): New variable. List of all `m4' macros in this + directory. + +1998-02-12 Raja R Harinath + + * gnome-support.m4: New file. Defines GNOME_SUPPORT_CHECKS for + libsupport.a support. + +1998-02-10 Raja R Harinath + + * gnome.m4: New file. Moved AC_CHECK_GNOME from `configure.in' to + here, and renamed macro to GNOME_CHECK_GNOME. + * gnome-x-checks.m4: Likewise, move and renaming AC_GNOME_X_CHECKS + to GNOME_X_CHECKS. + + * aclocal-include.m4: New file. Defines AM_ACLOCAL_INCLUDE macro + to provide extra search directories to `aclocal'. + +*Local Variables: +*backup-inhibited: t +*End: diff --git a/macros/Makefile b/macros/Makefile index f9c3dcc60..80b4b56ab 100644 --- a/macros/Makefile +++ b/macros/Makefile @@ -1,7 +1,6 @@ -# Generated automatically from Makefile.in by configure. -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,7 @@ SHELL = /bin/sh srcdir = . top_srcdir = .. + prefix = /usr/local exec_prefix = ${prefix} @@ -34,9 +34,9 @@ oldincludedir = /usr/include DESTDIR = -pkgdatadir = $(datadir)/hh2000 -pkglibdir = $(libdir)/hh2000 -pkgincludedir = $(includedir)/hh2000 +pkgdatadir = $(datadir)/celestia +pkglibdir = $(libdir)/celestia +pkgincludedir = $(includedir)/celestia top_builddir = .. @@ -45,10 +45,10 @@ AUTOCONF = autoconf AUTOMAKE = automake AUTOHEADER = autoheader -INSTALL = /usr/bin/install -c +INSTALL = /usr/bin/ginstall -c INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} transform = s,x,x, NORMAL_INSTALL = : @@ -57,83 +57,68 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -CATALOGS = es.gmo -CATOBJEXT = .gmo +host_alias = i686-pc-linux-gnu +host_triplet = i686-pc-linux-gnu CC = gcc -DATADIRNAME = share -GENCAT = -GMOFILES = es.gmo -GMSGFMT = /usr/bin/msgfmt -GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl -GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl +CPP = gcc -E +CXX = g++ +CXXCPP = g++ -E +GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib +GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib GNOME_APPLETS_LIBS = GNOME_CAPPLET_LIBS = -GNOME_CONFIG = /usr/bin/gnome-config -GNOME_INCLUDEDIR = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/gtk-1.2 -I/usr/X11R6/include -GNOME_LIBDIR = -rdynamic -L/usr/lib -L/usr/X11R6/lib -GNOME_LIBS = -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl -GNORBA_CFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/gtk-1.2 -I/usr/X11R6/include -GNORBA_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl +GNOME_CONFIG = /opt/gnome/bin/gnome-config +GNOME_DOCKLETS_LIBS = +GNOME_INCLUDEDIR = -I/opt/gnome/include -DNEED_GNOMESUPPORT_H -I/opt/gnome/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include -I/usr/include/gtk-1.2 -I/usr/X11R6/include +GNOME_LIBDIR = -rdynamic -L/opt/gnome/lib -L/usr/lib -L/usr/X11R6/lib +GNOME_LIBS = -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib +GNORBA_CFLAGS = -I/opt/gnome/include -DNEED_GNOMESUPPORT_H -I/opt/gnome/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include -I/usr/include/gtk-1.2 -I/usr/X11R6/include +GNORBA_LIBS = -rdynamic -L/opt/gnome/lib -L/usr/lib -L/usr/X11R6/lib -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib GTKXMHTML_LIBS = -rdynamic -lgtkxmhtml -lXpm -ljpeg -lpng -lz -lSM -lICE -lgtk -lgdk -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include GTK_CONFIG = /usr/bin/gtk-config GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm -GT_NO = -GT_YES = #YES# -INCLUDE_LOCALE_H = #include -INSTOBJEXT = .mo -INTLDEPS = -INTLLIBS = -INTLOBJS = MAKEINFO = makeinfo -MKINSTALLDIRS = ./mkinstalldirs -MSGFMT = /usr/bin/msgfmt ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include ORBIT_CONFIG = /usr/bin/orbit-config ORBIT_IDL = /usr/bin/orbit-idl -ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm -PACKAGE = hh2000 -PACKAGE_PIXMAPS_DIR = /usr/share/pixmaps/hh2000 -POFILES = es.po -POSUB = po +ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm +PACKAGE = celestia PTHREAD_LIB = -lpthread RANLIB = ranlib -USE_INCLUDED_LIBINTL = no -USE_NLS = yes -VERSION = 0.7 +VERSION = 1.1.5 XPM_LIBS = -lXpm -ZVT_LIBS = -rdynamic -lzvt -lutil -lSM -lICE -lgtk -lgdk -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm +ZVT_LIBS = -rdynamic -lzvt -lutil -lSM -lICE -lgdk_imlib -lgtk -lgdk -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm cflags_set = yes cxxflags_set = @cxxflags_set@ -l = -MACROS = aclocal-include.m4 compiler-flags.m4 curses.m4 gnome-bonobo-check.m4 gnome-fileutils.m4 gnome-gettext.m4 gnome-ghttp-check.m4 gnome-gnorba-check.m4 gnome-guile-checks.m4 gnome-libgtop-check.m4 gnome-objc-checks.m4 gnome-orbit-check.m4 gnome-print-check.m4 gnome-pthread-check.m4 gnome-support.m4 gnome-undelfs.m4 gnome-vfs.m4 gnome-x-checks.m4 gnome-xml-check.m4 gnome.m4 linger.m4 need-declaration.m4 +MACROS = aclocal-include.m4 compiler-flags.m4 curses.m4 gnome-bonobo-check.m4 gnome-fileutils.m4 gnome-ghttp-check.m4 gnome-gnorba-check.m4 gnome-guile-checks.m4 gnome-libgtop-check.m4 gnome-objc-checks.m4 gnome-orbit-check.m4 gnome-print-check.m4 gnome-pthread-check.m4 gnome-support.m4 gnome-undelfs.m4 gnome-vfs.m4 gnome-x-checks.m4 gnome-xml-check.m4 gnome.m4 gperf-check.m4 linger.m4 need-declaration.m4 -EXTRA_DIST = $(MACROS) gnome-common.m4 autogen.sh +EXTRA_DIST = $(MACROS) gnome-common.m4 gnome-gettext.m4 autogen.sh MAINTAINERCLEANFILES = macros.dep -#gnome_aclocaldir = $(datadir)/aclocal/gnome +#gnome_aclocaldir = $(datadir)/aclocal/gnome-macros -#gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 autogen.sh +#gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 gnome-gettext.m4 autogen.sh mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = DATA = $(gnome_aclocal_DATA) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = ChangeLog Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps macros/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu macros/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -165,6 +150,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = macros distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu macros/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/macros/Makefile.am b/macros/Makefile.am index e03dbeed1..cb7c18547 100644 --- a/macros/Makefile.am +++ b/macros/Makefile.am @@ -1,11 +1,11 @@ ## Please update this variable if any new macros are created + MACROS= \ aclocal-include.m4 \ compiler-flags.m4 \ curses.m4 \ gnome-bonobo-check.m4 \ gnome-fileutils.m4 \ - gnome-gettext.m4 \ gnome-ghttp-check.m4 \ gnome-gnorba-check.m4 \ gnome-guile-checks.m4 \ @@ -20,21 +20,23 @@ MACROS= \ gnome-x-checks.m4 \ gnome-xml-check.m4 \ gnome.m4 \ + gperf-check.m4 \ linger.m4 \ need-declaration.m4 -EXTRA_DIST=$(MACROS) gnome-common.m4 autogen.sh +EXTRA_DIST=$(MACROS) gnome-common.m4 gnome-gettext.m4 autogen.sh MAINTAINERCLEANFILES=macros.dep @MAINT@macros.dep: Makefile.am @MAINT@ @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=macros/%)' > $@ if INSIDE_GNOME_COMMON -gnome_aclocaldir = $(datadir)/aclocal/gnome +gnome_aclocaldir = $(datadir)/aclocal/gnome-macros gnome-macros.dep: Makefile.am @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=$(gnome_aclocaldir)/%)' > $@ -gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 autogen.sh +gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 \ + gnome-gettext.m4 autogen.sh endif diff --git a/macros/Makefile.in b/macros/Makefile.in index ff1c31c4f..007e0acc7 100644 --- a/macros/Makefile.in +++ b/macros/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,18 +57,18 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ +host_alias = @host_alias@ +host_triplet = @host@ CC = @CC@ -DATADIRNAME = @DATADIRNAME@ -GENCAT = @GENCAT@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ +CPP = @CPP@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ GNOME_CONFIG = @GNOME_CONFIG@ +GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@ GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ GNOME_LIBDIR = @GNOME_LIBDIR@ GNOME_LIBS = @GNOME_LIBS@ @@ -78,62 +78,47 @@ GTKXMHTML_LIBS = @GTKXMHTML_LIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ ORBIT_CONFIG = @ORBIT_CONFIG@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_LIBS = @ORBIT_LIBS@ PACKAGE = @PACKAGE@ -PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@ -POFILES = @POFILES@ -POSUB = @POSUB@ PTHREAD_LIB = @PTHREAD_LIB@ RANLIB = @RANLIB@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ VERSION = @VERSION@ XPM_LIBS = @XPM_LIBS@ ZVT_LIBS = @ZVT_LIBS@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -l = @l@ -MACROS = aclocal-include.m4 compiler-flags.m4 curses.m4 gnome-bonobo-check.m4 gnome-fileutils.m4 gnome-gettext.m4 gnome-ghttp-check.m4 gnome-gnorba-check.m4 gnome-guile-checks.m4 gnome-libgtop-check.m4 gnome-objc-checks.m4 gnome-orbit-check.m4 gnome-print-check.m4 gnome-pthread-check.m4 gnome-support.m4 gnome-undelfs.m4 gnome-vfs.m4 gnome-x-checks.m4 gnome-xml-check.m4 gnome.m4 linger.m4 need-declaration.m4 +MACROS = aclocal-include.m4 compiler-flags.m4 curses.m4 gnome-bonobo-check.m4 gnome-fileutils.m4 gnome-ghttp-check.m4 gnome-gnorba-check.m4 gnome-guile-checks.m4 gnome-libgtop-check.m4 gnome-objc-checks.m4 gnome-orbit-check.m4 gnome-print-check.m4 gnome-pthread-check.m4 gnome-support.m4 gnome-undelfs.m4 gnome-vfs.m4 gnome-x-checks.m4 gnome-xml-check.m4 gnome.m4 gperf-check.m4 linger.m4 need-declaration.m4 -EXTRA_DIST = $(MACROS) gnome-common.m4 autogen.sh +EXTRA_DIST = $(MACROS) gnome-common.m4 gnome-gettext.m4 autogen.sh MAINTAINERCLEANFILES = macros.dep -@INSIDE_GNOME_COMMON_TRUE@gnome_aclocaldir = $(datadir)/aclocal/gnome +@INSIDE_GNOME_COMMON_TRUE@gnome_aclocaldir = $(datadir)/aclocal/gnome-macros -@INSIDE_GNOME_COMMON_TRUE@gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 autogen.sh +@INSIDE_GNOME_COMMON_TRUE@gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 gnome-gettext.m4 autogen.sh mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = DATA = $(gnome_aclocal_DATA) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = ChangeLog Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps macros/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu macros/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -165,6 +150,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = macros distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu macros/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/macros/autogen.sh b/macros/autogen.sh index 702739136..43d7d3f63 100755 --- a/macros/autogen.sh +++ b/macros/autogen.sh @@ -3,6 +3,12 @@ DIE=0 +if [ -n "$GNOME2_PATH" ]; then + ACLOCAL_FLAGS="-I $GNOME2_PATH/share/aclocal $ACLOCAL_FLAGS" + PATH="$GNOME2_PATH/bin:$PATH" + export PATH +fi + (autoconf --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`autoconf' installed to compile Gnome." @@ -11,6 +17,16 @@ DIE=0 DIE=1 } +(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && { + (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`xml-i18n-toolize' installed to compile Gnome." + echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/xml-i18n-tools/xml-i18n-tools-0.6.tar.gz" + echo "(or a newer version if it is available)" + DIE=1 + } +} + (grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { (libtool --version) < /dev/null > /dev/null 2>&1 || { echo @@ -21,27 +37,27 @@ DIE=0 } } -grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { - grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ - (gettext --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`gettext' installed to compile Gnome." - echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } -} +#grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { +# grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ +# (gettext --version) < /dev/null > /dev/null 2>&1 || { +# echo +# echo "**Error**: You must have \`gettext' installed to compile Gnome." +# echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" +# echo "(or a newer version if it is available)" +# DIE=1 +# } +#} -grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && { - grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ - (gettext --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`gettext' installed to compile Gnome." - echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } -} +#grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && { +# grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ +# (gettext --version) < /dev/null > /dev/null 2>&1 || { +# echo +# echo "**Error**: You must have \`gettext' installed to compile Gnome." +# echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" +# echo "(or a newer version if it is available)" +# DIE=1 +# } +#} (automake --version) < /dev/null > /dev/null 2>&1 || { echo @@ -88,12 +104,28 @@ do echo processing $dr macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin` ( cd $dr + macrosdir=`find . -name macros -print` + for i in $macrodirs; do + if test -f $i/gnome-gettext.m4; then + DELETEFILES="$DELETEFILES $i/gnome-gettext.m4" + fi + done + + echo "deletefiles is $DELETEFILES" aclocalinclude="$ACLOCAL_FLAGS" + for k in $aclocalinclude; do + if test -d $k; then + if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then + rm -f $DELETEFILES + fi + fi + done for k in $macrodirs; do if test -d $k; then aclocalinclude="$aclocalinclude -I $k" - ##else - ## echo "**Warning**: No such directory \`$k'. Ignored." + if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then + rm -f $DELETEFILES + fi fi done if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then @@ -116,21 +148,37 @@ do echo "Making $dr/aclocal.m4 writable ..." test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 fi + if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then + echo "Running xml-i18n-toolize... Ignore non-fatal messages." + xml-i18n-toolize --copy --force --automake + fi if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then - echo "Running libtoolize..." - libtoolize --force --copy + if test -z "$NO_LIBTOOLIZE" ; then + echo "Running libtoolize..." + libtoolize --force --copy + fi fi echo "Running aclocal $aclocalinclude ..." - aclocal $aclocalinclude + aclocal $aclocalinclude || { + echo + echo "**Error**: aclocal failed. This may mean that you have not" + echo "installed all of the packages you need, or you may need to" + echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\"" + echo "for the prefix where you installed the packages whose" + echo "macros were not found" + exit 1 + } + if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then echo "Running autoheader..." - autoheader + autoheader || { echo "**Error**: autoheader failed."; exit 1; } fi echo "Running automake --gnu $am_opt ..." - automake --add-missing --gnu $am_opt + automake --add-missing --gnu $am_opt || + { echo "**Error**: automake failed."; exit 1; } echo "Running autoconf ..." - autoconf - ) + autoconf || { echo "**Error**: autoconf failed."; exit 1; } + ) || exit 1 fi done diff --git a/macros/compiler-flags.m4 b/macros/compiler-flags.m4 index 278d5099c..63f8e2e6a 100644 --- a/macros/compiler-flags.m4 +++ b/macros/compiler-flags.m4 @@ -21,7 +21,7 @@ AC_DEFUN([GNOME_COMPILE_WARNINGS],[ ## -W is not all that useful. And it cannot be controlled ## with individual -Wno-xxx flags, unlike -Wall if test "x$enable_compile_warnings" = "xyes"; then - warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith" + warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations" fi fi fi @@ -75,7 +75,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[ ## -W is not all that useful. And it cannot be controlled ## with individual -Wno-xxx flags, unlike -Wall if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wshadow -Woverloaded-virtual" + warnCXXFLAGS="$warnCXXFLAGS -Wmissing-prototypes -Wmissing-declarations -Wshadow -Woverloaded-virtual" fi fi fi diff --git a/macros/curses.m4 b/macros/curses.m4 index 3dd4ffaa4..5307e13d3 100644 --- a/macros/curses.m4 +++ b/macros/curses.m4 @@ -86,7 +86,7 @@ dnl /*=== End new stuff for acconfig.h ===*/ dnl -AC_DEFUN(AC_CHECK_CURSES,[ +AC_DEFUN([AC_CHECK_CURSES],[ search_ncurses=true screen_manager="" has_curses=false @@ -150,7 +150,7 @@ AC_DEFUN(AC_CHECK_CURSES,[ ]) -AC_DEFUN(AC_USE_SUNOS_CURSES, [ +AC_DEFUN([AC_USE_SUNOS_CURSES], [ search_ncurses=false screen_manager="SunOS 4.x /usr/5include curses" AC_MSG_RESULT(Using SunOS 4.x /usr/5include curses) @@ -164,7 +164,7 @@ AC_DEFUN(AC_USE_SUNOS_CURSES, [ AC_MSG_RESULT(Please note that some screen refreshs may fail) ]) -AC_DEFUN(AC_USE_OSF1_CURSES, [ +AC_DEFUN([AC_USE_OSF1_CURSES], [ AC_MSG_RESULT(Using OSF1 curses) search_ncurses=false screen_manager="OSF1 curses" @@ -175,7 +175,7 @@ AC_DEFUN(AC_USE_OSF1_CURSES, [ CURSES_LIBS="-lcurses" ]) -AC_DEFUN(AC_USE_SYSV_CURSES, [ +AC_DEFUN([AC_USE_SYSV_CURSES], [ AC_MSG_RESULT(Using SysV curses) AC_DEFINE(HAS_CURSES) has_curses=true @@ -201,16 +201,16 @@ dnl AC_DEFINE(HAS_CURSES) dnl has_curses=true dnl AC_DEFINE(USE_BSD_CURSES) dnl AC_MSG_RESULT(Please note that some screen refreshs may fail) -dnl AC_WARN(Use of the bsdcurses extension has some) -dnl AC_WARN(display/input problems.) -dnl AC_WARN(Reconsider using xcurses) +dnl AC_MSG_WARN(Use of the bsdcurses extension has some) +dnl AC_MSG_WARN(display/input problems.) +dnl AC_MSG_WARN(Reconsider using xcurses) dnl) dnl dnl Parameters: directory filename cureses_LIBS curses_INCLUDEDIR nicename dnl -AC_DEFUN(AC_NCURSES, [ +AC_DEFUN([AC_NCURSES], [ if $search_ncurses then if test -f $1/$2 @@ -227,7 +227,7 @@ AC_DEFUN(AC_NCURSES, [ fi ]) -AC_DEFUN(AC_SEARCH_NCURSES, [ +AC_DEFUN([AC_SEARCH_NCURSES], [ AC_CHECKING("location of ncurses.h file") AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include") diff --git a/macros/gnome-bonobo-check.m4 b/macros/gnome-bonobo-check.m4 index 65e272cf7..daa109c0f 100644 --- a/macros/gnome-bonobo-check.m4 +++ b/macros/gnome-bonobo-check.m4 @@ -41,8 +41,8 @@ AC_ARG_ENABLE(bonobotest, [ --disable-bonobotest Do not try to compile an if test "$GNOME_CONFIG" = "no" ; then no_bonobo=yes else - BONOBO_CFLAGS=`$GNOME_CONFIG $bonoboconf_args --cflags bonobo` - BONOBO_LIBS=`$GNOME_CONFIG $bonoboconf_args --libs bonobo` + BONOBO_CFLAGS=`$GNOME_CONFIG $bonoboconf_args --cflags bonobo bonobox` + BONOBO_LIBS=`$GNOME_CONFIG $bonoboconf_args --libs bonobo bonobox` bonobo_major_version=`$GNOME_CONFIG $bonobo_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` @@ -64,7 +64,7 @@ dnl #include #include #include -#include +#include static char* my_strdup (char *str) @@ -88,7 +88,7 @@ int main () char *tmp_version; system ("touch conf.bonobotest"); - gnome_object_get_type (); + bonobo_object_get_type (); return 0; } @@ -148,3 +148,19 @@ AC_DEFUN([BONOBO_CHECK], [ AM_PATH_BONOBO(0.1.0,,[AC_MSG_ERROR(BONOBO not found)]) ]) +AC_DEFUN([AM_BONOBO_USES_OAF], +[ + AC_REQUIRE([AM_PATH_BONOBO]) + + AC_MSG_CHECKING(if Bonobo uses OAF) + if ( gnome-config --libs bonobo | grep oaf ) > /dev/null 2>&1 ; then + using_oaf="yes" + AC_DEFINE(BONOBO_USES_OAF) + else + using_oaf="no" + fi + + AC_MSG_RESULT("$using_oaf") + + AM_CONDITIONAL(BONOBO_USES_OAF, test x"using_oaf" = "xyes") +]) diff --git a/macros/gnome-common.m4 b/macros/gnome-common.m4 index b72382970..83bb00d70 100644 --- a/macros/gnome-common.m4 +++ b/macros/gnome-common.m4 @@ -6,9 +6,9 @@ dnl GNOME_COMMON_INIT AC_DEFUN([GNOME_COMMON_INIT], [ - GNOME_ACLOCAL_DIR=`$ACLOCAL --print-ac-dir`/gnome + GNOME_ACLOCAL_DIR="$GNOME_COMMON_MACROS_DIR" AC_SUBST(GNOME_ACLOCAL_DIR) - ACLOCAL="$ACLOCAL -I $GNOME_ACLOCAL_DIR" + ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" ]) diff --git a/macros/gnome-gettext.m4 b/macros/gnome-gettext.m4 index 1dac989cb..6839855c1 100644 --- a/macros/gnome-gettext.m4 +++ b/macros/gnome-gettext.m4 @@ -12,7 +12,7 @@ # serial 5 -AC_DEFUN(AM_GNOME_WITH_NLS, +AC_DEFUN([AM_GNOME_WITH_NLS], [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS AC_ARG_ENABLE(nls, @@ -25,7 +25,7 @@ AC_DEFUN(AM_GNOME_WITH_NLS, dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS) +# AC_DEFINE(ENABLE_NLS) # AC_MSG_CHECKING([whether included gettext is requested]) # AC_ARG_WITH(included-gettext, # [ --with-included-gettext use the GNU gettext library included here], @@ -210,7 +210,7 @@ AC_DEFUN(AM_GNOME_WITH_NLS, AC_SUBST(POSUB) ]) -AC_DEFUN(AM_GNOME_GETTEXT, +AC_DEFUN([AM_GNOME_GETTEXT], [AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl @@ -249,7 +249,7 @@ strdup __argz_count __argz_stringify __argz_next]) fi for lang in $LINGUAS; do case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + *\ $lang\ *|$lang\ *|*\ $lang) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; esac done LINGUAS=$NEW_LINGUAS diff --git a/macros/gnome-ghttp-check.m4 b/macros/gnome-ghttp-check.m4 index 1fc85783f..0ecacaaf0 100644 --- a/macros/gnome-ghttp-check.m4 +++ b/macros/gnome-ghttp-check.m4 @@ -8,7 +8,7 @@ AC_DEFUN([GNOME_GHTTP_CHECK],[ AC_CHECK_LIB(nsl,gethostbyname, GHTTP_LIB="-lnsl $GHTTP_LIB",,$GHTTP_LIB)]) AC_CHECK_LIB(ghttp, ghttp_request_new, - GHTTP_LIB="-lghttp $GHTTP_LIB",,-L$gnome_prefix $GHTTP_LIB) + GHTTP_LIB="-lghttp $GHTTP_LIB",GHTTP_LIB="",-L$gnome_prefix $GHTTP_LIB) AC_SUBST(GHTTP_LIB) AC_PROVIDE([GNOME_GHTTP_CHECK]) ]) diff --git a/macros/gnome-libgtop-check.m4 b/macros/gnome-libgtop-check.m4 index 81fbb6016..1b4e1745c 100644 --- a/macros/gnome-libgtop-check.m4 +++ b/macros/gnome-libgtop-check.m4 @@ -1,3 +1,35 @@ +dnl +dnl LIBGTOP_CHECK_TYPE +dnl +dnl Improved version of AC_CHECK_TYPE which takes into account +dnl that we need to #include some other header files on some +dnl systems to get some types. + +dnl AC_LIBGTOP_CHECK_TYPE(TYPE, DEFAULT) +AC_DEFUN([AC_LIBGTOP_CHECK_TYPE], +[AC_REQUIRE([AC_HEADER_STDC])dnl +AC_MSG_CHECKING(for $1) +AC_CACHE_VAL(ac_cv_type_$1, +[AC_EGREP_CPP(dnl +changequote(<<,>>)dnl +<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl +changequote([,]), [#include +#if STDC_HEADERS +#include +#include +#endif + +/* For Tru64 */ +#ifdef HAVE_SYS_BITYPES_H +#include +#endif +], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl +AC_MSG_RESULT($ac_cv_type_$1) +if test $ac_cv_type_$1 = no; then + AC_DEFINE($1, $2) +fi +]) + dnl dnl GNOME_LIBGTOP_TYPES dnl @@ -6,8 +38,9 @@ dnl AC_DEFUN([GNOME_LIBGTOP_TYPES], [ - AC_CHECK_TYPE(u_int64_t, unsigned long long int) - AC_CHECK_TYPE(int64_t, long long int) + AC_CHECK_HEADERS(sys/bitypes.h) + AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int) + AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int) ]) dnl @@ -28,10 +61,6 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK], AC_SUBST(LIBGTOP_INCS) AC_SUBST(LIBGTOP_NAMES_LIBS) AC_SUBST(LIBGTOP_NAMES_INCS) - AC_SUBST(LIBGTOP_GUILE_INCS) - AC_SUBST(LIBGTOP_GUILE_LIBS) - AC_SUBST(LIBGTOP_GUILE_NAMES_INCS) - AC_SUBST(LIBGTOP_GUILE_NAMES_LIBS) AC_SUBST(LIBGTOP_MAJOR_VERSION) AC_SUBST(LIBGTOP_MINOR_VERSION) AC_SUBST(LIBGTOP_MICRO_VERSION) @@ -120,10 +149,13 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK], sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` libgtop_micro_version=`$LIBGTOP_CONFIG --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - test $libgtop_major_version != $min_libgtop_major && no_libgtop=yes - test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes - if test $libgtop_minor_version = $min_libgtop_minor ; then - test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes + if test $libgtop_major_version != $min_libgtop_major ; then + no_libgtop=mismatch + else + test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes + if test $libgtop_minor_version = $min_libgtop_minor ; then + test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes + fi fi . $configfile fi @@ -140,6 +172,9 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK], ifelse([$2], [], :, [$2]) else AC_MSG_RESULT(no) + if test "$no_libgtop"x = mismatchx; then + AC_MSG_ERROR(LibGTop major version mismatch $libgtop_major_version != $min_libgtop_major) + fi if test "x$3" = "xfail"; then AC_MSG_ERROR(LibGTop >= $min_libgtop_version not found) else diff --git a/macros/gnome-objc-checks.m4 b/macros/gnome-objc-checks.m4 index dc9691cf2..c69acb077 100644 --- a/macros/gnome-objc-checks.m4 +++ b/macros/gnome-objc-checks.m4 @@ -14,8 +14,12 @@ dnl FIXME: extend list of possible names of ObjC compilers. OBJC_LIBS="-lobjc $PTHREAD_LIB" AC_CHECK_FUNC(sched_yield,,[ - AC_CHECK_LIB(posix4,sched_yield, - OBJC_LIBS="$OBJC_LIBS -lposix4",, $OBJC_LIBS)]) + AC_CHECK_LIB(rt,sched_yield, + OBJC_LIBS="$OBJC_LIBS -lrt",[ + AC_CHECK_LIB(posix4,sched_yield, + OBJC_LIBS="$OBJC_LIBS -lposix4",, + $OBJC_LIBS)], + $OBJC_LIBS)]) AC_SUBST(OBJC_LIBS) AC_CACHE_CHECK([if Objective C compiler ($OBJC) works], diff --git a/macros/gnome-print-check.m4 b/macros/gnome-print-check.m4 index 7d98281d9..49fd6c606 100644 --- a/macros/gnome-print-check.m4 +++ b/macros/gnome-print-check.m4 @@ -8,164 +8,56 @@ dnl AM_PATH_GNOME_PRINT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for GNOME-PRINT, and define GNOME_PRINT_CFLAGS and GNOME_PRINT_LIBS dnl -AC_DEFUN(AM_PATH_GNOME_PRINT, -[dnl -dnl Get the cflags and libraries from the gnome-config script -dnl -AC_ARG_WITH(gnome-print-prefix,[ --with-gnome-print-prefix=PFX Prefix where GNOME-PRINT is installed (optional)], - gnome_print_prefix="$withval", gnome_print_prefix="") -AC_ARG_WITH(gnome-print-exec-prefix,[ --with-gnome-print-exec-prefix=PFX Exec prefix where GNOME-PRINT is installed (optional)], - gnome_print_exec_prefix="$withval", gnome_print_exec_prefix="") -AC_ARG_ENABLE(gnome-printtest, [ --disable-gnome-printtest Do not try to compile and run a test GNOME-PRINT program], - , enable_gnome_printtest=yes) +AC_DEFUN([AM_PATH_GNOME_PRINT], +[ + min_version=ifelse([$1],,0.21,$1) - if test x$gnome_print_exec_prefix != x ; then - gnome_print_args="$gnome_print_args --exec-prefix=$gnome_print_exec_prefix" - if test x${GNOME_CONFIG+set} != xset ; then - GNOME_CONFIG=$gnome_print_exec_prefix/bin/gnome-config - fi - fi - if test x$gnome_print_prefix != x ; then - gnome_print_args="$gnome_print_args --prefix=$gnome_print_prefix" - if test x${GNOME_CONFIG+set} != xset ; then - GNOME_CONFIG=$gnome_print_prefix/bin/gnome-config - fi - fi + gnome_print_ok="" AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) - min_gnome_print_version=ifelse([$1], ,0.1.0,$1) - AC_MSG_CHECKING(for GNOME-PRINT - version >= $min_gnome_print_version) - no_gnome_print="" if test "$GNOME_CONFIG" = "no" ; then - no_gnome_print=yes + AC_MSG_RESULT(gnome-config is missing, check your gnome installation) else - GNOME_PRINT_CFLAGS=`$GNOME_CONFIG $gnome_printconf_args --cflags print` - GNOME_PRINT_LIBS=`$GNOME_CONFIG $gnome_printconf_args --libs print` - - gnome_print_major_version=`$GNOME_CONFIG $gnome_print_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gnome_print_minor_version=`$GNOME_CONFIG $gnome_print_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gnome_print_micro_version=`$GNOME_CONFIG $gnome_print_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gnome_printtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GNOME_PRINT_CFLAGS" - LIBS="$LIBS $GNOME_PRINT_LIBS" -dnl -dnl Now check if the installed GNOME-PRINT is sufficiently new. (Also sanity -dnl checks the results of gnome-config to some extent -dnl - rm -f conf.gnome_printtest - AC_TRY_RUN([ -#include -#include -#include -#include - -static char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gnome_printtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_gnome_print_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gnome_print_version"); - exit(1); - } - return 0; -#if 0 - if (($gnome_print_major_version > major) || - (($gnome_print_major_version == major) && ($gnome_print_minor_version > minor)) || - (($gnome_print_major_version == major) && ($gnome_print_minor_version == minor) && ($gnome_print_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'gnome-config print --version' returned %d.%d.%d, but the minimum version\n", $gnome_print_major_version, $gnome_print_minor_version, $gnome_print_micro_version); - printf("*** of GNOME-PRINT required is %d.%d.%d. If gnome-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If gnome-config was wrong, set the environment variable GNOME_CONFIG\n"); - printf("*** to point to the correct copy of gnome-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -#endif -} - -],, no_gnome_print=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi + AC_MSG_CHECKING(for GNOME-PRINT - version >= $min_version) + if `$GNOME_CONFIG --libs print > /dev/null 2>&1`; then + rqmajor=`echo "$1" | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` + rqminor=`echo "$1" | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` + major=`$GNOME_CONFIG --modversion print | sed -e 's/gnome-print-//' | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` + minor=`$GNOME_CONFIG --modversion print | sed -e 's/gnome-print-//' | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` + if test "$major" -ge "$rqmajor"; then + if test "$major" -gt "$rqmajor"; then + AC_MSG_RESULT("found $major.$minor") + gnome_print_ok="yes" + else + if test "$minor" -ge "$rqminor"; then + AC_MSG_RESULT("found $major.$minor") + gnome_print_ok="yes" + else + AC_MSG_RESULT("you have $major.$minor") + fi + fi + else + AC_MSG_RESULT("you have $major.$minor") + fi + else + AC_MSG_RESULT("did not find any version") + fi fi - if test "x$no_gnome_print" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) + + if test "x$gnome_print_ok" != "x" ; then + GNOME_PRINT_CFLAGS=`$GNOME_CONFIG --cflags print` + GNOME_PRINT_LIBS=`$GNOME_CONFIG --libs print` + ifelse([$2], , :, [$2]) else - AC_MSG_RESULT(no) - if test "$GNOME_CONFIG" = "no" ; then - echo "*** The gnome-config script installed by GNOME-LIBS could not be found" - echo "*** If GNOME-PRINT was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GNOME_CONFIG environment variable to the" - echo "*** full path to gnome-config." - else - if test -f conf.gnome_printtest ; then - : - else - echo "*** Could not run GNOME-PRINT test program, checking why..." - CFLAGS="$CFLAGS $GNOME_PRINT_CFLAGS" - LIBS="$LIBS $GNOME_PRINT_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GNOME-PRINT or finding the wrong" - echo "*** version of GNOME-PRINT. If it is not finding GNOME-PRINT, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GNOME-PRINT was incorrectly installed" - echo "*** or that you have moved GNOME-PRINT since it was installed. In the latter case, you" - echo "*** may want to edit the gnome-config script: $GNOME_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi GNOME_PRINT_CFLAGS="" GNOME_PRINT_LIBS="" ifelse([$3], , :, [$3]) fi + AC_SUBST(GNOME_PRINT_CFLAGS) AC_SUBST(GNOME_PRINT_LIBS) - rm -f conf.gnome_printtest ]) AC_DEFUN([GNOME_PRINT_CHECK], [ - AM_PATH_GNOME_PRINT(0.1.0,,[AC_MSG_ERROR(GNOME-PRINT not found)]) + AM_PATH_GNOME_PRINT($1,,[AC_MSG_ERROR(GNOME-PRINT not found or wrong version)]) ]) diff --git a/macros/gnome-vfs.m4 b/macros/gnome-vfs.m4 index 137a39dd3..8ca361f28 100644 --- a/macros/gnome-vfs.m4 +++ b/macros/gnome-vfs.m4 @@ -60,7 +60,7 @@ AC_DEFUN([GNOME_WITH_VFS],[ SAMBAFILES="" AC_ARG_WITH(samba, [--with-samba Support smb virtual file system],[ - if test "x$withval != xno"; then + if test "x$withval" != "xno"; then AC_DEFINE(WITH_SMBFS) vfs_flags="$vfs_flags, smbfs" smbfs="smbfs.o" diff --git a/macros/gnome-xml-check.m4 b/macros/gnome-xml-check.m4 index 2410f35db..1caad1009 100644 --- a/macros/gnome-xml-check.m4 +++ b/macros/gnome-xml-check.m4 @@ -14,15 +14,17 @@ AC_DEFUN([GNOME_XML_HOOK],[ AC_MSG_ERROR(Could not find gnome-config) fi fi + GNOME_XML_CFLAGS=`$GNOME_CONFIG --cflags xml` + AC_SUBST(GNOME_XML_CFLAGS) AC_CHECK_LIB(xml, xmlNewDoc, [ $1 - AC_SUBST(GNOME_XML_LIB) GNOME_XML_LIB=`$GNOME_CONFIG --libs xml` ], [ if test x$2 = xfailure; then AC_MSG_ERROR(Could not link sample xml program) fi ], `$GNOME_CONFIG --libs xml`) + AC_SUBST(GNOME_XML_LIB) ]) AC_DEFUN([GNOME_XML_CHECK], [ diff --git a/macros/gnome.m4 b/macros/gnome.m4 index a3a9ca740..659c22c49 100644 --- a/macros/gnome.m4 +++ b/macros/gnome.m4 @@ -104,6 +104,10 @@ AC_DEFUN([GNOME_INIT_HOOK],[ AC_SUBST(GNOME_APPLETS_LIBS) GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` AC_MSG_RESULT($GNOME_APPLETS_LIBS);; + docklets) + AC_SUBST(GNOME_DOCKLETS_LIBS) + GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets` + AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);; capplet) AC_SUBST(GNOME_CAPPLET_LIBS) GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` diff --git a/macros/gperf-check.m4 b/macros/gperf-check.m4 new file mode 100644 index 000000000..1b73d3f19 --- /dev/null +++ b/macros/gperf-check.m4 @@ -0,0 +1,79 @@ +dnl +dnl AC_PROG_GPERF (MINIMUM-VERSION) +dnl +dnl Check for availability of gperf. +dnl Abort if not found or if current version is not up to par. +dnl + +AC_DEFUN([AC_PROG_GPERF],[ + AC_PATH_PROG(GPERF, gperf, no) + if test "$GPERF" = no; then + AC_MSG_ERROR(Could not find gperf) + fi + min_gperf_version=ifelse([$1], ,2.7,$1) + AC_MSG_CHECKING(for gperf - version >= $min_gperf_version) + gperf_major_version=`$GPERF --version | \ + sed 's/GNU gperf \([[0-9]]*\).\([[0-9]]*\)/\1/'` + gperf_minor_version=`$GPERF --version | \ + sed 's/GNU gperf \([[0-9]]*\).\([[0-9]]*\)/\2/'` + no_gperf="" +dnl +dnl Now check if the installed gperf is sufficiently new. +dnl + AC_TRY_RUN([ +#include +#include +#include + +static char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int +main () +{ + char *tmp_version; + + int major; + int minor; + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_gperf_version"); + if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) { + printf ("%s, bad version string\n", "$min_gperf_version"); + exit (1); + } + + if (($gperf_major_version > major) || + (($gperf_major_version == major) && ($gperf_minor_version >= minor))) { + return 0; + } else { + printf ("\n"); + printf ("*** An old version of gperf ($gperf_major_version.$gperf_minor_version) was found.\n"); + printf ("*** You need a version of gperf newer than %d.%d.%d. The latest version of\n", + major, minor); + printf ("*** gperf is always available from ftp://ftp.gnu.org.\n"); + printf ("***\n"); + return 1; + } +} +],,no_gperf=yes,[/bin/true]) + if test "x$no_gperf" = x ; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + +]) diff --git a/macros/linger.m4 b/macros/linger.m4 index dfa7c8aea..1dfb89dc9 100644 --- a/macros/linger.m4 +++ b/macros/linger.m4 @@ -1,7 +1,7 @@ dnl dnl Check for struct linger dnl -AC_DEFUN(AC_STRUCT_LINGER, [ +AC_DEFUN([AC_STRUCT_LINGER], [ av_struct_linger=no AC_MSG_CHECKING(struct linger is available) AC_TRY_RUN([ diff --git a/macros/need-declaration.m4 b/macros/need-declaration.m4 index d5b7bc66d..8a217b8a3 100644 --- a/macros/need-declaration.m4 +++ b/macros/need-declaration.m4 @@ -1,6 +1,6 @@ dnl See whether we need a declaration for a function. dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES]) -AC_DEFUN(GCC_NEED_DECLARATION, +AC_DEFUN([GCC_NEED_DECLARATION], [AC_MSG_CHECKING([whether $1 must be declared]) AC_CACHE_VAL(gcc_cv_decl_needed_$1, [AC_TRY_COMPILE([ @@ -33,7 +33,7 @@ fi dnl Check multiple functions to see whether each needs a declaration. dnl GCC_NEED_DECLARATIONS(FUNCTION... [, EXTRA-HEADER-FILES]) -AC_DEFUN(GCC_NEED_DECLARATIONS, +AC_DEFUN([GCC_NEED_DECLARATIONS], [for ac_func in $1 do GCC_NEED_DECLARATION($ac_func, $2) diff --git a/manual/Makefile.am b/manual/Makefile.am new file mode 100644 index 000000000..4b678ad0f --- /dev/null +++ b/manual/Makefile.am @@ -0,0 +1,5 @@ +pkgdatadir = $(datadir)/@PACKAGE@/manual + +pkgdata_DATA = $(wildcard *.html) $(wildcard *.css) + +EXTRA_DIST = $(pkgdata_DATA) diff --git a/manual/Makefile.in b/manual/Makefile.in new file mode 100644 index 000000000..e2815e066 --- /dev/null +++ b/manual/Makefile.in @@ -0,0 +1,226 @@ +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +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 + +DESTDIR = +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = .. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +CC = @CC@ +CPP = @CPP@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ +GNOMEUI_LIBS = @GNOMEUI_LIBS@ +GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ +GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ +GNOME_CONFIG = @GNOME_CONFIG@ +GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@ +GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ +GNOME_LIBDIR = @GNOME_LIBDIR@ +GNOME_LIBS = @GNOME_LIBS@ +GNORBA_CFLAGS = @GNORBA_CFLAGS@ +GNORBA_LIBS = @GNORBA_LIBS@ +GTKXMHTML_LIBS = @GTKXMHTML_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_CONFIG = @GTK_CONFIG@ +GTK_LIBS = @GTK_LIBS@ +MAKEINFO = @MAKEINFO@ +ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_CONFIG = @ORBIT_CONFIG@ +ORBIT_IDL = @ORBIT_IDL@ +ORBIT_LIBS = @ORBIT_LIBS@ +PACKAGE = @PACKAGE@ +PTHREAD_LIB = @PTHREAD_LIB@ +RANLIB = @RANLIB@ +VERSION = @VERSION@ +XPM_LIBS = @XPM_LIBS@ +ZVT_LIBS = @ZVT_LIBS@ +cflags_set = @cflags_set@ +cxxflags_set = @cxxflags_set@ + +pkgdatadir = $(datadir)/@PACKAGE@/manual + +pkgdata_DATA = $(wildcard *.html) $(wildcard *.css) + +EXTRA_DIST = $(pkgdata_DATA) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../config.h +CONFIG_CLEAN_FILES = +DATA = $(pkgdata_DATA) + +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP_ENV = --best +all: all-redirect +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +install-pkgdataDATA: $(pkgdata_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + @list='$(pkgdata_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \ + fi; fi; \ + done + +uninstall-pkgdataDATA: + @$(NORMAL_UNINSTALL) + list='$(pkgdata_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(pkgdatadir)/$$p; \ + done +tags: TAGS +TAGS: + + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = manual + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu manual/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pkgdataDATA +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pkgdataDATA +uninstall: uninstall-am +all-am: Makefile $(DATA) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-generic clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: uninstall-pkgdataDATA install-pkgdataDATA tags distdir info-am \ +info dvi-am dvi check check-am installcheck-am installcheck \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# 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. +.NOEXPORT: diff --git a/models/Makefile.am b/models/Makefile.am index 7850e3aaa..60ec791f0 100644 --- a/models/Makefile.am +++ b/models/Makefile.am @@ -2,4 +2,4 @@ pkgdatadir = $(datadir)/@PACKAGE@/models pkgdata_DATA = $(wildcard *.3ds) $(wildcard *.cms) -DIST = $(pkgdata_DATA) +EXTRA_DIST = $(pkgdata_DATA) diff --git a/src/Makefile.am b/src/Makefile.am index 7f787eac4..52e2d9f7b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,2 +1,9 @@ SUBDIRS = celutil celmath cel3ds celtxf celengine celestia +dosstuff = Celestia.dsw winbuild.mak +buildstardb_SOURCES = buildstardb.cpp +noinst_DATA = $(dosstuff) +EXTRA_DIST = $(noinst_DATA) + +noinst_PROGRAMS = buildstardb + diff --git a/src/Makefile.in b/src/Makefile.in index bad641a31..8dcce88cc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -68,6 +68,7 @@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ GNOME_CONFIG = @GNOME_CONFIG@ +GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@ GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ GNOME_LIBDIR = @GNOME_LIBDIR@ GNOME_LIBS = @GNOME_LIBS@ @@ -92,9 +93,37 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ SUBDIRS = celutil celmath cel3ds celtxf celengine celestia + +dosstuff = Celestia.dsw winbuild.mak +buildstardb_SOURCES = buildstardb.cpp +noinst_DATA = $(dosstuff) +EXTRA_DIST = $(noinst_DATA) + +noinst_PROGRAMS = buildstardb mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = +PROGRAMS = $(noinst_PROGRAMS) + + +DEFS = @DEFS@ -I. -I$(srcdir) -I.. +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +X_CFLAGS = @X_CFLAGS@ +X_LIBS = @X_LIBS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +buildstardb_OBJECTS = buildstardb.o +buildstardb_LDADD = $(LDADD) +buildstardb_DEPENDENCIES = +buildstardb_LDFLAGS = +CXXFLAGS = @CXXFLAGS@ +CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +DATA = $(noinst_DATA) + DIST_COMMON = Makefile.am Makefile.in @@ -102,8 +131,13 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best +DEP_FILES = .deps/buildstardb.P +SOURCES = $(buildstardb_SOURCES) +OBJECTS = $(buildstardb_OBJECTS) + all: all-redirect .SUFFIXES: +.SUFFIXES: .S .c .cpp .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile @@ -112,6 +146,37 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +mostlyclean-noinstPROGRAMS: + +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + +distclean-noinstPROGRAMS: + +maintainer-clean-noinstPROGRAMS: + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +buildstardb: $(buildstardb_OBJECTS) $(buildstardb_DEPENDENCIES) + @rm -f buildstardb + $(CXXLINK) $(buildstardb_LDFLAGS) $(buildstardb_OBJECTS) $(buildstardb_LDADD) $(LIBS) +.cpp.o: + $(CXXCOMPILE) -c $< + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -231,6 +296,57 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp + +%.o: %.cpp + @echo '$(CXXCOMPILE) -c $<'; \ + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.cpp + @echo '$(LTCXXCOMPILE) -c $<'; \ + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-recursive dvi-am: @@ -250,7 +366,7 @@ install-am: all-am install: install-recursive uninstall-am: uninstall: uninstall-recursive -all-am: Makefile +all-am: Makefile $(PROGRAMS) $(DATA) all-redirect: all-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install @@ -267,37 +383,47 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-tags clean-generic mostlyclean-am +clean-am: clean-noinstPROGRAMS clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am clean: clean-recursive -distclean-am: distclean-tags distclean-generic clean-am +distclean-am: distclean-noinstPROGRAMS distclean-compile distclean-tags \ + distclean-depend distclean-generic clean-am distclean: distclean-recursive -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ +maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -.PHONY: install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ +clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile install-data-recursive \ +uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs-am installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/buildstardb.cpp b/src/buildstardb.cpp index 5ca50601c..f832d401b 100644 --- a/src/buildstardb.cpp +++ b/src/buildstardb.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "stardb.h" +#include "celengine/stardb.h" using namespace std; diff --git a/src/cel3ds/3dsmodel.cpp b/src/cel3ds/3dsmodel.cpp index 69bd1530f..1b54dc046 100644 --- a/src/cel3ds/3dsmodel.cpp +++ b/src/cel3ds/3dsmodel.cpp @@ -176,7 +176,7 @@ M3DModel::M3DModel() M3DModel::~M3DModel() { - for (int i = 0; i < triMeshes.size(); i++) + for (unsigned int i = 0; i < triMeshes.size(); i++) if (triMeshes[i] != NULL) delete triMeshes[i]; } @@ -216,7 +216,7 @@ M3DScene::M3DScene() M3DScene::~M3DScene() { - int i; + unsigned int i; for (i = 0; i < models.size(); i++) if (models[i] != NULL) delete models[i]; diff --git a/src/cel3ds/3dsread.cpp b/src/cel3ds/3dsread.cpp index ab6c838e4..c7e07b3c6 100644 --- a/src/cel3ds/3dsread.cpp +++ b/src/cel3ds/3dsread.cpp @@ -36,15 +36,16 @@ static int32 readInt(ifstream& in) LE_TO_CPU_INT32(ret, ret); return ret; } - + +/* not currently used static int16 readShort(ifstream& in) { int16 ret; in.read((char *) &ret, sizeof(int16)); LE_TO_CPU_INT16(ret, ret); return ret; -} - +}*/ + static uint16 readUshort(ifstream& in) { uint16 ret; @@ -68,6 +69,7 @@ static char readChar(ifstream& in) } +/* Not currently used static int readString(ifstream& in, char* s, int maxLength) { int count; @@ -79,7 +81,7 @@ static int readString(ifstream& in, char* s, int maxLength) } return count; -} +}*/ static string readString(ifstream& in) { @@ -381,7 +383,7 @@ void readFaceArray(ifstream& in, M3DTriangleMesh* triMesh, int contentSize) uint16 v0 = readUshort(in); uint16 v1 = readUshort(in); uint16 v2 = readUshort(in); - uint16 flags = readUshort(in); + /*uint16 flags = */ readUshort(in); triMesh->addFace(v0, v1, v2); } diff --git a/src/cel3ds/Makefile.am b/src/cel3ds/Makefile.am index eca3262a5..f555d87d2 100644 --- a/src/cel3ds/Makefile.am +++ b/src/cel3ds/Makefile.am @@ -1,4 +1,9 @@ noinst_LIBRARIES = libcel3ds.a +noinst_HEADERS = $(wildcard *.h) +dosstuff = 3ds.mak cel3ds.dsp +noinst_DATA = $(dosstuff) + +EXTRA_DIST = $(noinst_DATA) INCLUDES = -I.. @@ -6,4 +11,3 @@ libcel3ds_a_SOURCES = \ 3dsmodel.cpp \ 3dsread.cpp - diff --git a/src/cel3ds/Makefile.in b/src/cel3ds/Makefile.in index 1bf2568e5..5296dbb34 100644 --- a/src/cel3ds/Makefile.in +++ b/src/cel3ds/Makefile.in @@ -68,6 +68,7 @@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ GNOME_CONFIG = @GNOME_CONFIG@ +GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@ GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ GNOME_LIBDIR = @GNOME_LIBDIR@ GNOME_LIBS = @GNOME_LIBS@ @@ -92,6 +93,11 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ noinst_LIBRARIES = libcel3ds.a +noinst_HEADERS = $(wildcard *.h) +dosstuff = 3ds.mak cel3ds.dsp +noinst_DATA = $(dosstuff) + +EXTRA_DIST = $(noinst_DATA) INCLUDES = -I.. @@ -118,6 +124,10 @@ CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +DATA = $(noinst_DATA) + +HEADERS = $(noinst_HEADERS) + DIST_COMMON = Makefile.am Makefile.in @@ -291,7 +301,7 @@ install-am: all-am install: install-am uninstall-am: uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/src/celengine/Makefile.am b/src/celengine/Makefile.am index 38206ffe0..79d1edfcc 100644 --- a/src/celengine/Makefile.am +++ b/src/celengine/Makefile.am @@ -1,4 +1,10 @@ noinst_LIBRARIES = libcelengine.a +noinst_HEADERS = $(wildcard *.h) +dosstuff = celengine.dsp engine.mak +noinst_DATA = $(dosstuff) + +EXTRA_DIST = $(noinst_DATA) + INCLUDES = -I.. diff --git a/src/celengine/Makefile.in b/src/celengine/Makefile.in index 7e4d596f2..a6d15ad37 100644 --- a/src/celengine/Makefile.in +++ b/src/celengine/Makefile.in @@ -68,6 +68,7 @@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ GNOME_CONFIG = @GNOME_CONFIG@ +GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@ GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ GNOME_LIBDIR = @GNOME_LIBDIR@ GNOME_LIBS = @GNOME_LIBS@ @@ -92,6 +93,11 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ noinst_LIBRARIES = libcelengine.a +noinst_HEADERS = $(wildcard *.h) +dosstuff = celengine.dsp engine.mak +noinst_DATA = $(dosstuff) + +EXTRA_DIST = $(noinst_DATA) INCLUDES = -I.. @@ -124,6 +130,10 @@ CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +DATA = $(noinst_DATA) + +HEADERS = $(noinst_HEADERS) + DIST_COMMON = Makefile.am Makefile.in @@ -307,7 +317,7 @@ install-am: all-am install: install-am uninstall-am: uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/src/celengine/asterism.cpp b/src/celengine/asterism.cpp index 83da080dc..166fb6341 100644 --- a/src/celengine/asterism.cpp +++ b/src/celengine/asterism.cpp @@ -8,8 +8,9 @@ // of the License, or (at your option) any later version. #include -#include -#include +#include "config.h" +#include "celutil/util.h" +#include "celutil/debug.h" #include "parser.h" #include "asterism.h" diff --git a/src/celengine/astro.h b/src/celengine/astro.h index d74bb4a45..b04c70cd6 100644 --- a/src/celengine/astro.h +++ b/src/celengine/astro.h @@ -16,7 +16,7 @@ #define SOLAR_ABSMAG 4.83f #define LN_MAG 1.085736 -#define LY_PER_PARSEC 3.26 +#define LY_PER_PARSEC 3.26167 #define KM_PER_LY 9466411842000.000 #define KM_PER_AU 149597870.7 #define AU_PER_LY (KM_PER_LY / KM_PER_AU) diff --git a/src/celengine/celestia.h b/src/celengine/celestia.h index 425f0f7de..f04c1a1a7 100644 --- a/src/celengine/celestia.h +++ b/src/celengine/celestia.h @@ -25,5 +25,9 @@ #define NONSTANDARD_STRING_COMPARE #endif // __GNUC__ +#ifndef _WIN32 +#include "config.h" +#endif + #endif // _CELESTIA_H_ diff --git a/src/celengine/cmdparser.cpp b/src/celengine/cmdparser.cpp index 68da9d8bb..a68e1bf6d 100644 --- a/src/celengine/cmdparser.cpp +++ b/src/celengine/cmdparser.cpp @@ -20,9 +20,9 @@ #include #endif // HAVE_SSTREAM -#include -#include -#include +#include "celutil/util.h" +#include "celutil/debug.h" +#include "celmath/mathlib.h" #include "astro.h" #include "cmdparser.h" diff --git a/src/celengine/customorbit.cpp b/src/celengine/customorbit.cpp index f88d58097..f20b9d423 100644 --- a/src/celengine/customorbit.cpp +++ b/src/celengine/customorbit.cpp @@ -223,9 +223,9 @@ void computePlanetElements(double t, vector pList) double *ep, *pp; double aa; - int i, j, planet; + int planet; - for(i=0; i < pList.size(); i++) + for(unsigned i=0; i < pList.size(); i++) { planet = pList[i]; ep = gElements[planet]; @@ -235,7 +235,7 @@ void computePlanetElements(double t, vector pList) *pp = pfmod(*pp, 360.0); pp[1] = (ep[1]*9.856263e-3) + (ep[2] + ep[3])/36525; - for(j = 4; j < 20; j += 4) + for(unsigned j = 4; j < 20; j += 4) pp[j/4+1] = ((ep[j+3]*t + ep[j+2])*t + ep[j+1])*t + ep[j+0]; pp[6] = ep[20]; diff --git a/src/celengine/galaxy.cpp b/src/celengine/galaxy.cpp index 58e7af977..1f13a19e0 100644 --- a/src/celengine/galaxy.cpp +++ b/src/celengine/galaxy.cpp @@ -8,14 +8,15 @@ // of the License, or (at your option) any later version. #include -#include -#include -#include -#include +#include #include "celestia.h" +#include "celmath/mathlib.h" +#include "celmath/perlin.h" #include "astro.h" #include "galaxy.h" #include "parser.h" +#include "celutil/util.h" +#include "celutil/debug.h" using namespace std; @@ -128,6 +129,7 @@ void Galaxy::setType(Galaxy::GalaxyType _type) InitializeForms(); switch (type) { + case S0: case Sa: case Sb: case Sc: diff --git a/src/celengine/glext.h b/src/celengine/glext.h index 756249ead..75bc1fb6a 100644 --- a/src/celengine/glext.h +++ b/src/celengine/glext.h @@ -129,7 +129,7 @@ extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB; #endif /* EXT_texture_cube_map defines from */ -#ifndef GL_EXT_texture_cube_map +#if !(defined( GL_EXT_texture_cube_map) || defined(__glext_h_)) #define GL_NORMAL_MAP_EXT ((GLenum) 0x8511) #define GL_REFLECTION_MAP_EXT ((GLenum) 0x8512) #define GL_TEXTURE_CUBE_MAP_EXT ((GLenum) 0x8513) diff --git a/src/celengine/meshmanager.cpp b/src/celengine/meshmanager.cpp index fca06e815..136774358 100644 --- a/src/celengine/meshmanager.cpp +++ b/src/celengine/meshmanager.cpp @@ -10,13 +10,13 @@ #include #include -#include -#include -#include -#include -#include - #include "celestia.h" +#include "celutil/debug.h" +#include "celutil/filetype.h" +#include "celmath/mathlib.h" +#include "celmath/perlin.h" +#include "cel3ds/3dsread.h" + #include "3dsmesh.h" #include "parser.h" #include "spheremesh.h" diff --git a/src/celengine/octree.cpp b/src/celengine/octree.cpp index 643b8c9b3..e5f02eed2 100644 --- a/src/celengine/octree.cpp +++ b/src/celengine/octree.cpp @@ -43,7 +43,7 @@ enum // efficient. In testing, changing splitThreshold from 100 to 50 nearly // doubled the number of nodes in the tree, but provided only between a // 0 to 5 percent frame rate improvement. -static const int splitThreshold = 100; +static const unsigned int splitThreshold = 100; static const float sqrt3 = 1.732050808f; @@ -142,7 +142,7 @@ void DynamicStarOctree::sortStarsIntoChildNodes() { int nBrightStars = 0; - for (int i = 0; i < stars->size(); i++) + for (unsigned int i = 0; i < stars->size(); i++) { const Star* star = (*stars)[i]; if (star->getAbsoluteMagnitude() <= absMag) @@ -243,7 +243,7 @@ void StarOctree::findVisibleStars(StarHandler& starHandler, // Process the stars in this node float dimmest = minDistance > 0 ? astro::appToAbsMag(limitingMag, minDistance) : 1000; - for (int i = 0; i < nStars; i++) + for (unsigned int i = 0; i < nStars; i++) { Star& star = firstStar[i]; if (star.getAbsoluteMagnitude() < dimmest) @@ -294,7 +294,7 @@ void StarOctree::findCloseStars(StarHandler& starHandler, float radiusSquared = radius * radius; // Check all the stars in the node. - for (int i = 0; i < nStars; i++) + for (unsigned int i = 0; i < nStars; i++) { Star& star = firstStar[i]; if (position.distanceToSquared(star.getPosition()) < radiusSquared) diff --git a/src/celengine/orbit.cpp b/src/celengine/orbit.cpp index 5fa5109a9..d880a8d62 100644 --- a/src/celengine/orbit.cpp +++ b/src/celengine/orbit.cpp @@ -39,6 +39,7 @@ EllipticalOrbit::EllipticalOrbit(double _pericenterDistance, // First four terms of a series solution to Kepler's equation // for orbital motion. This only works for small eccentricities, // and in fact the series diverges for e > 0.6627434 +/* currently not used anymore static double solveKeplerSeries(double M, double e) { return (M + @@ -47,7 +48,7 @@ static double solveKeplerSeries(double M, double e) e * e * e * (0.325 * sin(3 * M) - 0.125 * sin(M)) + e * e * e * e * (1.0 / 3.0 * sin(4 * M) - 1.0 / 6.0 * sin(2 * M))); -} +}*/ // Standard iteration for solving Kepler's Equation diff --git a/src/celengine/parser.cpp b/src/celengine/parser.cpp index 84ef3bbad..619acefa1 100644 --- a/src/celengine/parser.cpp +++ b/src/celengine/parser.cpp @@ -52,7 +52,7 @@ Value::~Value() { if (data.a != NULL) { - for (int i = 0; i < data.a->size(); i++) + for (unsigned int i = 0; i < data.a->size(); i++) delete (*data.a)[i]; delete data.a; } diff --git a/src/celengine/render.cpp b/src/celengine/render.cpp index b6880bd40..b25cbc447 100644 --- a/src/celengine/render.cpp +++ b/src/celengine/render.cpp @@ -10,9 +10,12 @@ #include #include #include -#include -#include -#include +#ifndef _WIN32 +#include "config.h" +#endif +#include "celutil/debug.h" +#include "celmath/frustum.h" +#include "celmath/perlin.h" #include "gl.h" #include "astro.h" #include "glext.h" @@ -1812,6 +1815,10 @@ void Renderer::renderPlanet(const Body& body, case StellarClass::Spectral_N: ri.sunColor = Color(1.0f, 0.7f, 0.7f); break; + default: + // Default case to keep gcc from compaining about unhandled + // switch values. + break; } } } @@ -2785,9 +2792,9 @@ Renderer::StarVertexBuffer::StarVertexBuffer(unsigned int _capacity) : // Fill the texture coordinate array now, since it will always have // the same contents. - for (int i = 0; i < capacity; i++) + for (unsigned int i = 0; i < capacity; i++) { - int n = i * 8; + unsigned int n = i * 8; texCoords[n ] = 0; texCoords[n + 1] = 0; texCoords[n + 2] = 1; texCoords[n + 3] = 0; texCoords[n + 4] = 1; texCoords[n + 5] = 1; diff --git a/src/celengine/solarsys.cpp b/src/celengine/solarsys.cpp index 1be2d092d..f7042fa40 100644 --- a/src/celengine/solarsys.cpp +++ b/src/celengine/solarsys.cpp @@ -8,8 +8,11 @@ // of the License, or (at your option) any later version. #include -#include -#include +#ifndef _WIN32 +#include "config.h" +#endif +#include "celutil/debug.h" +#include "celmath/mathlib.h" #include "astro.h" #include "parser.h" #include "customorbit.h" diff --git a/src/celengine/stardb.cpp b/src/celengine/stardb.cpp index 1ce3911b6..5bb6bdcd5 100644 --- a/src/celengine/stardb.cpp +++ b/src/celengine/stardb.cpp @@ -317,7 +317,7 @@ StarDatabase *StarDatabase::read(istream& in) uint32 throwOut = 0; uint32 fixUp = 0; - while (db->nStars < nStars) + while (((unsigned int)db->nStars) < nStars) { uint32 catNo = 0; uint32 hdCatNo = 0; @@ -347,7 +347,7 @@ StarDatabase *StarDatabase::read(istream& in) Star *star = &db->stars[db->nStars]; // Compute distance based on parallax - double distance = 3.26 / (parallax > 0.0 ? parallax / 1000.0 : 1e-6); + double distance = LY_PER_PARSEC / (parallax > 0.0 ? parallax / 1000.0 : 1e-6); star->setPosition(astro::equatorialToCelestialCart(RA, dec, (float) distance)); // Use apparent magnitude and distance to determine the absolute @@ -433,7 +433,7 @@ void StarDatabase::buildIndexes() cout << "Building catalog number indexes . . .\n"; cout.flush(); - for (int whichCatalog = 0; + for (unsigned int whichCatalog = 0; whichCatalog < sizeof(catalogNumberIndexes) / sizeof(catalogNumberIndexes[0]); whichCatalog++) { diff --git a/src/celengine/texmanager.cpp b/src/celengine/texmanager.cpp index 512f74246..5dd977aa9 100644 --- a/src/celengine/texmanager.cpp +++ b/src/celengine/texmanager.cpp @@ -7,8 +7,8 @@ // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. -#include #include "celestia.h" +#include "celutil/debug.h" #include "texmanager.h" using namespace std; diff --git a/src/celengine/texture.cpp b/src/celengine/texture.cpp index 6cf16d573..7076b4cdd 100644 --- a/src/celengine/texture.cpp +++ b/src/celengine/texture.cpp @@ -16,9 +16,13 @@ #include #include -#include -#include -#include +#ifndef _WIN32 +#include "config.h" +#endif + +#include "celmath/vecmath.h" +#include "celutil/filetype.h" +#include "celutil/debug.h" #include "gl.h" #include "glext.h" diff --git a/src/celestia/Makefile.am b/src/celestia/Makefile.am index 8c131990c..2ef1faa39 100644 --- a/src/celestia/Makefile.am +++ b/src/celestia/Makefile.am @@ -15,7 +15,17 @@ COMMONSOURCES = \ favorites.cpp \ imagecapture.cpp +WINSOURCES = \ + wingotodlg.cpp \ + winmain.cpp \ + winssbrowser.cpp \ + winstarbrowser.cpp \ + wintourguide.cpp \ + avicapture.cpp + celestia_SOURCES = $(COMMONSOURCES) $(FRONTENDSOURCE) +EXTRA_celestia_SOURCES = gtkmain.cpp glutmain.cpp $(WINSOURCES) +EXTRA_DIST = Celestia.dsp celestia.mak LDADD = \ ../celengine/libcelengine.a \ @@ -24,6 +34,7 @@ LDADD = \ ../celmath/libcelmath.a \ ../celutil/libcelutil.a +noinst_HEADERS =$(wildcard *.h) noinst_DATA= ../../celestia CLEANFILES= ../../celestia diff --git a/src/celestia/Makefile.in b/src/celestia/Makefile.in index 332ea08ca..fdccfbc64 100644 --- a/src/celestia/Makefile.in +++ b/src/celestia/Makefile.in @@ -68,6 +68,7 @@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ GNOME_CONFIG = @GNOME_CONFIG@ +GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@ GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ GNOME_LIBDIR = @GNOME_LIBDIR@ GNOME_LIBS = @GNOME_LIBS@ @@ -100,11 +101,17 @@ INCLUDES = -I.. COMMONSOURCES = celestiacore.cpp configfile.cpp destination.cpp favorites.cpp imagecapture.cpp +WINSOURCES = wingotodlg.cpp winmain.cpp winssbrowser.cpp winstarbrowser.cpp wintourguide.cpp avicapture.cpp + + celestia_SOURCES = $(COMMONSOURCES) $(FRONTENDSOURCE) +EXTRA_celestia_SOURCES = gtkmain.cpp glutmain.cpp $(WINSOURCES) +EXTRA_DIST = Celestia.dsp celestia.mak LDADD = ../celengine/libcelengine.a ../celtxf/libceltxf.a ../cel3ds/libcel3ds.a ../celmath/libcelmath.a ../celutil/libcelutil.a +noinst_HEADERS = $(wildcard *.h) noinst_DATA = ../../celestia CLEANFILES = ../../celestia mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -136,6 +143,8 @@ CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ DATA = $(noinst_DATA) +HEADERS = $(noinst_HEADERS) + DIST_COMMON = Makefile.am Makefile.in @@ -143,9 +152,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best -DEP_FILES = .deps/celestiacore.P .deps/configfile.P .deps/destination.P \ -.deps/favorites.P .deps/glutmain.P .deps/gtkmain.P .deps/imagecapture.P -SOURCES = $(celestia_SOURCES) +DEP_FILES = .deps/avicapture.P .deps/celestiacore.P .deps/configfile.P \ +.deps/destination.P .deps/favorites.P .deps/glutmain.P .deps/gtkmain.P \ +.deps/imagecapture.P .deps/wingotodlg.P .deps/winmain.P \ +.deps/winssbrowser.P .deps/winstarbrowser.P .deps/wintourguide.P +SOURCES = $(celestia_SOURCES) $(EXTRA_celestia_SOURCES) OBJECTS = $(celestia_OBJECTS) all: all-redirect @@ -325,7 +336,7 @@ install-am: all-am install: install-am uninstall-am: uninstall-binPROGRAMS uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) $(DATA) +all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/src/celestia/glutmain.cpp b/src/celestia/glutmain.cpp index f36873912..9a597ad49 100644 --- a/src/celestia/glutmain.cpp +++ b/src/celestia/glutmain.cpp @@ -17,15 +17,14 @@ #include #include #include -#include "gl.h" +#include "celengine/gl.h" #include -#include "../config.h" -#include "celestia.h" -#include "vecmath.h" -#include "quaternion.h" -#include "util.h" -#include "mathlib.h" -#include "astro.h" +#include "celengine/celestia.h" +#include "celmath/vecmath.h" +#include "celmath/quaternion.h" +#include "celutil/util.h" +#include "celmath/mathlib.h" +#include "celengine/astro.h" #include "celestiacore.h" diff --git a/src/celestia/gtkmain.cpp b/src/celestia/gtkmain.cpp index 2684acc12..4ac11225c 100644 --- a/src/celestia/gtkmain.cpp +++ b/src/celestia/gtkmain.cpp @@ -17,20 +17,20 @@ #include #include #include -#include "gl.h" +#include "celengine/gl.h" #include #include #include #include #include -#include "../config.h" -#include "celestia.h" -#include "vecmath.h" -#include "quaternion.h" -#include "util.h" -#include "mathlib.h" -#include "astro.h" -#include "filetype.h" +#include "celengine/celestia.h" +#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" diff --git a/src/celmath/Makefile.am b/src/celmath/Makefile.am index 87b227ca0..b9f98ff10 100644 --- a/src/celmath/Makefile.am +++ b/src/celmath/Makefile.am @@ -1,4 +1,9 @@ noinst_LIBRARIES = libcelmath.a +noinst_HEADERS = $(wildcard *.h) +dosstuff = celmath.dsp math.mak +noinst_DATA = $(dosstuff) + +EXTRA_DIST = $(noinst_DATA) INCLUDES = -I.. diff --git a/src/celmath/Makefile.in b/src/celmath/Makefile.in index 3cd3950c8..ab7be674a 100644 --- a/src/celmath/Makefile.in +++ b/src/celmath/Makefile.in @@ -68,6 +68,7 @@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ GNOME_CONFIG = @GNOME_CONFIG@ +GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@ GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ GNOME_LIBDIR = @GNOME_LIBDIR@ GNOME_LIBS = @GNOME_LIBS@ @@ -92,6 +93,11 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ noinst_LIBRARIES = libcelmath.a +noinst_HEADERS = $(wildcard *.h) +dosstuff = celmath.dsp math.mak +noinst_DATA = $(dosstuff) + +EXTRA_DIST = $(noinst_DATA) INCLUDES = -I.. @@ -118,6 +124,10 @@ CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +DATA = $(noinst_DATA) + +HEADERS = $(noinst_HEADERS) + DIST_COMMON = Makefile.am Makefile.in @@ -291,7 +301,7 @@ install-am: all-am install: install-am uninstall-am: uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/src/celtxf/Makefile.am b/src/celtxf/Makefile.am index 7ef58f67f..b74481519 100644 --- a/src/celtxf/Makefile.am +++ b/src/celtxf/Makefile.am @@ -1,4 +1,9 @@ noinst_LIBRARIES = libceltxf.a +noinst_HEADERS = $(wildcard *.h) +dosstuff = celtxf.dsp txf.mak +noinst_DATA = $(dosstuff) + +EXTRA_DIST = $(noinst_DATA) INCLUDES = -I.. diff --git a/src/celtxf/Makefile.in b/src/celtxf/Makefile.in index 6cf9e268a..f8173f9d0 100644 --- a/src/celtxf/Makefile.in +++ b/src/celtxf/Makefile.in @@ -68,6 +68,7 @@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ GNOME_CONFIG = @GNOME_CONFIG@ +GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@ GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ GNOME_LIBDIR = @GNOME_LIBDIR@ GNOME_LIBS = @GNOME_LIBS@ @@ -92,6 +93,11 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ noinst_LIBRARIES = libceltxf.a +noinst_HEADERS = $(wildcard *.h) +dosstuff = celtxf.dsp txf.mak +noinst_DATA = $(dosstuff) + +EXTRA_DIST = $(noinst_DATA) INCLUDES = -I.. @@ -118,6 +124,10 @@ CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +DATA = $(noinst_DATA) + +HEADERS = $(noinst_HEADERS) + DIST_COMMON = Makefile.am Makefile.in @@ -291,7 +301,7 @@ install-am: all-am install: install-am uninstall-am: uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/src/celtxf/texturefont.cpp b/src/celtxf/texturefont.cpp index a4643a3de..cb49eea90 100644 --- a/src/celtxf/texturefont.cpp +++ b/src/celtxf/texturefont.cpp @@ -10,9 +10,14 @@ #include #include #include -#include -#include -#include "../celengine/gl.h" + +#ifndef _WIN32 +#include "config.h" +#endif + +#include "celutil/debug.h" +#include "celutil/bytes.h" +#include "celengine/gl.h" #include "texturefont.h" using namespace std; @@ -227,12 +232,13 @@ static uint8 readUint8(istream& in) return x; } +/* Not currently used static int32 readInt32(istream& in, bool swap) { int32 x; in.read(reinterpret_cast(&x), sizeof x); return swap ? static_cast(bswap_32(static_cast(x))) : x; -} +}*/ static int16 readInt16(istream& in, bool swap) { diff --git a/src/celutil/Makefile.am b/src/celutil/Makefile.am index 15dc4ae2c..a41531bee 100644 --- a/src/celutil/Makefile.am +++ b/src/celutil/Makefile.am @@ -1,4 +1,7 @@ noinst_LIBRARIES = libcelutil.a +noinst_HEADERS = $(wildcard *.h) +dosstuff = util.mak celutil.dsp +noinst_DATA = $(dosstuff) libcelutil_a_SOURCES = \ bigfix.cpp \ @@ -7,3 +10,10 @@ libcelutil_a_SOURCES = \ filetype.cpp \ util.cpp \ unixtimer.cpp + +WINSOURCES = \ + wintimer.cpp + +EXTRA_DIST = $(noinst_DATA) + +EXTRA_libcelutil_a_SOURCES= $(WINSOURCES) diff --git a/src/celutil/Makefile.in b/src/celutil/Makefile.in index 3e59a9c46..c6c81be00 100644 --- a/src/celutil/Makefile.in +++ b/src/celutil/Makefile.in @@ -68,6 +68,7 @@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ GNOME_CONFIG = @GNOME_CONFIG@ +GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@ GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ GNOME_LIBDIR = @GNOME_LIBDIR@ GNOME_LIBS = @GNOME_LIBS@ @@ -92,9 +93,19 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ noinst_LIBRARIES = libcelutil.a +noinst_HEADERS = $(wildcard *.h) +dosstuff = util.mak celutil.dsp +noinst_DATA = $(dosstuff) libcelutil_a_SOURCES = bigfix.cpp color.cpp debug.cpp filetype.cpp util.cpp unixtimer.cpp + +WINSOURCES = wintimer.cpp + + +EXTRA_DIST = $(noinst_DATA) + +EXTRA_libcelutil_a_SOURCES = $(WINSOURCES) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = @@ -117,6 +128,10 @@ CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +DATA = $(noinst_DATA) + +HEADERS = $(noinst_HEADERS) + DIST_COMMON = Makefile.am Makefile.in @@ -125,8 +140,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best DEP_FILES = .deps/bigfix.P .deps/color.P .deps/debug.P .deps/filetype.P \ -.deps/unixtimer.P .deps/util.P -SOURCES = $(libcelutil_a_SOURCES) +.deps/unixtimer.P .deps/util.P .deps/wintimer.P +SOURCES = $(libcelutil_a_SOURCES) $(EXTRA_libcelutil_a_SOURCES) OBJECTS = $(libcelutil_a_OBJECTS) all: all-redirect @@ -291,7 +306,7 @@ install-am: all-am install: install-am uninstall-am: uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/src/celutil/debug.cpp b/src/celutil/debug.cpp index b6659dba3..e57a34e84 100644 --- a/src/celutil/debug.cpp +++ b/src/celutil/debug.cpp @@ -12,6 +12,9 @@ #endif #include #include +#ifndef _WIN32 +#include "config.h" +#endif #if defined(DEBUG) || defined(_DEBUG) void DebugPrint(char *format, ...) diff --git a/textures/Makefile.am b/textures/Makefile.am index ba232e682..5d43f51e9 100644 --- a/textures/Makefile.am +++ b/textures/Makefile.am @@ -2,4 +2,4 @@ pkgdatadir = $(datadir)/@PACKAGE@/textures pkgdata_DATA = $(wildcard *.jpg) $(wildcard *.png) -DIST = $(pkgdata_DATA) +EXTRA_DIST = $(pkgdata_DATA)