Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed all variables related to the professional release #8

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removed all variables related to the professional release #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
279dce9
Removed all variables related to the profession release
mochrul Oct 8, 2016
7c8cf26
Modernize AM_INIT_AUTOMAKE and add foreign key
mochrul Oct 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 6 additions & 49 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
dnl Process this file with autoconf to produce a configure script.
dnl
dnl There are a couple of environment defined variables which this script
dnl makes use of in addition to the standard CXXFLAGS/LDFLAGS/etc. These are:
dnl
dnl RELEASE_TAG - Debian release tag which is put to debian/changelog
dnl SNAPSHOT_VERSION - snapshot version to add to version number
dnl SOURCE_REVISION - Revision of the source-tree, will added to the version string
dnl

AC_INIT(zorp/main.cc)
AC_CONFIG_MACRO_DIR([m4])
m4_include(m4/ax_cxx_compile_stdcxx_11.m4)

AC_INIT([zorp], m4_esyscmd([tr -d '\n' < VERSION]))
AC_CONFIG_SRCDIR(zorp/main.cc)
AM_INIT_AUTOMAKE([no-define foreign])

dnl ***************************************************************************
dnl Definitions

PACKAGE=zorp-pro
BROCHURE_VERSION="6"
VERSION=`cat $srcdir/VERSION`
ZORP_PRODUCT_NAME="Zorp Professional"
ZORP_LICENSE_VERSION="6.0"
ZORP_PRODUCT_NAME="Zorp GPL"

dnl ***************************************************************************
dnl Dependencies
Expand All @@ -46,36 +39,8 @@ case "$srcdir" in
;;
esac

if test -r $srcdir/dist.conf; then
# read defaults, dist.conf does not change
# values for parameters that are already set
source $srcdir/dist.conf
fi

if test -z "$ZORP_PACKAGE_LICENSE"; then
ZORP_PACKAGE_LICENSE="pro"
fi

if test "$ZORP_PACKAGE_LICENSE" = "gpl"; then
PACKAGE="zorp"
PACKAGE_SUFFIX=""
elif test "$ZORP_PACKAGE_LICENSE" = "pro"; then
PACKAGE_SUFFIX="-pro"
else
AC_ERROR(Invalid license type: %s)
fi

AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

if test -n "$SNAPSHOT_VERSION"; then
VERSION=$VERSION+$SNAPSHOT_VERSION
fi

if test -z "$RELEASE_TAG"; then
RELEASE_TAG=zorp35dbg
fi

AM_CONFIG_HEADER(lib/zorp/zorpconfig.h)
AC_PREFIX_DEFAULT(/usr/local)

Expand Down Expand Up @@ -369,20 +334,15 @@ dnl ***************************************************************************
dnl Size check of pointers
AC_CHECK_SIZEOF(void *)

AC_SUBST(RELEASE_TAG)
AC_SUBST(BROCHURE_VERSION)
AC_SUBST(SNAPSHOT_VERSION)
AC_SUBST(SOURCE_REVISION)

AC_SUBST(ZORP_PACKAGE_LICENSE)
AC_SUBST(PACKAGE_SUFFIX)

AC_DEFINE_UNQUOTED(ZORP_LICENSE_VERSION, "$ZORP_LICENSE_VERSION", [Required license version])
AC_DEFINE_UNQUOTED(ZORP_PRODUCT_NAME, "$ZORP_PRODUCT_NAME", [Required product name in license])
AC_SUBST(ZORP_PRODUCT_NAME)

AC_DEFINE_UNQUOTED(BROCHURE_VERSION, "$BROCHURE_VERSION", [Zorp brochure version])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Zorp package version])
AC_DEFINE_UNQUOTED(VERSION, "$PACKAGE_VERSION", [Zorp package version])
AC_DEFINE_UNQUOTED(ZORP_SOURCE_REVISION, "$SOURCE_REVISION", [Zorp source revision number])

AC_DEFINE_UNQUOTED(ENABLE_DEBUG, `enable_value $enable_debug`, [Enable debugging])
Expand Down Expand Up @@ -464,7 +424,6 @@ coverage: $enable_coverage
ipoptions: $enable_ip_options
ipv6: $enable_ipv6
prefork: $enable_prefork
License: $ZORP_PACKAGE_LICENSE


EOF
Expand All @@ -475,8 +434,6 @@ AC_SUBST(LIBZORP_LT_COMPAT_PL)

AC_SUBST(GLIB_MIN_VERSION)
AC_SUBST(ZORPLL_MIN_VERSION)
AC_SUBST(ZORPLIC_MIN_VERSION)
AC_SUBST(ZORPMISC_MIN_VERSION)
AC_SUBST(OPENSSL_MIN_VERSION)
AC_SUBST(PYTHON_MIN_VERSION)
AC_SUBST(CURRDATE)
Expand Down