spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Autoconf distribute extension & bugfixes

ver1_5_1
Deon Ramsey 2001-12-18 23:00:26 +00:00
parent 54924c5762
commit 2218b95a72
73 changed files with 4154 additions and 2007 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -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)

12
INSTALL
View File

@ -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

14
Makefile.am
View File

@ -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

15
Makefile.in
View File

@ -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:

4
acconfig.h
View File

@ -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

776
aclocal.m4 vendored
View File

@ -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 <gtk/gtkfeatures.h>
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 <gtk/gtkfeatures.h>
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

7
config.h.in
View File

@ -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 <byteswap.h> 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

2728
configure vendored
View File

File diff suppressed because it is too large Load Diff

117
configure.in
View File

@ -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()

2
data/Makefile.am
View File

@ -2,4 +2,4 @@ pkgdatadir = $(datadir)/@PACKAGE@/data
pkgdata_DATA = $(wildcard *.ssc) $(wildcard *.dat)
DIST = $(pkgdata_DATA)
EXTRA_DIST = $(pkgdata_DATA)

15
devguide.txt
View File

@ -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

2
fonts/Makefile.am
View File

@ -2,4 +2,4 @@ pkgdatadir = $(datadir)/@PACKAGE@/fonts
pkgdata_DATA = $(wildcard *.txf)
DIST = $(pkgdata_DATA)
EXTRA_DIST = $(pkgdata_DATA)

1102
macros/ChangeLog 100644
View File

File diff suppressed because it is too large Load Diff

88
macros/Makefile
View File

@ -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 <locale.h>
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 \

10
macros/Makefile.am
View File

@ -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

52
macros/Makefile.in
View File

@ -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 \

106
macros/autogen.sh
View File

@ -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

4
macros/compiler-flags.m4
View File

@ -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

18
macros/curses.m4
View File

@ -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")

24
macros/gnome-bonobo-check.m4
View File

@ -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 <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <bonobo/gnome-object.h>
#include <bonobo.h>
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")
])

4
macros/gnome-common.m4
View File

@ -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"
])

8
macros/gnome-gettext.m4
View File

@ -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

2
macros/gnome-ghttp-check.m4
View File

@ -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])
])

55
macros/gnome-libgtop-check.m4
View File

@ -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 <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
/* For Tru64 */
#ifdef HAVE_SYS_BITYPES_H
#include <sys/bitypes.h>
#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

8
macros/gnome-objc-checks.m4
View File

@ -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],

180
macros/gnome-print-check.m4
View File

@ -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 <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <libgnomeprint/gnome-print.h>
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, &micro) != 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 <stdio.h>
#include <libgnomeprint/gnome-print.h>
], [ 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)])
])

2
macros/gnome-vfs.m4
View File

@ -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"

4
macros/gnome-xml-check.m4
View File

@ -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], [

4
macros/gnome.m4
View File

@ -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`

79
macros/gperf-check.m4 100644
View File

@ -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 <stdio.h>
#include <stdlib.h>
#include <string.h>
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
])

2
macros/linger.m4
View File

@ -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([

4
macros/need-declaration.m4
View File

@ -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)

5
manual/Makefile.am 100644
View File

@ -0,0 +1,5 @@
pkgdatadir = $(datadir)/@PACKAGE@/manual
pkgdata_DATA = $(wildcard *.html) $(wildcard *.css)
EXTRA_DIST = $(pkgdata_DATA)

226
manual/Makefile.in 100644
View File

@ -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:

2
models/Makefile.am
View File

@ -2,4 +2,4 @@ pkgdatadir = $(datadir)/@PACKAGE@/models
pkgdata_DATA = $(wildcard *.3ds) $(wildcard *.cms)
DIST = $(pkgdata_DATA)
EXTRA_DIST = $(pkgdata_DATA)

7
src/Makefile.am
View File

@ -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

158
src/Makefile.in
View File

@ -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.

2
src/buildstardb.cpp
View File

@ -15,7 +15,7 @@
#include <fstream>
#include <cstdio>
#include <assert.h>
#include "stardb.h"
#include "celengine/stardb.h"
using namespace std;

4
src/cel3ds/3dsmodel.cpp
View File

@ -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];

12
src/cel3ds/3dsread.cpp
View File

@ -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);
}

6
src/cel3ds/Makefile.am
View File

@ -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

12
src/cel3ds/Makefile.in
View File

@ -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

6
src/celengine/Makefile.am
View File

@ -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..

12
src/celengine/Makefile.in
View File

@ -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

5
src/celengine/asterism.cpp
View File

@ -8,8 +8,9 @@
// of the License, or (at your option) any later version.
#include <algorithm>
#include <celutil/util.h>
#include <celutil/debug.h>
#include "config.h"
#include "celutil/util.h"
#include "celutil/debug.h"
#include "parser.h"
#include "asterism.h"

2
src/celengine/astro.h
View File

@ -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)

4
src/celengine/celestia.h
View File

@ -25,5 +25,9 @@
#define NONSTANDARD_STRING_COMPARE
#endif // __GNUC__
#ifndef _WIN32
#include "config.h"
#endif
#endif // _CELESTIA_H_

6
src/celengine/cmdparser.cpp
View File

@ -20,9 +20,9 @@
#include <strstream>
#endif // HAVE_SSTREAM
#include <celutil/util.h>
#include <celutil/debug.h>
#include <celmath/mathlib.h>
#include "celutil/util.h"
#include "celutil/debug.h"
#include "celmath/mathlib.h"
#include "astro.h"
#include "cmdparser.h"

6
src/celengine/customorbit.cpp
View File

@ -223,9 +223,9 @@ void computePlanetElements(double t, vector<int> 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<int> 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];

10
src/celengine/galaxy.cpp
View File

@ -8,14 +8,15 @@
// of the License, or (at your option) any later version.
#include <algorithm>
#include <celutil/util.h>
#include <celutil/debug.h>
#include <celmath/mathlib.h>
#include <celmath/perlin.h>
#include <stdio.h>
#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:

2
src/celengine/glext.h
View File

@ -129,7 +129,7 @@ extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB;
#endif
/* EXT_texture_cube_map defines from <GL/gl.h> */
#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)

12
src/celengine/meshmanager.cpp
View File

@ -10,13 +10,13 @@
#include <iostream>
#include <fstream>
#include <celutil/debug.h>
#include <celutil/filetype.h>
#include <celmath/mathlib.h>
#include <celmath/perlin.h>
#include <cel3ds/3dsread.h>
#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"

8
src/celengine/octree.cpp
View File

@ -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)

3
src/celengine/orbit.cpp
View File

@ -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

2
src/celengine/parser.cpp
View File

@ -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;
}

17
src/celengine/render.cpp
View File

@ -10,9 +10,12 @@
#include <algorithm>
#include <cstdio>
#include <cstring>
#include <celutil/debug.h>
#include <celmath/frustum.h>
#include <celmath/perlin.h>
#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;

7
src/celengine/solarsys.cpp
View File

@ -8,8 +8,11 @@
// of the License, or (at your option) any later version.
#include <cassert>
#include <celutil/debug.h>
#include <celmath/mathlib.h>
#ifndef _WIN32
#include "config.h"
#endif
#include "celutil/debug.h"
#include "celmath/mathlib.h"
#include "astro.h"
#include "parser.h"
#include "customorbit.h"

6
src/celengine/stardb.cpp
View File

@ -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++)
{

2
src/celengine/texmanager.cpp
View File

@ -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 <celutil/debug.h>
#include "celestia.h"
#include "celutil/debug.h"
#include "texmanager.h"
using namespace std;

10
src/celengine/texture.cpp
View File

@ -16,9 +16,13 @@
#include <cstdlib>
#include <cstdio>
#include <celmath/vecmath.h>
#include <celutil/filetype.h>
#include <celutil/debug.h>
#ifndef _WIN32
#include "config.h"
#endif
#include "celmath/vecmath.h"
#include "celutil/filetype.h"
#include "celutil/debug.h"
#include "gl.h"
#include "glext.h"

11
src/celestia/Makefile.am
View File

@ -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

19
src/celestia/Makefile.in
View File

@ -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

15
src/celestia/glutmain.cpp
View File

@ -17,15 +17,14 @@
#include <cstring>
#include <time.h>
#include <unistd.h>
#include "gl.h"
#include "celengine/gl.h"
#include <GL/glut.h>
#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"

18
src/celestia/gtkmain.cpp
View File

@ -17,20 +17,20 @@
#include <cstring>
#include <time.h>
#include <unistd.h>
#include "gl.h"
#include "celengine/gl.h"
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include <gtkgl/gtkglarea.h>
#include <gnome.h>
#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"

5
src/celmath/Makefile.am
View File

@ -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..

12
src/celmath/Makefile.in
View File

@ -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

5
src/celtxf/Makefile.am
View File

@ -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..

12
src/celtxf/Makefile.in
View File

@ -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

14
src/celtxf/texturefont.cpp
View File

@ -10,9 +10,14 @@
#include <cassert>
#include <cstring>
#include <fstream>
#include <celutil/debug.h>
#include <celutil/bytes.h>
#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<char*>(&x), sizeof x);
return swap ? static_cast<int32>(bswap_32(static_cast<uint32>(x))) : x;
}
}*/
static int16 readInt16(istream& in, bool swap)
{

10
src/celutil/Makefile.am
View File

@ -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)

21
src/celutil/Makefile.in
View File

@ -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

3
src/celutil/debug.cpp
View File

@ -12,6 +12,9 @@
#endif
#include <stdio.h>
#include <cstdarg>
#ifndef _WIN32
#include "config.h"
#endif
#if defined(DEBUG) || defined(_DEBUG)
void DebugPrint(char *format, ...)

2
textures/Makefile.am
View File

@ -2,4 +2,4 @@ pkgdatadir = $(datadir)/@PACKAGE@/textures
pkgdata_DATA = $(wildcard *.jpg) $(wildcard *.png)
DIST = $(pkgdata_DATA)
EXTRA_DIST = $(pkgdata_DATA)