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

update for newer automake

pull/3/head
Hleb Valoshka 2018-02-24 15:37:47 +03:00
parent f48a72f9bc
commit 0546fd1bec
16 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.in → configure.ac
View File

@ -4,8 +4,9 @@ dnl Process this file with autoconf to make a configure script
dnl
AC_PREREQ(2.57)
AC_INIT([celestia], [1.6.0], [celestia-developers@lists.sf.net])
AC_INIT([celestia], [1.7.0], [celestia-developers@lists.sf.net])
AC_CONFIG_SRCDIR(acinclude.m4)
AC_CONFIG_MACRO_DIRS([macros])
dnl The following section confirms that the user provided necessary option
dnl BEFORE anything is checked.
@ -19,7 +20,7 @@ ui_qt="no"
AC_ARG_WITH([glut],
AC_HELP_STRING([--with-glut], [Use Glut for the UI]),
ui_glut="yes")
AC_ARG_WITH([gtk],
AC_HELP_STRING([--with-gtk], [Use Gtk for an enhanced GUI]),
ui_gtk="yes")
@ -79,7 +80,7 @@ AC_CANONICAL_SYSTEM
dnl Perform program name transformation
AC_ARG_PROGRAM
AM_INIT_AUTOMAKE([-Wno-portability])
AM_INIT_AUTOMAKE([-Wno-portability subdir-objects])
AM_CONFIG_HEADER(config.h)
AM_PO_SUBDIRS
@ -152,7 +153,7 @@ dnl
AC_ARG_WITH([cspice-dir],
AC_HELP_STRING([--with-cspice-dir=DIR], [Specify SPICE directory location]),
SPICE_CFLAGS="-I$withval/include -DUSE_SPICE";
SPICE_CFLAGS="-I$withval/include -DUSE_SPICE";
SPICE_LIBS="$withval/lib/cspice.a")
AC_SUBST(SPICE_CFLAGS)
@ -386,11 +387,11 @@ if (test "$enable_lua" != "no"); then
LUA_VER=0
PKG_CHECK_MODULES(LUA, lua5.2 >= 5.2.0, LUA_VER=0x050200, [
PKG_CHECK_MODULES(LUA, lua >= 5.2.0, LUA_VER=0x050200, [
PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1.0, LUA_VER=0x050100,
[ PKG_CHECK_MODULES(LUA, lua >= 5.1.0, LUA_VER=0x050100,
PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1.0, LUA_VER=0x050100,
[ PKG_CHECK_MODULES(LUA, lua >= 5.1.0, LUA_VER=0x050100,
[ PKG_CHECK_MODULES(LUA, lua50 >= 5.0.0 lua50 < 5.1.0, LUA_VER=0x050000,
[ PKG_CHECK_MODULES(LUA, lua >= 5.0.0 lua < 5.1.0, LUA_VER=0x050000, AC_MSG_RESULT([no])) ]
) ]
[ PKG_CHECK_MODULES(LUA, lua >= 5.0.0 lua < 5.1.0, LUA_VER=0x050000, AC_MSG_RESULT([no])) ]
) ]
) ]
) ] ) ] )
if (test "$LUA_VER" = "0x050000"); then
@ -502,7 +503,7 @@ AC_MSG_RESULT([Use Lua: $enable_lua]);
if (test "$LUA_VER" = "0x050000"); then
AC_MSG_RESULT([ Warning: Lua 5.1 is not available on your system, Lua 5.0 will be used
instead but it may not be fully compatible with existing CELX scripts.
instead but it may not be fully compatible with existing CELX scripts.
It is recommanded that you install Lua 5.0 and rerun configure.]);
fi

1
po/Makefile.in.in
View File

@ -31,6 +31,7 @@ gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
mkinstalldirs = $(SHELL) @install_sh@ -d
MKDIR_P = @MKDIR_P@
mkdir_p = @mkdir_p@
GMSGFMT_ = @GMSGFMT@

8
po/be.po
View File

@ -6,7 +6,7 @@ msgstr ""
"PO-Revision-Date: \n"
"Last-Translator: Hleb Valoshka <375gnu@gmail.com>\n"
"Language-Team: belarusian <i18n@mova.org>\n"
"Language: \n"
"Language: belarusian\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -28,7 +28,7 @@ msgstr "STD"
#: src/celengine/dsodb.cpp:387
msgid "Loaded "
msgstr "Загружаны"
msgstr "Загружана "
#: src/celengine/dsodb.cpp:387
msgid " deep space objects"
@ -110,7 +110,7 @@ msgstr " прымітываў, "
#: src/celengine/meshmanager.cpp:165
msgid " materials "
msgstr " матар'ялаў"
msgstr " матар'ялаў "
#: src/celengine/meshmanager.cpp:166
msgid " unique)\n"
@ -739,7 +739,7 @@ msgstr "Трымаць "
#: src/celestia/celestiacore.cpp:3592
msgid "Follow "
msgstr "Ісьці ўсьлед "
msgstr "Ідзём за аб'ектам: "
#: src/celestia/celestiacore.cpp:3597
msgid "Sync Orbit "

1
po2/Makefile.in.in
View File

@ -31,6 +31,7 @@ gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
mkinstalldirs = $(SHELL) @install_sh@ -d
MKDIR_P = @MKDIR_P@
mkdir_p = @mkdir_p@
GMSGFMT_ = @GMSGFMT@

2
src/Makefile.am
View File

@ -2,7 +2,7 @@ SUBDIRS = celutil celmath cel3ds celtxf celengine celephem celmodel celestia
DEFS = -DHIP_DATA_DIR='"$(HIPDIR)"' @DEFS@
INCLUDES = -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
AM_CPPFLAGS = -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
buildstardb_SOURCES = buildstardb.cpp
EXTRA_DIST = packdb.cpp packnames.cpp readstars.cpp

2
src/cel3ds/Makefile.am
View File

@ -1,7 +1,7 @@
noinst_LIBRARIES = libcel3ds.a
noinst_HEADERS = $(wildcard *.h)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen
libcel3ds_a_SOURCES = \
3dsmodel.cpp \

10
src/celengine/Makefile.am
View File

@ -1,10 +1,11 @@
noinst_LIBRARIES = libcelengine.a
noinst_HEADERS = $(wildcard *.h)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/curveplot/include \
-I$(top_srcdir)/thirdparty/glew/include
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/curveplot/include
libcelengine_a_CXXFLAGS = $(LUA_CFLAGS) $(SPICE_CFLAGS)
libcelengine_a_CXXFLAGS = $(LUA_CFLAGS) $(SPICE_CFLAGS) $(GLEW_CFLAGS)
AM_LDFLAGS = $(LUA_LDFLAGS) $(GLEW_LDFLAGS)
libcelengine_a_SOURCES = \
asterism.cpp \
@ -74,5 +75,4 @@ libcelengine_a_SOURCES = \
vertexprog.cpp \
virtualtex.cpp \
visibleregion.cpp \
$(top_srcdir)/thirdparty/glew/src/glew.c \
$(top_srcdir)/thirdparty/curveplot/src/curveplot.cpp
../../thirdparty/curveplot/src/curveplot.cpp

2
src/celephem/Makefile.am
View File

@ -1,7 +1,7 @@
noinst_LIBRARIES = libcelephem.a
noinst_HEADERS = $(wildcard *.h)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen
if ENABLE_SPICE
SPICESOURCES = spiceinterface.cpp spiceorbit.cpp spicerotation.cpp

2
src/celestia/Makefile.am
View File

@ -1,7 +1,7 @@
SUBDIRS =
bin_PROGRAMS = celestia
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
DEFS = -DCONFIG_DATA_DIR='"$(PKGDATADIR)"' -DLOCALEDIR='"$(datadir)/locale"' @DEFS@

2
src/celestia/gtk/Makefile.am
View File

@ -1,6 +1,6 @@
SUBDIRS = data
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
DEFS = -DCONFIG_DATA_DIR='"$(PKGDATADIR)"' -DLOCALEDIR='"$(datadir)/locale"' @DEFS@

2
src/celestia/kde/Makefile.am
View File

@ -30,7 +30,7 @@ if ENABLE_KDE
noinst_LIBRARIES = libkdegui.a
noinst_HEADERS = $(wildcard *.h)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include $(QT_INCLUDES) $(KDE_INCLUDES)
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include $(QT_AM_CPPFLAGS) $(KDE_AM_CPPFLAGS)
libkdegui_a_CXXFLAGS = $(LUA_CFLAGS) $(THEORA_CFLAGS)

2
src/celestia/qt/Makefile.am
View File

@ -76,7 +76,7 @@ if ENABLE_QT
noinst_LIBRARIES = libqtgui.a
noinst_HEADERS = $(QT_HEADERS)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
BUILT_SOURCES = $(MOC_CPP_FILES) $(QRC_CPP_FILES) $(UI_H_FILES)

2
src/celmath/Makefile.am
View File

@ -1,7 +1,7 @@
noinst_LIBRARIES = libcelmath.a
noinst_HEADERS = $(wildcard *.h)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen
libcelmath_a_SOURCES = \
frustum.cpp \

2
src/celmodel/Makefile.am
View File

@ -1,7 +1,7 @@
noinst_LIBRARIES = libcelmodel.a
noinst_HEADERS = $(wildcard *.h)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen
libcelmodel_a_SOURCES = \
material.cpp \

2
src/celtxf/Makefile.am
View File

@ -1,7 +1,7 @@
noinst_LIBRARIES = libceltxf.a
noinst_HEADERS = $(wildcard *.h)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/glew/include
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/glew/include
libceltxf_a_SOURCES = \
texturefont.cpp

2
src/celutil/Makefile.am
View File

@ -18,6 +18,6 @@ WINSOURCES = \
winutil.cpp \
windirectory.cpp
INCLUDES = -I$(top_srcdir)/thirdparty/Eigen
AM_CPPFLAGS = -I$(top_srcdir)/thirdparty/Eigen
EXTRA_libcelutil_a_SOURCES= $(WINSOURCES)