Skip to content

Commit

Permalink
[unix] Make .configure script COMPILED_BY parameter optional, def…
Browse files Browse the repository at this point in the history
…aulting to login name.
  • Loading branch information
c-lipka committed Sep 9, 2018
1 parent 6358094 commit 96489d4
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 33 deletions.
3 changes: 3 additions & 0 deletions changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ Other Noteworthy
cause POV-Ray to print its abbreviated version number to standard output.
- The `unix/prebuild.sh` script can now be run from the main directory; it is
no longer necessary to change to the unix directory first.
- The `./configure` script can now be run without the `COMPILED_BY=...`
option. In this case it defaults to `$USER <no contact address>`, where
`$USER` is your login name.


Changes between 3.7.1-beta.9 and 3.7.1-rc.1
Expand Down
28 changes: 3 additions & 25 deletions unix/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#
##############################################################################

# configure.ac for the source distribution of POV-Ray 3.8 for UNIX
# configure.ac for the source distribution of POV-Ray v3.8 for UNIX
# Report bugs via https://github.com/POV-Ray/povray/issues
#
# Based on configure.ac from POV-Ray v3.7
Expand Down Expand Up @@ -109,7 +109,7 @@ AX_ARG_WITH([--with-libsdl], [DIR], [use the SDL library (in directory DI
AX_ARG_WITH([--with-libmkl], [DIR], [use the Intel(R) Math Kernel Library (in directory DIR)])
AX_ARG_WITH([--with-openexr], [DIR], [use the OpenEXR library (in directory DIR)])

AC_ARG_VAR([COMPILED_BY], [customize the "unofficial version" message (required argument)])
AC_ARG_VAR([COMPILED_BY], [customize the "unofficial version" message])
AC_ARG_VAR([NON_REDISTRIBUTABLE_BUILD], [see the installation documentation])
AC_ARG_VAR([C99_COMPATIBLE_RADIOSITY], [adapt radiosity code to non-IEEE 754 floating point, requires ISO C99 compiler and library (see octree.cpp for details)])

Expand All @@ -122,29 +122,7 @@ rm -f ./povray.ini

# Instruction message.
if test x"$COMPILED_BY" = x""; then
echo "
Welcome to the $PACKAGE_NAME $PACKAGE_VERSION configure script.

This script will prepare the source distribution of $PACKAGE_NAME $PACKAGE_VERSION for Unix
for compilation on this machine. Compiling the program yourself means
that the POV-Ray Team(tm) is not responsible for supporting this
version, no matter if it is the unmodified official POV-Ray source code
or a customized version. Refer to the POV-Ray source license conditions
that come with this package.

In order to start configuration, you have to provide a valid contact
information that will be included in the executable and displayed
whenever POV-Ray (or a modified version of it) is started. In case
you intend to distribute this binary, this information will help users
to contact the appropriate maintainers. To start configuring $PACKAGE_NAME
type in the following command with your own contact information:

./configure COMPILED_BY=\"your name <email@address>\"

Please consult the INSTALL file for additional configuration and
installation instructions.
"
exit 1
COMPILED_BY="$USER <no contact address>"
fi

pov_no_distrib="${NON_REDISTRIBUTABLE_BUILD:-no}"
Expand Down
17 changes: 9 additions & 8 deletions unix/install.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ usual 'configure' and 'make' commands. For a system-wide installation:
make check
sudo make install

The COMPILED_BY argument to 'configure' is mandatory and must be filled
The COMPILED_BY argument to 'configure' should be filled
with your name and/or organization so that the generated binary can be
differentiated from official POV-Ray builds.

Expand Down Expand Up @@ -92,12 +92,12 @@ The build system must have:
- a working 'make' utility. We strongly recommand to use GNU Make version 3.79
or above. Most GNU/Linux distribution should come with it. Other platforms
should install it before running configure. GNU make can be found at:
http://www.gnu.org/software/make
https://www.gnu.org/software/make/

- in the unlikely case you don't have a Bourne-compatible shell installed
on your system or that the shell fails running POV-Ray's configure, it is
recommanded to install GNU bash first. Download it at:
http://www.gnu.org/software/bash
https://www.gnu.org/software/bash/


2.2 Required support libraries
Expand Down Expand Up @@ -140,7 +140,7 @@ recommanded to generate a fully-featured POV-Ray executable.
http://www.libsdl.org


2.3 Compatibility issues
2.4 Compatibility issues
====================

- Boost version 1.46 has been reported to be unstable on the Raspberry Pi 2.
Expand Down Expand Up @@ -183,7 +183,7 @@ Configure POV-Ray for building and installing in standard directories:

Here, these commands are run in the source directory of POV-Ray (but this is
not required, see section 3.1.3 below). Note that the COMPILED_BY argument
is mandatory. The 'check' target for 'make' may be omitted (no test render
is highly recommended. The 'check' target for 'make' may be omitted (no test render
is performed) in particular when building POV-Ray in batch.

The top Makefile generated by configure supports the following targets:
Expand Down Expand Up @@ -472,10 +472,11 @@ Additional POV-Ray specific options are:
risk.

COMPILED_BY="your name <email@address>"
this option is required when configuring the source package. Please
provide with a valid contact information that will be included in the
this option is highly recommended when configuring the source package.
Please provide a valid contact information that will be included in the
executable and displayed whenever POV-Ray (or a modified version) is
started.
started. If not specified, this option will default to your login
name and "<no contact address>".

NON_REDISTRIBUTABLE_BUILD=yes
this option must be used in case one needs to build POV-Ray without
Expand Down

0 comments on commit 96489d4

Please sign in to comment.