New build system
Christophe Teyssier
parent
157bab3c8d
commit
d84c0a48fa
29
Makefile.am
29
Makefile.am
|
|
@ -7,10 +7,25 @@ EXTRA_DIST = $(pkgdata_DATA) $(noinst_DATA) admin
|
|||
|
||||
SUBDIRS = src data extras textures models shaders fonts 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
|
||||
|
||||
# From KDE app template
|
||||
|
||||
# We already have a configure.in file, we don't build it from configure.in.in
|
||||
#$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
|
||||
# cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
|
||||
|
||||
$(top_srcdir)/subdirs:
|
||||
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
|
||||
|
||||
$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
|
||||
@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
|
||||
|
||||
MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4
|
||||
|
||||
package-messages:
|
||||
$(MAKE) -f admin/Makefile.common package-messages
|
||||
$(MAKE) -C po merge
|
||||
|
||||
dist-hook:
|
||||
cd $(top_distdir) && perl admin/am_edit -padmin
|
||||
cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
all:
|
||||
@echo "This Makefile is only for the CVS repository"
|
||||
@echo "This will be deleted before making the distribution"
|
||||
@echo ""
|
||||
$(MAKE) -f admin/Makefile.common cvs
|
||||
|
||||
dist:
|
||||
$(MAKE) -f admin/Makefile.common dist
|
||||
|
||||
.SILENT:
|
||||
10978
acinclude.m4
10978
acinclude.m4
File diff suppressed because it is too large
Load Diff
|
|
@ -1,3 +1,7 @@
|
|||
2002-10-03 Stephan Kulow <coolo@kde.org>
|
||||
|
||||
* made config.h.bot obsolete
|
||||
|
||||
2002-04-26 Stephan Kulow <coolo@kde.org>
|
||||
|
||||
* acinclude.m4.in removed bogus message
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ apidox-am-yes:
|
|||
fi ;\
|
||||
cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \
|
||||
echo "PROJECT_NAME = \"$(subdir) Library\"" >> Doxyfile; \
|
||||
echo "PROJECT_NUMBER = \"Version $(VERSION)\"" >> Doxyfile; \
|
||||
echo "INPUT = $(srcdir)" >> Doxyfile; \
|
||||
echo "IMAGE_PATH = $(top_srcdir)/doc/api" >> Doxyfile ;\
|
||||
echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile; \
|
||||
|
|
@ -56,7 +57,6 @@ install-data-local: install-apidox
|
|||
|
||||
## install API documentation
|
||||
install-apidox:
|
||||
echo "$(subdir)"
|
||||
@if test "$(subdir)" != "."; then \
|
||||
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html ; \
|
||||
if test -f $(top_builddir)/apidocs/$(subdir)/$(subdir).tag; then \
|
||||
|
|
@ -73,6 +73,7 @@ install-apidox:
|
|||
rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \
|
||||
$(LN_S) $(kde_libs_htmldir)/en/common $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \
|
||||
else\
|
||||
if test -d $(top_builddir)/apidocs; then \
|
||||
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\
|
||||
list=`cd $(top_builddir)/apidocs && ls -1`; \
|
||||
for file in $$list; do \
|
||||
|
|
@ -80,7 +81,7 @@ install-apidox:
|
|||
echo $(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
|
||||
$(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
|
||||
fi; \
|
||||
done ;\
|
||||
done ; fi; \
|
||||
fi
|
||||
|
||||
uninstall-local: uninstall-apidox
|
||||
|
|
@ -121,6 +122,7 @@ apidox:
|
|||
done; \
|
||||
fi
|
||||
|
||||
apidox-am-toplevel-no:
|
||||
apidox-am-toplevel-yes:
|
||||
@echo "*** Creating API documentation main page"; \
|
||||
cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
install-data-local:
|
||||
$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kapptemplate/admin
|
||||
for file in $(srcdir)/*; do \
|
||||
if [ -f $$file -a $$file != 'Makefile' -a $$file != 'Makefile.in' -a $$file != 'Makefile.am' ]; then \
|
||||
destfile=`basename $$file` \
|
||||
$(INSTALL_DATA) $$file \
|
||||
$(DESTDIR)$(kde_datadir)/kapptemplate/admin/$$destfile; \
|
||||
fi \
|
||||
done
|
||||
|
||||
uninstall-local:
|
||||
-/bin/rm -rf $(DESTDIR)$(kde_datadir)/kapptemplate/admin
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
SHELL=/bin/sh
|
||||
|
||||
cvs dist cvs-clean configure.in configure.files subdirs package-messages:
|
||||
cvs dist cvs-clean configure.in configure.files subdirs package-messages package-merge:
|
||||
@admindir=$(admindir); \
|
||||
if test "x$$admindir" = x; then \
|
||||
admindir=.; until test -f $$admindir/admin/cvs.sh; do \
|
||||
|
|
@ -20,14 +20,15 @@ cvs dist cvs-clean configure.in configure.files subdirs package-messages:
|
|||
exit 1; \
|
||||
fi; \
|
||||
fi; \
|
||||
MAKE=$(MAKE) $(SHELL) $$admindir/cvs.sh $@
|
||||
if test "$@" = "package-merge"; then \
|
||||
MAKE=$(MAKE) POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \
|
||||
$(SHELL) $$admindir/cvs.sh package-merge ;\
|
||||
else MAKE=$(MAKE) $(SHELL) $$admindir/cvs.sh $@ ;\
|
||||
fi
|
||||
|
||||
package-merge:
|
||||
@MAKE=$(MAKE) POFILES=$(POFILES) PACKAGE=$(PACKAGE) \
|
||||
$(SHELL) admin/cvs.sh package-merge
|
||||
|
||||
configure.in: configure.files $(shell test -f configure.files && cat configure.files) subdirs
|
||||
configure.files: subdirs
|
||||
# Celestia, we don't build configure.in from configure.in.in
|
||||
# configure.in: configure.files $(shell test -f configure.files && cat configure.files) subdirs
|
||||
# configure.files: subdirs
|
||||
|
||||
.SILENT:
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -18,7 +18,7 @@
|
|||
# KDE_ICON = AUTO
|
||||
#
|
||||
# For documentation :
|
||||
# ...
|
||||
# http://developer.kde.org/documentation/other/developer-faq.html
|
||||
#
|
||||
# and more new tags TBD!
|
||||
#
|
||||
|
|
@ -363,12 +363,21 @@ sub processMakefile ($)
|
|||
if ($MakefileData =~ /\n$lookup\n/o) {
|
||||
my $condition = $1;
|
||||
my $depfiles = $2;
|
||||
my $workfiles;
|
||||
|
||||
if ($dep_finals) {
|
||||
$lines = "$condition\@KDE_USE_FINAL_TRUE\@DEP_FILES = $dep_files $dep_finals $depfiles\n";
|
||||
$lines .= "$condition\@KDE_USE_FINAL_FALSE\@DEP_FILES = $dep_files $depfiles\n";
|
||||
# Add the conditions on every line, since
|
||||
# there may be line continuations in the list.
|
||||
$workfiles = "$dep_files $dep_finals $depfiles";
|
||||
$workfiles =~ s/\034/\034$condition\@KDE_USE_FINAL_TRUE\@\t/g;
|
||||
$lines = "$condition\@KDE_USE_FINAL_TRUE\@DEP_FILES = $workfiles\n";
|
||||
$workfiles = "$dep_files $depfiles";
|
||||
$workfiles =~ s/\034/\034$condition\@KDE_USE_FINAL_FALSE\@\t/g;
|
||||
$lines .= "$condition\@KDE_USE_FINAL_FALSE\@DEP_FILES = $workfiles\n";
|
||||
} else {
|
||||
$lines = $condition . "DEP_FILES = $dep_files $depfiles\n";
|
||||
$workfiles = "$dep_files $depfiles";
|
||||
$workfiles =~ s/\034/\034$condition\t/g;
|
||||
$lines = $condition . "DEP_FILES = $workfiles\n";
|
||||
}
|
||||
substituteLine($lookup, $lines);
|
||||
}
|
||||
|
|
@ -388,7 +397,14 @@ sub processMakefile ($)
|
|||
# all modules are installed. automake doesn't know this, so we need to move
|
||||
# this here from install-data to install-exec.
|
||||
if ($MakefileData =~ m/\nkde_module_LTLIBRARIES\s*=/) {
|
||||
$target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES ";
|
||||
# $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES ";
|
||||
# don't use $target_adds here because we need to append the dependency, not
|
||||
# prepend it. Fixes #44342 , when a module depends on a lib in the same dir
|
||||
# and libtool needs it during relinking upon install (Simon)
|
||||
my $lookup = "install-exec-am:([^\n]*)";
|
||||
if($MakefileData =~ /\n$lookup\n/) {
|
||||
substituteLine("$lookup", "install-exec-am: $1 install-kde_moduleLTLIBRARIES");
|
||||
}
|
||||
$target_dels{"install-data-am"} .= "install-kde_moduleLTLIBRARIES ";
|
||||
$target_adds{"install-data-am"} .= " ";
|
||||
}
|
||||
|
|
@ -494,7 +510,9 @@ sub initialise ()
|
|||
|
||||
# Remove the line continuations, but keep them marked
|
||||
# Note: we lose the trailing spaces but that's ok.
|
||||
$MakefileData =~ s/\\\s*\n\s*/\034/g;
|
||||
# Don't mangle line-leading spaces (usually tabs)
|
||||
# since they're important.
|
||||
$MakefileData =~ s/\\\s*\n/\034/g;
|
||||
|
||||
# If we've processed the file before...
|
||||
restoreMakefile () if ($MakefileData =~ /$progId/);
|
||||
|
|
@ -595,7 +613,7 @@ sub initialise ()
|
|||
}
|
||||
|
||||
my $realprogram = $program;
|
||||
$realprogram =~ s/_/\\./g; # unmask to regexp
|
||||
$realprogram =~ s/_/./g; # unmask to regexp
|
||||
if ($MakefileData =~ /\n($realprogram)(\$\(EXEEXT\)?)?:.*\$\($program\_OBJECTS\)/) {
|
||||
$realname{$program} = $1;
|
||||
} else {
|
||||
|
|
@ -694,7 +712,7 @@ sub tag_FINAL()
|
|||
my ($dir, $hFile, $cppFile) = split ("\035", $globalmocs{$mocFile}, 3);
|
||||
if (defined ($cppFile)) {
|
||||
$mocs .= " $mocFile.moc" if exists $shash{$cppFile};
|
||||
} elsif (grep(/^$mocFile\.$cppExt$/, @progsources)) {
|
||||
} else {
|
||||
$sourcelist{$cxxsuffix} .= "$mocFile.moc.$cxxsuffix ";
|
||||
$moc_cpp_added = 1;
|
||||
}
|
||||
|
|
@ -742,7 +760,7 @@ sub tag_FINAL()
|
|||
}
|
||||
}
|
||||
|
||||
$handling = "$program.all_$suffix.$suffix: \$(srcdir)/Makefile.in $source_deps $mocs\n";
|
||||
$handling = "$program.all_$suffix.$suffix: \$(srcdir)/Makefile.in" . $source_deps . " " . join(' ', $mocs) . "\n";
|
||||
$handling .= "\t\@echo 'creating $program.all_$suffix.$suffix ...'; \\\n";
|
||||
$handling .= "\trm -f $program.all_$suffix.files $program.all_$suffix.final; \\\n";
|
||||
$handling .= "\techo \"#define KDE_USE_FINAL 1\" >> $program.all_$suffix.final; \\\n";
|
||||
|
|
@ -1115,11 +1133,13 @@ sub tag_UIFILES ()
|
|||
$dep_lines .= "\techo '#include <klocale.h>' > $source.$cxxsuffix\n";
|
||||
my ($mangled_source) = $source;
|
||||
$mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage
|
||||
$dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui | sed -e \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" | sed -e \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | sed -e \"s,image\\([0-9][0-9]*\\)_data,img\\1_" . $mangled_source . ",g\" >> $source.$cxxsuffix || rm -f $source.$cxxsuffix\n";
|
||||
$dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n";
|
||||
$dep_lines .= "\tsed -e \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" $source.$cxxsuffix.temp | sed -e \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | sed -e \"s,image\\([0-9][0-9]*\\)_data,img\\1_" . $mangled_source . ",g\" >> $source.$cxxsuffix ;\\\n";
|
||||
$dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n";
|
||||
} else {
|
||||
$dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix || rm -f $source.$cxxsuffix\n";
|
||||
$dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix; ret=\$\$?; \\\n";
|
||||
}
|
||||
$dep_lines .= "\techo '#include \"$source.moc\"' >> $source.$cxxsuffix\n\n";
|
||||
$dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include \"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit \$\$ret ; fi\n\n";
|
||||
$dep_lines .= "$source.h: $sourcedir$source.ui\n";
|
||||
$dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n\n";
|
||||
$dep_lines .= "$source.moc: $source.h\n";
|
||||
|
|
@ -1243,13 +1263,15 @@ sub tag_ICON()
|
|||
'hi32' => 'hicolor/32x32',
|
||||
'hi48' => 'hicolor/48x48',
|
||||
'hi64' => 'hicolor/64x64',
|
||||
'hi128' => 'hicolor/128x128',
|
||||
'hisc' => 'hicolor/scalable',
|
||||
'cr16' => 'crystal/16x16',
|
||||
'cr22' => 'crystal/22x22',
|
||||
'cr32' => 'crystal/32x32',
|
||||
'cr48' => 'crystal/48x48',
|
||||
'cr64' => 'crystal/64x64',
|
||||
'crsc' => 'crystal/scalable'
|
||||
'cr16' => 'crystalsvg/16x16',
|
||||
'cr22' => 'crystalsvg/22x22',
|
||||
'cr32' => 'crystalsvg/32x32',
|
||||
'cr48' => 'crystalsvg/48x48',
|
||||
'cr64' => 'crystalsvg/64x64',
|
||||
'cr128' => 'crystalsvg/128x128',
|
||||
'crsc' => 'crystalsvg/scalable'
|
||||
);
|
||||
|
||||
$newfile =~ s@.*-($appname\.(png|xpm|mng|svgz|svg?))@$1@;
|
||||
|
|
@ -1341,11 +1363,15 @@ sub handle_POFILES($$)
|
|||
$tmp .= "; do \\\n";
|
||||
if ($lang) {
|
||||
$tmp .= "\t echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n";
|
||||
$tmp .= "\t test ! -f \$\$base.gmo || \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n"
|
||||
$tmp .= "\t if test -f \$\$base.gmo; then \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n";
|
||||
$tmp .= "\t elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n";
|
||||
$tmp .= "\t fi ;\\\n";
|
||||
} else {
|
||||
$tmp .= "\t echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
|
||||
$tmp .= "\t \$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES ; \\\n";
|
||||
$tmp .= "\t test ! -f \$\$base.gmo || \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
|
||||
$tmp .= "\t if test -f \$\$base.gmo; then \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
|
||||
$tmp .= "\t elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
|
||||
$tmp .= "\t fi ;\\\n";
|
||||
}
|
||||
$tmp .= "\tdone\n\n";
|
||||
appendLines ($tmp);
|
||||
|
|
@ -1497,6 +1523,7 @@ sub tag_CLOSURE () {
|
|||
print STDERR "Report: $program contains undefined in $printname\n" if ($program =~ /^lib/ && $dryrun);
|
||||
return;
|
||||
}
|
||||
|
||||
my $closure = $realname{$program} . ".closure";
|
||||
my $lines = "$closure: \$($program\_OBJECTS) \$($program\_DEPENDENCIES)\n";
|
||||
$lines .= "\t\@echo \"int main() {return 0;}\" > $program\_closure.$cxxsuffix\n";
|
||||
|
|
@ -1590,7 +1617,7 @@ sub tag_DOCFILES ()
|
|||
{
|
||||
opendir (THISDIR, ".");
|
||||
foreach $entry (readdir(THISDIR)) {
|
||||
next if ($entry eq "CVS" || $entry =~ /^\./ || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/ || $entry eq "core");
|
||||
next if ($entry eq "CVS" || $entry =~ /^\./ || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/ || $entry eq "core" || $entry eq "index.cache.bz2");
|
||||
next if (! -f $entry);
|
||||
$files .= "$entry ";
|
||||
}
|
||||
|
|
@ -1630,6 +1657,9 @@ sub tag_DOCFILES ()
|
|||
$lines .= "\t\@if test -f index.cache.bz2; then \\\n";
|
||||
$lines .= "\techo \$(INSTALL_DATA) index.cache.bz2 \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/; \\\n";
|
||||
$lines .= "\t\$(INSTALL_DATA) index.cache.bz2 \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/; \\\n";
|
||||
$lines .= "\telif test -f \$(srcdir)/index.cache.bz2; then \\\n";
|
||||
$lines .= "\techo \$(INSTALL_DATA) \$(srcdir)/index.cache.bz2 \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/; \\\n";
|
||||
$lines .= "\t\$(INSTALL_DATA) \$(srcdir)/index.cache.bz2 \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/; \\\n";
|
||||
$lines .= "\tfi\n";
|
||||
$lines .= "\t-rm -f \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
|
||||
$lines .= "\t\$(LN_S) \$(kde_libs_htmldir)/$kdelang/common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
|
||||
|
|
@ -1881,7 +1911,6 @@ sub make_meta_classes ()
|
|||
foreach my $mocFile (keys (%globalmocs))
|
||||
{
|
||||
my ($dir, $hFile, $cppFile) = split ("\035", $globalmocs{$mocFile}, 3);
|
||||
|
||||
if (defined ($cppFile))
|
||||
{
|
||||
$mocs .= " $mocFile.moc" if exists $shash{$cppFile};
|
||||
|
|
@ -1920,10 +1949,10 @@ sub updateMakefile ()
|
|||
open (FILEOUT, "> $makefile")
|
||||
|| die "Could not create $makefile: $!\n";
|
||||
|
||||
$MakefileData =~ s/\034/\\\n\t/g; # Restore continuation lines
|
||||
$MakefileData =~ s/\034/\\\n/g; # Restore continuation lines
|
||||
# Append our $progId line, _below_ the "generated by automake" line
|
||||
# because automake-1.6 relies on the first line to be his own.
|
||||
my $progIdLine = "\# $progId - " . '$Revision: 1.1 $ '."\n";
|
||||
my $progIdLine = "\# $progId - " . '$Revision: 1.2 $ '."\n";
|
||||
if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
|
||||
warn "automake line not found in $makefile\n";
|
||||
# Fallback: first line
|
||||
|
|
@ -1957,7 +1986,7 @@ sub substituteLine ($$)
|
|||
if ($MakefileData =~ /\n($lookup)/) {
|
||||
$old = $1;
|
||||
$old =~ s/\034/\\\n#>\- /g; # Fix continuation lines
|
||||
$new =~ s/\034/\\\n\t/g;
|
||||
$new =~ s/\034/\\\n/g;
|
||||
my $newCount = ($new =~ tr/\n//) + 1;
|
||||
$MakefileData =~ s/\n$lookup/\n#>- $old\n#>\+ $newCount\n$new/;
|
||||
} else {
|
||||
|
|
@ -1971,7 +2000,7 @@ sub substituteLine ($$)
|
|||
sub appendLines ($)
|
||||
{
|
||||
my ($new) = @_;
|
||||
$new =~ s/\034/\\\n\t/g; # Fix continuation lines
|
||||
$new =~ s/\034/\\\n/g; # Fix continuation lines
|
||||
my $newCount = ($new =~ tr/\n//) + 1;
|
||||
$MakefileData .= "\n#>\+ $newCount\n$new";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,99 @@
|
|||
#! /bin/sh
|
||||
|
||||
# Wrapper for compilers which do not understand `-c -o'.
|
||||
|
||||
# Copyright 1999, 2000 Free Software Foundation, Inc.
|
||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# Usage:
|
||||
# compile PROGRAM [ARGS]...
|
||||
# `-o FOO.o' is removed from the args passed to the actual compile.
|
||||
|
||||
prog=$1
|
||||
shift
|
||||
|
||||
ofile=
|
||||
cfile=
|
||||
args=
|
||||
while test $# -gt 0; do
|
||||
case "$1" in
|
||||
-o)
|
||||
# configure might choose to run compile as `compile cc -o foo foo.c'.
|
||||
# So we do something ugly here.
|
||||
ofile=$2
|
||||
shift
|
||||
case "$ofile" in
|
||||
*.o | *.obj)
|
||||
;;
|
||||
*)
|
||||
args="$args -o $ofile"
|
||||
ofile=
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*.c)
|
||||
cfile=$1
|
||||
args="$args $1"
|
||||
;;
|
||||
*)
|
||||
args="$args $1"
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if test -z "$ofile" || test -z "$cfile"; then
|
||||
# If no `-o' option was seen then we might have been invoked from a
|
||||
# pattern rule where we don't need one. That is ok -- this is a
|
||||
# normal compilation that the losing compiler can handle. If no
|
||||
# `.c' file was seen then we are probably linking. That is also
|
||||
# ok.
|
||||
exec "$prog" $args
|
||||
fi
|
||||
|
||||
# Name of file we expect compiler to create.
|
||||
cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
|
||||
|
||||
# Create the lock directory.
|
||||
# Note: use `[/.-]' here to ensure that we don't use the same name
|
||||
# that we are using for the .o file. Also, base the name on the expected
|
||||
# object file name, since that is what matters with a parallel build.
|
||||
lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
|
||||
while true; do
|
||||
if mkdir $lockdir > /dev/null 2>&1; then
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
# FIXME: race condition here if user kills between mkdir and trap.
|
||||
trap "rmdir $lockdir; exit 1" 1 2 15
|
||||
|
||||
# Run the compile.
|
||||
"$prog" $args
|
||||
status=$?
|
||||
|
||||
if test -f "$cofile"; then
|
||||
mv "$cofile" "$ofile"
|
||||
fi
|
||||
|
||||
rmdir $lockdir
|
||||
exit $status
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -52,11 +52,11 @@ chomp @subs;
|
|||
if ($bad_perl) {
|
||||
print "Using perl older than version 5.005\n";
|
||||
foreach my $pat (@subs) {
|
||||
if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ )
|
||||
|| ($pat =~ m%/([^/]*)/([^/]*)/g% )
|
||||
|| ($pat =~ /s%([^%]*)%([^%]*)%;t/ )
|
||||
|| ($pat =~ m%/([^/]*)/([^/]*)/;t% )
|
||||
|| ($pat =~ /s,([^,]*),(.*),;t/)
|
||||
if ( ($pat =~ m/s%([^%]*)%([^%]*)%g/ )
|
||||
|| ($pat =~ m/s%([^%]*)%([^%]*)%;t/ )
|
||||
|| ($pat =~ m/s,([^,]*),(.*),;t/)
|
||||
|| ($pat =~ m%s/([^/]*)/([^/]*)/g% )
|
||||
|| ($pat =~ m%s/([^/]*)/([^/]*)/;t% )
|
||||
) {
|
||||
# form : s%bla%blubb%g
|
||||
# or s%bla%blubb%;t t (autoconf > 2.13 and < 2.52 ?)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,12 @@
|
|||
if test "$all_tests" = "bad"; then
|
||||
if test ! "$cache_file" = "/dev/null"; then
|
||||
echo ""
|
||||
echo "Please remove the file $cache_file after changing your setup"
|
||||
echo "so that configure will find the changes next time."
|
||||
echo ""
|
||||
fi
|
||||
else
|
||||
echo ""
|
||||
echo "Good - your configure finished. Start make now"
|
||||
echo ""
|
||||
fi
|
||||
33
admin/cvs.sh
33
admin/cvs.sh
|
|
@ -32,12 +32,12 @@ case $AUTOCONF_VERSION in
|
|||
Autoconf*2.5* | autoconf*2.5* ) : ;;
|
||||
"" )
|
||||
echo "*** AUTOCONF NOT FOUND!."
|
||||
echo "*** KDE requires autoconf 2.52 or 2.53"
|
||||
echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
|
||||
exit 1
|
||||
;;
|
||||
* )
|
||||
echo "*** YOU'RE USING $AUTOCONF_VERSION."
|
||||
echo "*** KDE requires autoconf 2.52 or 2.53"
|
||||
echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
|
@ -64,7 +64,7 @@ case $AUTOMAKE_STRING in
|
|||
echo "*** KDE requires automake 1.5"
|
||||
exit 1
|
||||
;;
|
||||
automake*1.5* | automake*1.5-* | automake*1.6.* ) : ;;
|
||||
automake*1.5* | automake*1.5-* | automake*1.6.* | automake*1.7* ) : ;;
|
||||
"" )
|
||||
echo "*** AUTOMAKE NOT FOUND!."
|
||||
echo "*** KDE requires automake 1.5"
|
||||
|
|
@ -122,12 +122,12 @@ echo "*** Creating Makefile templates"
|
|||
$AUTOMAKE || exit 1
|
||||
if test -z "$UNSERMAKE"; then
|
||||
echo "*** Postprocessing Makefile templates"
|
||||
perl admin/am_edit || exit 1
|
||||
perl -w admin/am_edit || exit 1
|
||||
fi
|
||||
|
||||
if egrep "^cvs-local:" $makefile_am >/dev/null; then \
|
||||
strip_makefile
|
||||
$MAKE -f $makefile_wo cvs-local || exit 1
|
||||
$MAKE -f $makefile_wo cvs-local top_srcdir=. || exit 1
|
||||
fi
|
||||
|
||||
echo "*** Creating date/time stamp"
|
||||
|
|
@ -158,12 +158,12 @@ fi
|
|||
$ACLOCAL
|
||||
$AUTOHEADER
|
||||
$AUTOMAKE --foreign --include-deps
|
||||
perl admin/am_edit
|
||||
perl -w admin/am_edit
|
||||
call_and_fix_autoconf
|
||||
touch stamp-h.in
|
||||
if grep "^cvs-local:" $makefile_am >/dev/null; then
|
||||
strip_makefile
|
||||
$MAKE -f $makefile_wo cvs-local
|
||||
$MAKE -f $makefile_wo cvs-local top_srcdir=.
|
||||
fi
|
||||
|
||||
###
|
||||
|
|
@ -178,7 +178,7 @@ if test -d po; then
|
|||
fi
|
||||
if grep "^cvs-dist-local:" $makefile_am >/dev/null; then
|
||||
strip_makefile
|
||||
$MAKE -f $makefile_wo cvs-dist-local
|
||||
$MAKE -f $makefile_wo cvs-dist-local top_srcdir=.
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -187,7 +187,7 @@ subdir_dist()
|
|||
$ACLOCAL
|
||||
$AUTOHEADER
|
||||
$AUTOMAKE --foreign --include-deps
|
||||
perl ../admin/am_edit
|
||||
perl -w ../admin/am_edit
|
||||
call_and_fix_autoconf
|
||||
}
|
||||
|
||||
|
|
@ -201,7 +201,7 @@ echo "KDE_CREATE_SUBDIRSLIST" >> configure.in.new
|
|||
if test -f Makefile.am.in; then
|
||||
subdirs=`cat subdirs`
|
||||
for dir in $subdirs; do
|
||||
dir=`echo $dir | sed -e "s,[-+],_,g"`
|
||||
dir=`echo $dir | sed -e "s,[-+.],_,g"`
|
||||
echo "AM_CONDITIONAL($dir""_SUBDIR_included, test \"x\$$dir""_SUBDIR_included\" = xyes)" >> configure.in.new
|
||||
done
|
||||
fi
|
||||
|
|
@ -234,7 +234,13 @@ for i in $mfs; do
|
|||
fi
|
||||
fi
|
||||
done
|
||||
egrep '^dnl AC_OUTPUT\(.*\)' `cat configure.files` | sed -e "s#^.*dnl AC_OUTPUT(\(.*\))#AC_CONFIG_FILES([ \1 ])#" >> configure.in.new
|
||||
|
||||
files=`cat configure.files`
|
||||
list=`egrep '^dnl AC_OUTPUT\(.*\)' $files | sed -e "s#^.*dnl AC_OUTPUT(\(.*\))#\1#"`
|
||||
for file in $list; do
|
||||
echo "AC_CONFIG_FILES([ $file ])" >> configure.in.new
|
||||
done
|
||||
|
||||
if test -n "$UNSERMAKE"; then
|
||||
echo "AC_CONFIG_FILES([ MakeVars ])" >> configure.in.new
|
||||
fi
|
||||
|
|
@ -255,7 +261,7 @@ if test -f configure.in.in; then
|
|||
fi
|
||||
fi
|
||||
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
|
||||
VERSION="\"3.0.7\""
|
||||
VERSION="\"3.1.0\""
|
||||
fi
|
||||
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
|
||||
modulename=`pwd`;
|
||||
|
|
@ -272,6 +278,7 @@ sed -e "s#@MODULENAME@#$modulename#" configure.in.new |
|
|||
sed -e "s#@VERSION@#$VERSION#" > configure.in
|
||||
botfiles=`cat configure.files | egrep "configure.in.bot"`
|
||||
test -n "$botfiles" && cat $botfiles >> configure.in
|
||||
cat $admindir/configure.in.bot.end >> configure.in
|
||||
rm -f configure.in.new
|
||||
}
|
||||
|
||||
|
|
@ -417,7 +424,7 @@ for subdir in $dirs; do
|
|||
echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp
|
||||
else echo " " > _translatorinfo.cpp
|
||||
fi
|
||||
perl -e '$mes=0; while (<STDIN>) { next if (/^(if|else|endif)\s/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am > _transMakefile
|
||||
perl -e '$mes=0; while (<STDIN>) { next if (/^(if|else|endif)\s/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
|
||||
|
||||
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \
|
||||
XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x ${includedir:-$KDEDIR/include}/kde.pot" \
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ $mandir = "$kde_prefix/share/man";
|
|||
$infodir = "$kde_prefix/share/info";
|
||||
$sysconfdir = "/etc";
|
||||
|
||||
$QTDIR = "/usr/share/qt";
|
||||
$QTDIR = "/usr/share/qt3";
|
||||
$IDL = "$kde_bindir/cuteidl";
|
||||
$DCOPIDL = "$kde_bindir/dcopidl";
|
||||
$DCOPIDL2CPP = "$kde_bindir/dcopidl2cpp";
|
||||
|
|
@ -81,9 +81,9 @@ if (@ARGV && $ARGV[0] eq 'echodirs') {
|
|||
print STDOUT "export ARTSCCONFIG=$ARTSCCONFIG\n";
|
||||
print STDOUT "export INSTALL_DATA=install -p -c -m 644\n";
|
||||
|
||||
print STDOUT "configkde=$enable_debug $enable_final --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --sysconfdir=\$(sysconfdir) --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\n";
|
||||
print STDOUT "configkdevelop=$enable_debug $enable_final --disable-rpath --enable-docbase --enable-kdoc2 --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html\n";
|
||||
print STDOUT "configkdepim=$enable_debug $enable_final --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\n";
|
||||
print STDOUT "configkde=$enable_debug $enable_final --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --sysconfdir=\$(sysconfdir) --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --infodir=\$(infodir)\n";
|
||||
print STDOUT "configkdevelop=$enable_debug $enable_final --disable-rpath --enable-docbase --enable-kdoc2 --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html\n";
|
||||
print STDOUT "configkdepim=$enable_debug $enable_final --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --infodir=\$(infodir)\n";
|
||||
|
||||
exit
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ AUTOCONF="autoconf"
|
|||
AUTOHEADER="autoheader"
|
||||
AUTOM4TE="autom4te"
|
||||
AUTOMAKE="automake"
|
||||
ACLOCAL="aclocal"
|
||||
ACLOCAL="aclocal -I macros"
|
||||
|
||||
|
||||
# We don't use variable here for remembering the type ... strings.
|
||||
|
|
@ -15,8 +15,12 @@ checkAutoconf()
|
|||
{
|
||||
if test -x "`$WHICH autoconf-2.5x`" ; then
|
||||
AUTOCONF="`$WHICH autoconf-2.5x`"
|
||||
elif test -x "`$WHICH autoconf-2.54`" ; then
|
||||
AUTOCONF="`$WHICH autoconf-2.54`"
|
||||
elif test -x "`$WHICH autoconf-2.53`" ; then
|
||||
AUTOCONF="`$WHICH autoconf-2.53`"
|
||||
elif test -x "`$WHICH autoconf-2.53a`" ; then
|
||||
AUTOCONF="`$WHICH autoconf-2.53a`"
|
||||
elif test -x "`$WHICH autoconf-2.52`" ; then
|
||||
AUTOCONF="`$WHICH autoconf-2.52`"
|
||||
elif test -x "`$WHICH autoconf2.50`" ; then
|
||||
|
|
@ -29,9 +33,15 @@ checkAutoheader()
|
|||
if test -x "`$WHICH autoheader-2.5x`" ; then
|
||||
AUTOHEADER="`$WHICH autoheader-2.5x`"
|
||||
AUTOM4TE="`$WHICH autom4te-2.5x`"
|
||||
elif test -x "`$WHICH autoheader-2.54`" ; then
|
||||
AUTOHEADER="`$WHICH autoheader-2.54`"
|
||||
AUTOM4TE="`$WHICH autom4te-2.54`"
|
||||
elif test -x "`$WHICH autoheader-2.53`" ; then
|
||||
AUTOHEADER="`$WHICH autoheader-2.53`"
|
||||
AUTOM4TE="`$WHICH autom4te-2.53`"
|
||||
elif test -x "`$WHICH autoheader-2.53a`" ; then
|
||||
AUTOHEADER="`$WHICH autoheader-2.53a`"
|
||||
AUTOM4TE="`$WHICH autom4te-2.53a`"
|
||||
elif test -x "`$WHICH autoheader-2.52`" ; then
|
||||
AUTOHEADER="`$WHICH autoheader-2.52`"
|
||||
elif test -x "`$WHICH autoheader2.50`" ; then
|
||||
|
|
@ -58,7 +68,7 @@ checkWhich ()
|
|||
{
|
||||
WHICH=""
|
||||
for i in "type -p" "which" "type" ; do
|
||||
T=`$i sh`
|
||||
T=`$i sh 2> /dev/null`
|
||||
test -x "$T" && WHICH="$i" && break
|
||||
done
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ then
|
|||
echo "install: no input file specified"
|
||||
exit 1
|
||||
else
|
||||
true
|
||||
:
|
||||
fi
|
||||
|
||||
if [ x"$dir_arg" != x ]; then
|
||||
|
|
@ -120,7 +120,7 @@ if [ x"$dir_arg" != x ]; then
|
|||
instcmd=:
|
||||
chmodcmd=""
|
||||
else
|
||||
instcmd=mkdir
|
||||
instcmd=$mkdirprog
|
||||
fi
|
||||
else
|
||||
|
||||
|
|
@ -128,9 +128,9 @@ else
|
|||
# might cause directories to be created, which would be especially bad
|
||||
# if $src (and thus $dsttmp) contains '*'.
|
||||
|
||||
if [ -f $src -o -d $src ]
|
||||
if [ -f "$src" ] || [ -d "$src" ]
|
||||
then
|
||||
true
|
||||
:
|
||||
else
|
||||
echo "install: $src does not exist"
|
||||
exit 1
|
||||
|
|
@ -141,7 +141,7 @@ else
|
|||
echo "install: no destination specified"
|
||||
exit 1
|
||||
else
|
||||
true
|
||||
:
|
||||
fi
|
||||
|
||||
# If destination is a directory, append the input filename; if your system
|
||||
|
|
@ -151,7 +151,7 @@ else
|
|||
then
|
||||
dst="$dst"/`basename $src`
|
||||
else
|
||||
true
|
||||
:
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -163,8 +163,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
|
|||
|
||||
# Skip lots of stat calls in the usual case.
|
||||
if [ ! -d "$dstdir" ]; then
|
||||
defaultIFS='
|
||||
'
|
||||
defaultIFS='
|
||||
'
|
||||
IFS="${IFS-${defaultIFS}}"
|
||||
|
||||
oIFS="${IFS}"
|
||||
|
|
@ -183,7 +183,7 @@ while [ $# -ne 0 ] ; do
|
|||
then
|
||||
$mkdirprog "${pathcomp}"
|
||||
else
|
||||
true
|
||||
:
|
||||
fi
|
||||
|
||||
pathcomp="${pathcomp}/"
|
||||
|
|
@ -194,10 +194,10 @@ if [ x"$dir_arg" != x ]
|
|||
then
|
||||
$doit $instcmd $dst &&
|
||||
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
|
||||
else
|
||||
|
||||
# If we're going to rename the final executable, determine the name now.
|
||||
|
|
@ -216,7 +216,7 @@ else
|
|||
then
|
||||
dstfile=`basename $dst`
|
||||
else
|
||||
true
|
||||
:
|
||||
fi
|
||||
|
||||
# Make a temp file name in the proper directory.
|
||||
|
|
@ -235,10 +235,10 @@ else
|
|||
# ignore errors from any of these, just make sure not to ignore
|
||||
# errors from the above "$doit $instcmd $src $dsttmp" command.
|
||||
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
|
||||
|
||||
# Now rename the file to the real destination.
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Common stub for a few missing GNU programs while installing.
|
||||
# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
|
||||
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -28,6 +28,8 @@ if test $# -eq 0; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
run=:
|
||||
|
||||
# In the cases where this matters, `missing' is being run in the
|
||||
# srcdir already.
|
||||
if test -f configure.ac; then
|
||||
|
|
@ -41,28 +43,7 @@ case "$1" in
|
|||
# Try to run requested program, and just exit if it succeeds.
|
||||
run=
|
||||
shift
|
||||
exec="$@"
|
||||
|
||||
# Suck in the AUTOCONF detection code.
|
||||
admindir=`echo "$0" | sed 's%[\\/][^\\/][^\\/]*$%%'`
|
||||
test "x$admindir" = "x$0" && admindir=.
|
||||
. $admindir/detect-autoconf.sh
|
||||
|
||||
case "$1" in
|
||||
aclocal)
|
||||
exec="`echo $exec|sed -e \"s^aclocal^$ACLOCAL^\"`"
|
||||
;;
|
||||
autoheader)
|
||||
exec="`echo $exec|sed -e \"s^autoheader^$AUTOHEADER^\"`"
|
||||
;;
|
||||
autoconf)
|
||||
exec="`echo $exec|sed -e \"s^autoconf^$AUTOCONF^\"`"
|
||||
;;
|
||||
automake)
|
||||
exec="`echo $exec|sed -e \"s^automake^$AUTOMAKE^\"`"
|
||||
;;
|
||||
esac
|
||||
$exec && exit 0
|
||||
"$@" && exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -97,7 +78,7 @@ Supported PROGRAM values:
|
|||
;;
|
||||
|
||||
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
|
||||
echo "missing 0.3 - GNU automake"
|
||||
echo "missing 0.4 - GNU automake"
|
||||
;;
|
||||
|
||||
-*)
|
||||
|
|
@ -106,7 +87,12 @@ Supported PROGRAM values:
|
|||
exit 1
|
||||
;;
|
||||
|
||||
aclocal)
|
||||
aclocal*)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is missing on your system. You should only need it if
|
||||
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
|
||||
|
|
@ -116,6 +102,11 @@ WARNING: \`$1' is missing on your system. You should only need it if
|
|||
;;
|
||||
|
||||
autoconf)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is missing on your system. You should only need it if
|
||||
you modified \`${configure_ac}'. You might want to install the
|
||||
|
|
@ -125,6 +116,11 @@ WARNING: \`$1' is missing on your system. You should only need it if
|
|||
;;
|
||||
|
||||
autoheader)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is missing on your system. You should only need it if
|
||||
you modified \`acconfig.h' or \`${configure_ac}'. You might want
|
||||
|
|
@ -143,7 +139,12 @@ WARNING: \`$1' is missing on your system. You should only need it if
|
|||
touch $touch_files
|
||||
;;
|
||||
|
||||
automake)
|
||||
automake*)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is missing on your system. You should only need it if
|
||||
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
|
||||
|
|
@ -154,6 +155,34 @@ WARNING: \`$1' is missing on your system. You should only need it if
|
|||
while read f; do touch "$f"; done
|
||||
;;
|
||||
|
||||
autom4te)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is needed, and you do not seem to have it handy on your
|
||||
system. You might have modified some files without having the
|
||||
proper tools for further handling them.
|
||||
You can get \`$1Help2man' as part of \`Autoconf' from any GNU
|
||||
archive site."
|
||||
|
||||
file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
|
||||
test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
|
||||
if test -f "$file"; then
|
||||
touch $file
|
||||
else
|
||||
test -z "$file" || exec >$file
|
||||
echo "#! /bin/sh"
|
||||
echo "# Created by GNU Automake missing as a replacement of"
|
||||
echo "# $ $@"
|
||||
echo "exit 0"
|
||||
chmod +x $file
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
|
||||
bison|yacc)
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is missing on your system. You should only need it if
|
||||
|
|
@ -208,6 +237,11 @@ WARNING: \`$1' is missing on your system. You should only need it if
|
|||
;;
|
||||
|
||||
help2man)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is missing on your system. You should only need it if
|
||||
you modified a dependency of a manual page. You may need the
|
||||
|
|
@ -259,23 +293,23 @@ WARNING: \`$1' is missing on your system. You should only need it if
|
|||
# Look for gnutar/gtar before invocation to avoid ugly error
|
||||
# messages.
|
||||
if (gnutar --version > /dev/null 2>&1); then
|
||||
gnutar ${1+"$@"} && exit 0
|
||||
gnutar "$@" && exit 0
|
||||
fi
|
||||
if (gtar --version > /dev/null 2>&1); then
|
||||
gtar ${1+"$@"} && exit 0
|
||||
gtar "$@" && exit 0
|
||||
fi
|
||||
firstarg="$1"
|
||||
if shift; then
|
||||
case "$firstarg" in
|
||||
*o*)
|
||||
firstarg=`echo "$firstarg" | sed s/o//`
|
||||
tar "$firstarg" ${1+"$@"} && exit 0
|
||||
tar "$firstarg" "$@" && exit 0
|
||||
;;
|
||||
esac
|
||||
case "$firstarg" in
|
||||
*h*)
|
||||
firstarg=`echo "$firstarg" | sed s/h//`
|
||||
tar "$firstarg" ${1+"$@"} && exit 0
|
||||
tar "$firstarg" "$@" && exit 0
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -4,37 +4,108 @@
|
|||
# Created: 1993-05-16
|
||||
# Public domain
|
||||
|
||||
# $Id: mkinstalldirs,v 1.1 2002-11-11 09:47:19 christey Exp $
|
||||
|
||||
errstatus=0
|
||||
dirmode=""
|
||||
|
||||
usage="\
|
||||
Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
|
||||
|
||||
# process command line arguments
|
||||
while test $# -gt 0 ; do
|
||||
case $1 in
|
||||
-h | --help | --h*) # -h for help
|
||||
echo "$usage" 1>&2
|
||||
exit 0
|
||||
;;
|
||||
-m) # -m PERM arg
|
||||
shift
|
||||
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
|
||||
dirmode=$1
|
||||
shift
|
||||
;;
|
||||
--) # stop option processing
|
||||
shift
|
||||
break
|
||||
;;
|
||||
-*) # unknown option
|
||||
echo "$usage" 1>&2
|
||||
exit 1
|
||||
;;
|
||||
*) # first non-opt arg
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
for file
|
||||
do
|
||||
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
|
||||
shift
|
||||
if test -d "$file"; then
|
||||
shift
|
||||
else
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
pathcomp=
|
||||
for d
|
||||
do
|
||||
pathcomp="$pathcomp$d"
|
||||
case "$pathcomp" in
|
||||
-* ) pathcomp=./$pathcomp ;;
|
||||
esac
|
||||
case $# in
|
||||
0) exit 0 ;;
|
||||
esac
|
||||
|
||||
if test ! -d "$pathcomp"; then
|
||||
echo "mkdir $pathcomp"
|
||||
case $dirmode in
|
||||
'')
|
||||
if mkdir -p -- . 2>/dev/null; then
|
||||
echo "mkdir -p -- $*"
|
||||
exec mkdir -p -- "$@"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
|
||||
echo "mkdir -m $dirmode -p -- $*"
|
||||
exec mkdir -m "$dirmode" -p -- "$@"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
mkdir "$pathcomp" || lasterr=$?
|
||||
for file
|
||||
do
|
||||
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
|
||||
shift
|
||||
|
||||
if test ! -d "$pathcomp"; then
|
||||
errstatus=$lasterr
|
||||
fi
|
||||
fi
|
||||
pathcomp=
|
||||
for d
|
||||
do
|
||||
pathcomp="$pathcomp$d"
|
||||
case $pathcomp in
|
||||
-*) pathcomp=./$pathcomp ;;
|
||||
esac
|
||||
|
||||
pathcomp="$pathcomp/"
|
||||
done
|
||||
if test ! -d "$pathcomp"; then
|
||||
echo "mkdir $pathcomp"
|
||||
|
||||
mkdir "$pathcomp" || lasterr=$?
|
||||
|
||||
if test ! -d "$pathcomp"; then
|
||||
errstatus=$lasterr
|
||||
else
|
||||
if test ! -z "$dirmode"; then
|
||||
echo "chmod $dirmode $pathcomp"
|
||||
lasterr=""
|
||||
chmod "$dirmode" "$pathcomp" || lasterr=$?
|
||||
|
||||
if test ! -z "$lasterr"; then
|
||||
errstatus=$lasterr
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
pathcomp="$pathcomp/"
|
||||
done
|
||||
done
|
||||
|
||||
exit $errstatus
|
||||
|
||||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 2
|
||||
# End:
|
||||
# mkinstalldirs ends here
|
||||
|
|
|
|||
189
config.h.in
189
config.h.in
|
|
@ -1,4 +1,4 @@
|
|||
/* config.h.in. Generated automatically from configure.in by autoheader. */
|
||||
/* config.h.in. Generated from configure.in by autoheader. */
|
||||
#undef HAVE_LIBSM
|
||||
|
||||
/* The directory where our data will be installed in */
|
||||
|
|
@ -16,57 +16,210 @@
|
|||
/* The directory where the HIPPARCOS/TYCHO data resides */
|
||||
#undef HIP_DATA_DIR
|
||||
|
||||
/* Define if you have the <byteswap.h> header file. */
|
||||
/* Define to 1 if you have the <byteswap.h> header file. */
|
||||
#undef HAVE_BYTESWAP_H
|
||||
|
||||
/* Define if you have the <GL/glut.h> header file. */
|
||||
/* Define if you have the CoreAudio API */
|
||||
#undef HAVE_COREAUDIO
|
||||
|
||||
/* Define to 1 if you have the <crt_externs.h> header file. */
|
||||
#undef HAVE_CRT_EXTERNS_H
|
||||
|
||||
/* Defines if your system has the crypt function */
|
||||
#undef HAVE_CRYPT
|
||||
|
||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
#undef HAVE_DLFCN_H
|
||||
|
||||
/* Define to 1 if you have the <GL/glut.h> header file. */
|
||||
#undef HAVE_GL_GLUT_H
|
||||
|
||||
/* Define if you have the <GL/glu.h> header file. */
|
||||
/* Define to 1 if you have the <GL/glu.h> header file. */
|
||||
#undef HAVE_GL_GLU_H
|
||||
|
||||
/* Define if you have the <GL/gl.h> header file. */
|
||||
/* Define to 1 if you have the <GL/gl.h> header file. */
|
||||
#undef HAVE_GL_GL_H
|
||||
|
||||
/* Define if you have the `GL' library (-lGL). */
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define to 1 if you have the `GL' library (-lGL). */
|
||||
#undef HAVE_LIBGL
|
||||
|
||||
/* Define if you have the `GLU' library (-lGLU). */
|
||||
/* Define to 1 if you have the `GLU' library (-lGLU). */
|
||||
#undef HAVE_LIBGLU
|
||||
|
||||
/* Define if you have the `glut' library (-lglut). */
|
||||
/* Define to 1 if you have the `glut' library (-lglut). */
|
||||
#undef HAVE_LIBGLUT
|
||||
|
||||
/* Define if you have the `gtkgl' library (-lgtkgl). */
|
||||
/* Define to 1 if you have the `gtkgl' library (-lgtkgl). */
|
||||
#undef HAVE_LIBGTKGL
|
||||
|
||||
/* Define if you have the `jpeg' library (-ljpeg). */
|
||||
/* Define to 1 if you have the `jpeg' library (-ljpeg). */
|
||||
#undef HAVE_LIBJPEG
|
||||
|
||||
/* Define if you have the `MesaGL' library (-lMesaGL). */
|
||||
/* Define to 1 if you have the `MesaGL' library (-lMesaGL). */
|
||||
#undef HAVE_LIBMESAGL
|
||||
|
||||
/* Define if you have the `MesaGLU' library (-lMesaGLU). */
|
||||
/* Define to 1 if you have the `MesaGLU' library (-lMesaGLU). */
|
||||
#undef HAVE_LIBMESAGLU
|
||||
|
||||
/* Define if you have the `png' library (-lpng). */
|
||||
/* Define to 1 if you have the `png' library (-lpng). */
|
||||
#undef HAVE_LIBPNG
|
||||
|
||||
/* Define if you have the <X11/SM/SMlib.h> header file. */
|
||||
/* Define if you have a working libpthread (will enable threaded code) */
|
||||
#undef HAVE_LIBPTHREAD
|
||||
|
||||
/* Define if you have libz */
|
||||
#undef HAVE_LIBZ
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
/* Define if your system needs _NSGetEnviron to set up the environment */
|
||||
#undef HAVE_NSGETENVIRON
|
||||
|
||||
/* Define to 1 if you have the <pthread/linuxthreads/pthread.h> header file.
|
||||
*/
|
||||
#undef HAVE_PTHREAD_LINUXTHREADS_PTHREAD_H
|
||||
|
||||
/* Define if you have the res_init function */
|
||||
#undef HAVE_RES_INIT
|
||||
|
||||
/* Define to 1 if you have the `snprintf' function. */
|
||||
#undef HAVE_SNPRINTF
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
#undef HAVE_STDLIB_H
|
||||
|
||||
/* Define to 1 if you have the <strings.h> header file. */
|
||||
#undef HAVE_STRINGS_H
|
||||
|
||||
/* Define to 1 if you have the <string.h> header file. */
|
||||
#undef HAVE_STRING_H
|
||||
|
||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||
#undef HAVE_SYS_STAT_H
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
#undef HAVE_SYS_TYPES_H
|
||||
|
||||
/* C++ compiler supports template repository */
|
||||
#undef HAVE_TEMPLATE_REPOSITORY
|
||||
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
/* Define to 1 if you have the `vsnprintf' function. */
|
||||
#undef HAVE_VSNPRINTF
|
||||
|
||||
/* Define to 1 if you have the <X11/SM/SMlib.h> header file. */
|
||||
#undef HAVE_X11_SM_SMLIB_H
|
||||
|
||||
/* Define if you want Xinerama support */
|
||||
#undef HAVE_XINERAMA
|
||||
|
||||
/* Suffix for lib directories */
|
||||
#undef KDELIBSUFF
|
||||
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
/* Define if you have the ANSI C header files. */
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
#undef PACKAGE_BUGREPORT
|
||||
|
||||
/* Define to the full name of this package. */
|
||||
#undef PACKAGE_NAME
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#undef PACKAGE_STRING
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
/* The size of a `char', as computed by sizeof. */
|
||||
#undef SIZEOF_CHAR
|
||||
|
||||
/* The size of a `char *', as computed by sizeof. */
|
||||
#undef SIZEOF_CHAR_P
|
||||
|
||||
/* The size of a `int', as computed by sizeof. */
|
||||
#undef SIZEOF_INT
|
||||
|
||||
/* The size of a `long', as computed by sizeof. */
|
||||
#undef SIZEOF_LONG
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
/* Define if your processor stores words with the most significant byte first
|
||||
(like Motorola and SPARC, unlike Intel and VAX). */
|
||||
/* Define to 1 if your processor stores words with the most significant byte
|
||||
first (like Motorola and SPARC, unlike Intel and VAX). */
|
||||
#undef WORDS_BIGENDIAN
|
||||
|
||||
/* Define if the X Window System is missing or not being used. */
|
||||
/* Define to 1 if the X Window System is missing or not being used. */
|
||||
#undef X_DISPLAY_MISSING
|
||||
|
||||
/*
|
||||
* jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
|
||||
* headers and I'm too lazy to write a configure test as long as only
|
||||
* unixware is related
|
||||
*/
|
||||
#ifdef _UNIXWARE
|
||||
#define HAVE_BOOLEAN
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
|
||||
* that defines bzero.
|
||||
*/
|
||||
|
||||
#if defined(_AIX)
|
||||
#include <strings.h>
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* On HP-UX, the declaration of vsnprintf() is needed every time !
|
||||
*/
|
||||
|
||||
#if !defined(HAVE_VSNPRINTF) || defined(hpux)
|
||||
#if __STDC__
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#else
|
||||
#include <varargs.h>
|
||||
#endif
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
int snprintf(char *str, size_t n, char const *fmt, ...);
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#if defined(__SVR4) && !defined(__svr4__)
|
||||
#define __svr4__ 1
|
||||
#endif
|
||||
|
||||
|
||||
/* Compatibility define */
|
||||
#undef ksize_t
|
||||
|
||||
/* Define the real type of socklen_t */
|
||||
#undef socklen_t
|
||||
|
|
|
|||
266
configure.in
266
configure.in
|
|
@ -3,19 +3,27 @@ dnl Celestia autoconf file
|
|||
dnl Process this file with autoconf to make a configure script
|
||||
dnl
|
||||
|
||||
AC_INIT(configure.in)
|
||||
AC_INIT(acinclude.m4) dnl a source file from your sub dir
|
||||
|
||||
dnl For KDE interface
|
||||
AC_CONFIG_AUX_DIR(admin)
|
||||
|
||||
AM_INIT_AUTOMAKE(celestia, 1.2.5)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
|
||||
unset CDPATH
|
||||
|
||||
AM_ACLOCAL_INCLUDE(macros)
|
||||
|
||||
dnl Check system type
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
dnl Checking host/target/build systems, for make, install etc.
|
||||
AC_CANONICAL_SYSTEM
|
||||
dnl Perform program name transformation
|
||||
AC_ARG_PROGRAM
|
||||
|
||||
AM_INIT_AUTOMAKE(celestia, 1.3.0)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
dnl Check for compilers. Set CFLAGS and CXXFLAGS to null if unset, so
|
||||
dnl that these macros won't set the to default values that we don't want.
|
||||
if test "x${CFLAGS-notset}" = "xnotset" ; then
|
||||
|
|
@ -116,102 +124,82 @@ GTK_LIBS=""
|
|||
GTKGL_LIBS=""
|
||||
GTK_CFLAGS=""
|
||||
|
||||
AC_MSG_CHECKING([whether to disable GTK.])
|
||||
AC_ARG_WITH(gtk, [ --with-gtk Use Gtk for an enhanced GUI],
|
||||
enable_gtk="$withval";enable_gtk_by_default="no", enable_gtk="yes";enable_gtk_by_default="yes")
|
||||
enable_gtk="$withval";gtk_by_default="no", enable_gtk="no";gtk_by_default="yes")
|
||||
|
||||
AC_ARG_WITH(kde, [ --with-kde Use KDE for an enhanced GUI],
|
||||
enable_kde="$withval";enable_kde_by_default="no", enable_kde="yes";enable_kde_by_default="yes")
|
||||
enable_kde="$withval";kde_by_default="no", enable_kde="yes";kde_by_default="yes")
|
||||
|
||||
|
||||
dnl disables the one that was not explicitly enabled.
|
||||
dnl enables gtk by default
|
||||
|
||||
if test "$enable_kde_by_default" == "yes" -a "$enable_gtk" == "yes" ; then
|
||||
enable_kde="no"
|
||||
enable_kde_by_default="no"
|
||||
AC_MSG_CHECKING([whether to enable GLUT])
|
||||
dnl if gtk and kde are explicitly disabled, enable GLUT
|
||||
if test "$enable_gtk" == "no" -a "$gtk_by_default" == "no" -a "$enable_kde" == "no" -a "$kde_by_default" == "no"; then
|
||||
enable_glut="yes"
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
if test "$enable_gtk_by_default" == "yes" -a "$enable_kde" == "yes" ; then
|
||||
enable_gtk="no"
|
||||
enable_gtk_by_default="no"
|
||||
fi
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
dnl if both kde and gtk are explicitly enabled, disable gtk
|
||||
if test "$enable_gtk" != "no" -a "$gtk_by_default" == "no" -a "$enable_kde" != "no" -a "$kde_by_default" == "no"; then
|
||||
enable_gtk="no"
|
||||
fi
|
||||
|
||||
dnl if gtk is explicitly enabled, disable kde
|
||||
if test "$enable_gtk" != "no" -a "$gtk_by_default" == "no" -a "$kde_by_default" == "yes" ; then
|
||||
enable_kde="no"
|
||||
fi
|
||||
|
||||
dnl if kde is explicitly disabled, enable gtk
|
||||
if test "$enable_gtk" == "no" -a "$gtk_by_default" == "yes" -a "$enable_kde" == "no" -a "$kde_by_default" == "no" ; then
|
||||
enable_gtk="yes"
|
||||
fi
|
||||
|
||||
|
||||
AC_MSG_CHECKING([interface to build])
|
||||
if test "$enable_kde" != "no" ; then
|
||||
AC_MSG_RESULT(KDE)
|
||||
fi
|
||||
if test "$enable_gtk" != "no" ; then
|
||||
AC_MSG_RESULT(GTK)
|
||||
fi
|
||||
if test "$enable_glut" == "yes" ; then
|
||||
AC_MSG_RESULT(GLUT)
|
||||
fi
|
||||
|
||||
|
||||
dnl
|
||||
dnl GTK
|
||||
dnl
|
||||
|
||||
|
||||
AC_MSG_CHECKING([whether to disable GTK.])
|
||||
if test "$enable_gtk" == "yes" ; then
|
||||
enable_kde="no"
|
||||
AC_MSG_RESULT(no, so try to find GTK)
|
||||
AM_PATH_GTK(1.2.0,enable_gtk="yes",enable_gtk="no")
|
||||
|
||||
|
||||
dnl Complain only if the user insisted we do GTK
|
||||
if test "$enable_gtk_by_default" == "no" -a "$enable_gtk" == "no"; then
|
||||
AC_MSG_ERROR(Unable to find GTK)
|
||||
AC_MSG_RESULT(Unable to find GTK, building GLUT only version)
|
||||
enable_glut="yes"
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT(yes)
|
||||
fi
|
||||
|
||||
if test "$enable_gtk" == "yes" ; then
|
||||
OLD_LIBS="$LIBS"
|
||||
LIBS="$LIBS $GTK_LIBS -lGL"
|
||||
AC_CHECK_LIB(gtkgl,gdk_gl_query,,enable_gtk="no")
|
||||
|
||||
dnl Complain only if the user insisted we do GTK
|
||||
if test "$enable_gtk_by_default" == "no" -a "$enable_gtk" == "no"; then
|
||||
AC_MSG_ERROR(Unable to find gtkglarea)
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$enable_gtk" == "yes" ; then
|
||||
LIBS="$OLD_LIBS"
|
||||
GNOME_INIT
|
||||
GNOME_COMPILE_WARNINGS
|
||||
GNOME_X_CHECKS
|
||||
GTKGL_LIBS=-lgtkgl
|
||||
else
|
||||
if test "$enable_gtk_by_default" == "yes" ; then
|
||||
AC_MSG_WARN(Disabled GTK GUI because of missing necessary packages)
|
||||
fi
|
||||
|
||||
dnl Check for X11.
|
||||
AC_PATH_XTRA
|
||||
|
||||
LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lXmu -lXi -lXext -lX11 -lm $X_EXTRA_LIBS"
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_GTK, test "$enable_gtk" == "yes")
|
||||
|
||||
|
||||
dnl
|
||||
dnl KDE
|
||||
dnl
|
||||
|
||||
if test "$enable_kde" == "yes" ; then
|
||||
dnl KDE_SET_PREFIX
|
||||
AC_CHECK_COMPILERS
|
||||
AC_ENABLE_SHARED(yes)
|
||||
AC_ENABLE_STATIC(no)
|
||||
|
||||
KDE_PROG_LIBTOOL
|
||||
dnl AM_KDE_WITH_NLS
|
||||
|
||||
KDE_USE_QT(3)
|
||||
AC_PATH_KDE
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_KDE, test "$enable_kde" == "yes")
|
||||
AC_CHECK_COMPILERS
|
||||
|
||||
|
||||
CFLAGS="$CFLAGS $CELESTIAFLAGS $CELESTIA_CFLAGS $GTK_CFLAGS $GNOME_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $CELESTIAFLAGS $CELESTIA_CXXFLAGS $GTK_CFLAGS $GNOME_CFLAGS $GNOME_INCLUDEDIR"
|
||||
LIBS="$LIBS $CELESTIALIBS $GTK_LIBS $GNOME_LIBS $GNOMEUI_LIBS $GTKGL_LIBS"
|
||||
LDFLAGS="$LDFLAGS $GNOME_LIBDIR"
|
||||
AC_PATH_XTRA
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
CFLAGS="$CFLAGS $CELESTIAFLAGS $CELESTIA_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $CELESTIAFLAGS $CELESTIA_CXXFLAGS"
|
||||
LIBS="$LIBS $CELESTIALIBS"
|
||||
LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lXmu -lXi -lXext -lX11 -lm -lz $X_EXTRA_LIBS"
|
||||
|
||||
dnl Check for OpenGL headers first.
|
||||
AC_CHECK_HEADERS(GL/gl.h,,AC_MSG_ERROR([[No gl.h found. See INSTALL file for ddetails about how to correct this problem.]]))
|
||||
|
||||
LIBS="$LIBS -lGL"
|
||||
dnl Check for OpenGL. Taken partly from the plib sources.
|
||||
AC_CHECK_LIB(GL,glNewList)
|
||||
|
||||
|
|
@ -223,7 +211,6 @@ fi
|
|||
|
||||
dnl Check for GLU headers.
|
||||
AC_CHECK_HEADERS(GL/glu.h,,AC_MSG_ERROR([[No glu.h found. See INSTALL file for details on how to correct this problem.]]))
|
||||
|
||||
AC_CHECK_LIB(GLU,gluLookAt)
|
||||
|
||||
if test "x$ac_cv_lib_GLU_gluLookAt" = "xno"; then
|
||||
|
|
@ -233,18 +220,71 @@ if test "x$ac_cv_lib_GLU_gluLookAt" = "xno"; then
|
|||
fi
|
||||
|
||||
|
||||
if test "$enable_gtk" != "no" -o "$enable_glut" == "yes" ; then
|
||||
dnl Check for GLUT headers first.
|
||||
AC_CHECK_HEADERS(GL/glut.h,,AC_MSG_ERROR([[No glut.h found. See INSTALL file for details on correcting this problem.]]))
|
||||
AC_CHECK_HEADERS(GL/glut.h,,AC_MSG_ERROR([[No glut.h found. See INSTALL file for details on correcting this problem.]]))
|
||||
|
||||
dnl Check for GLUT.
|
||||
AC_CHECK_LIB(glut, glutKeyboardUpFunc,,
|
||||
AC_MSG_ERROR(GLUT library version >= 3.7 not found))
|
||||
AC_CHECK_LIB(glut, glutKeyboardUpFunc,,
|
||||
AC_MSG_ERROR(GLUT library version >= 3.7 not found))
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_GLUT, test "$enable_glut" == "yes")
|
||||
|
||||
if test "$enable_gtk" != "no" ; then
|
||||
OLD_LIBS="$LIBS"
|
||||
LIBS="$LIBS $GTK_LIBS"
|
||||
AC_CHECK_LIB(gtkgl,gdk_gl_query,,enable_gtk="no")
|
||||
|
||||
dnl Complain only if the user insisted we do GTK
|
||||
if test "$enable_gtk_by_default" == "no" -a "$enable_gtk" == "no"; then
|
||||
AC_MSG_ERROR(Unable to find gtkglarea)
|
||||
fi
|
||||
|
||||
LIBS="$OLD_LIBS"
|
||||
GNOME_INIT
|
||||
GNOME_COMPILE_WARNINGS
|
||||
GNOME_X_CHECKS
|
||||
|
||||
GTKGL_LIBS=-lgtkgl
|
||||
|
||||
CFLAGS="$CFLAGS $GTK_CFLAGS $GNOME_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $GTK_CFLAGS $GNOME_CFLAGS $GNOME_INCLUDEDIR"
|
||||
LIBS="$LIBS $GTK_LIBS $GNOME_LIBS $GNOMEUI_LIBS $GTKGL_LIBS"
|
||||
LDFLAGS="$LDFLAGS $GNOME_LIBDIR"
|
||||
else
|
||||
if test "$enable_gtk_by_default" == "yes" ; then
|
||||
AC_MSG_WARN(Disabled GTK GUI because of missing necessary packages)
|
||||
fi
|
||||
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_GTK, test "$enable_gtk" == "yes")
|
||||
|
||||
|
||||
dnl
|
||||
dnl KDE
|
||||
dnl
|
||||
|
||||
if test "$enable_kde" != "no" ; then
|
||||
dnl KDE_SET_PREFIX
|
||||
AC_ENABLE_SHARED(yes)
|
||||
AC_ENABLE_STATIC(no)
|
||||
|
||||
KDE_PROG_LIBTOOL
|
||||
dnl AM_KDE_WITH_NLS
|
||||
|
||||
dnl KDE_USE_QT(3)
|
||||
AC_PATH_KDE
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_KDE, test "$enable_kde" == "yes")
|
||||
|
||||
|
||||
|
||||
|
||||
dnl Check for JPEG library.
|
||||
AC_CHECK_LIB(jpeg, jpeg_start_decompress,,
|
||||
AC_MSG_ERROR(jpeg library not found))
|
||||
|
||||
|
||||
dnl Check for PNG library.
|
||||
AC_CHECK_LIB(png, png_create_info_struct,,
|
||||
AC_MSG_ERROR(png library not found))
|
||||
|
|
@ -292,29 +332,57 @@ fi
|
|||
AC_MSG_RESULT($enable_hipparcos)
|
||||
AM_CONDITIONAL(ENABLE_HIPPARCOS, test "x$enable_hipparcos" = "xyes")
|
||||
|
||||
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 \
|
||||
extras/Makefile \
|
||||
textures/Makefile \
|
||||
textures/lores/Makefile \
|
||||
textures/medres/Makefile \
|
||||
textures/hires/Makefile \
|
||||
models/Makefile \
|
||||
shaders/Makefile \
|
||||
fonts/Makefile \
|
||||
src/celestia/res/Makefile \
|
||||
macros/Makefile \
|
||||
manual/Makefile \
|
||||
src/celestia/kde/Makefile \
|
||||
src/celestia/kde/data/Makefile \
|
||||
)
|
||||
AC_ARG_WITH(lua, [ --with-lua[=DIR] Use Lua for Celestia Extension Language support],
|
||||
enable_lua="$withval", enable_lua="no")
|
||||
AC_ARG_WITH(lua-inc, [ --with-lua-includes[=DIR] Specify location of Lua headers],
|
||||
lua_includes="$withval", lua_includes="no")
|
||||
AC_ARG_WITH(lua-lib, [ --with-lua-libs[=DIR] Specify location of Lua libs],
|
||||
lua_libs="$withval", lua_libs="no")
|
||||
|
||||
AC_MSG_CHECKING([whether we enable Celestia Extension Language])
|
||||
if test "$enable_lua" != "no" ; then
|
||||
CXXFLAGS="$CXXFLAGS -DCELX"
|
||||
LDFLAGS="$LDFLAGS -llualib -llua"
|
||||
if test "$lua_includes" != "no" ; then
|
||||
CXXFLAGS="$CXXFLAGS -I$lua_includes"
|
||||
fi
|
||||
if test "$lua_libs" != "no" ; then
|
||||
LIBS="$LIBS -L$lua_libs"
|
||||
fi
|
||||
AC_MSG_RESULT(yes)
|
||||
if test "$enable_lua" != "yes" ; then
|
||||
CXXFLAGS="$CXXFLAGS -I$enable_lua/include"
|
||||
LIBS="$LIBS -L$enable_lua/lib"
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_CELX, test "$enable_lua" != "no")
|
||||
|
||||
|
||||
AC_CONFIG_FILES([ Makefile ])
|
||||
AC_CONFIG_FILES([ src/Makefile ])
|
||||
AC_CONFIG_FILES([ src/celutil/Makefile ])
|
||||
AC_CONFIG_FILES([ src/celmath/Makefile ])
|
||||
AC_CONFIG_FILES([ src/cel3ds/Makefile ])
|
||||
AC_CONFIG_FILES([ src/celtxf/Makefile ])
|
||||
AC_CONFIG_FILES([ src/celengine/Makefile ])
|
||||
AC_CONFIG_FILES([ src/celestia/Makefile ])
|
||||
AC_CONFIG_FILES([ data/Makefile ])
|
||||
AC_CONFIG_FILES([ extras/Makefile ])
|
||||
AC_CONFIG_FILES([ textures/Makefile ])
|
||||
AC_CONFIG_FILES([ textures/lores/Makefile ])
|
||||
AC_CONFIG_FILES([ textures/medres/Makefile ])
|
||||
AC_CONFIG_FILES([ textures/hires/Makefile ])
|
||||
AC_CONFIG_FILES([ models/Makefile ])
|
||||
AC_CONFIG_FILES([ shaders/Makefile ])
|
||||
AC_CONFIG_FILES([ fonts/Makefile ])
|
||||
AC_CONFIG_FILES([ src/celestia/res/Makefile ])
|
||||
AC_CONFIG_FILES([ macros/Makefile ])
|
||||
AC_CONFIG_FILES([ manual/Makefile ])
|
||||
AC_CONFIG_FILES([ src/celestia/kde/Makefile ])
|
||||
AC_CONFIG_FILES([ src/celestia/kde/data/Makefile ])
|
||||
AC_OUTPUT
|
||||
|
||||
AC_MSG_RESULT()
|
||||
AC_MSG_RESULT()
|
||||
|
|
|
|||
|
|
@ -3,19 +3,24 @@ SUBDIRS = res kde
|
|||
bin_PROGRAMS = celestia
|
||||
INCLUDES = -I..
|
||||
|
||||
if ENABLE_GTK
|
||||
FRONTENDSOURCE = gtkmain.cpp
|
||||
else
|
||||
if ENABLE_KDE
|
||||
FRONTENDSOURCE =
|
||||
celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) \
|
||||
kde/libkdegui.a
|
||||
|
||||
celestia_DEPENDENCIES = kde/libkdegui.a
|
||||
if ENABLE_KDE
|
||||
celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
|
||||
$(LIBSOCKET) kde/libkdegui.a
|
||||
celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||
endif
|
||||
endif
|
||||
|
||||
if ENABLE_CELX
|
||||
COMMONSOURCES = \
|
||||
celestiacore.cpp \
|
||||
configfile.cpp \
|
||||
destination.cpp \
|
||||
eclipsefinder.cpp\
|
||||
favorites.cpp \
|
||||
imagecapture.cpp \
|
||||
url.cpp \
|
||||
celx.cpp
|
||||
else !ENABLE_CELX
|
||||
COMMONSOURCES = \
|
||||
celestiacore.cpp \
|
||||
configfile.cpp \
|
||||
|
|
@ -24,6 +29,8 @@ COMMONSOURCES = \
|
|||
favorites.cpp \
|
||||
imagecapture.cpp \
|
||||
url.cpp
|
||||
endif !ENABLE_CELX
|
||||
|
||||
|
||||
WINSOURCES = \
|
||||
wingotodlg.cpp \
|
||||
|
|
@ -35,7 +42,18 @@ WINSOURCES = \
|
|||
winviewoptsdlg.cpp \
|
||||
avicapture.cpp
|
||||
|
||||
celestia_SOURCES = $(COMMONSOURCES) $(FRONTENDSOURCE)
|
||||
if ENABLE_GTK
|
||||
celestia_SOURCES = $(COMMONSOURCES) gtkmain.cpp
|
||||
else !ENABLE_GTK
|
||||
|
||||
if ENABLE_GLUT
|
||||
celestia_SOURCES = $(COMMONSOURCES) glutmain.cpp
|
||||
else !ENABLE_GLUT
|
||||
celestia_SOURCES = $(COMMONSOURCES)
|
||||
endif !ENABLE_GLUT
|
||||
endif !ENABLE_GTK
|
||||
|
||||
|
||||
EXTRA_celestia_SOURCES = gtkmain.cpp glutmain.cpp $(WINSOURCES)
|
||||
EXTRA_DIST = Celestia.dsp celestia.mak
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include "celx.h"
|
||||
#include "celestiacore.h"
|
||||
extern "C" {
|
||||
#include "lua/lualib.h"
|
||||
#include "lualib.h"
|
||||
}
|
||||
|
||||
using namespace std;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#include <iostream>
|
||||
#include <string>
|
||||
extern "C" {
|
||||
#include "lua/lua.h"
|
||||
#include "lua.h"
|
||||
}
|
||||
|
||||
class CelestiaCore;
|
||||
|
|
|
|||
Loading…
Reference in New Issue