configure.ac (epm-4.5) | : | configure.ac (epm-4.5.1) | ||
---|---|---|---|---|
skipping to change at line 18 | skipping to change at line 18 | |||
dnl it under the terms of the GNU General Public License as published by | dnl it under the terms of the GNU General Public License as published by | |||
dnl the Free Software Foundation; either version 2, or (at your option) | dnl the Free Software Foundation; either version 2, or (at your option) | |||
dnl any later version. | dnl any later version. | |||
dnl | dnl | |||
dnl This program is distributed in the hope that it will be useful, | dnl This program is distributed in the hope that it will be useful, | |||
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of | dnl but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
dnl GNU General Public License for more details. | dnl GNU General Public License for more details. | |||
dnl | dnl | |||
AC_INIT([EPM],[4.5],[https://github.com/michaelrsweet/epm/issues],[epm],[https:/ /www.msweet.org/epm]) | AC_INIT([EPM],[4.5.1],[https://github.com/michaelrsweet/epm/issues],[epm],[https ://www.msweet.org/epm]) | |||
AC_CONFIG_HEADER(config.h) | AC_CONFIG_HEADER(config.h) | |||
dnl Version number... | dnl Version number... | |||
VERSION="AC_PACKAGE_VERSION" | VERSION="AC_PACKAGE_VERSION" | |||
VERNUMBER=450 | VERNUMBER=450 | |||
AC_SUBST(VERSION) | AC_SUBST(VERSION) | |||
AC_SUBST(VERNUMBER) | AC_SUBST(VERNUMBER) | |||
AC_DEFINE_UNQUOTED(EPM_VERSION, "ESP Package Manager v$VERSION") | AC_DEFINE_UNQUOTED(EPM_VERSION, "ESP Package Manager v$VERSION") | |||
dnl Get the build and host platforms and split the host_os value | dnl Get the build and host platforms and split the host_os value | |||
skipping to change at line 47 | skipping to change at line 47 | |||
CFLAGS="${CFLAGS:=}" | CFLAGS="${CFLAGS:=}" | |||
CXXFLAGS="${CXXFLAGS:=}" | CXXFLAGS="${CXXFLAGS:=}" | |||
LDFLAGS="${LDFLAGS:=}" | LDFLAGS="${LDFLAGS:=}" | |||
AC_SUBST(LDFLAGS) | AC_SUBST(LDFLAGS) | |||
AC_ARG_WITH(archflags, [ --with-archflags=flags specify architecture flags [[d efault=none]]], | AC_ARG_WITH(archflags, [ --with-archflags=flags specify architecture flags [[d efault=none]]], | |||
ARCHFLAGS="$withval", | ARCHFLAGS="$withval", | |||
ARCHFLAGS="${ARCHFLAGS:=}") | ARCHFLAGS="${ARCHFLAGS:=}") | |||
AC_SUBST(ARCHFLAGS) | AC_SUBST(ARCHFLAGS) | |||
AC_ARG_WITH(optim, [ --with-optim=flags specify optimization flags [[defau | AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging, default=no]) | |||
lt=auto]]], | AC_ARG_ENABLE(sanitizer, [ --enable-sanitizer build with AddressSanitizer, | |||
OPTIM="$withval", | default=no]) | |||
OPTIM="${OPTIM:=}") | ||||
AC_SUBST(OPTIM) | ||||
AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [[default=no]] | if test "x$enable_debug" = xyes; then | |||
], | OPTIM="-g" | |||
if eval "test x$enable_debug = xyes"; then | CSFLAGS="" | |||
OPTIM="-g $OPTIM" | ||||
else | else | |||
LDFLAGS="$LDFLAGS -s" | OPTIM="-Os -g" | |||
fi) | CSFLAGS="-o runtime" | |||
fi | ||||
AC_SUBST(CSFLAGS) | ||||
AC_SUBST(OPTIM) | ||||
AC_ARG_ENABLE(gui, [ --enable-gui turn on GUI utilities [[default=au to]]]) | AC_ARG_ENABLE(gui, [ --enable-gui turn on GUI utilities, default=aut o]) | |||
AC_ARG_WITH(docdir, [ --with-docdir=/dir set directory for documentation | AC_ARG_WITH(docdir, [ --with-docdir=/dir set directory for documentation | |||
[[default=${datadir}/doc/epm]]], | [[default=${datadir}/doc/epm]]], | |||
docdir="$withval", | docdir="$withval", | |||
docdir="\${datadir}/doc/epm") | docdir="\${datadir}/doc/epm") | |||
AC_SUBST(docdir) | AC_SUBST(docdir) | |||
AC_ARG_WITH(softwaredir, [ --with-softwaredir=/dir set directory for EPM uninst all files and init scripts | AC_ARG_WITH(softwaredir, [ --with-softwaredir=/dir set directory for EPM uninst all files and init scripts | |||
[[default=/etc/software]]], | [[default=/etc/software]]], | |||
skipping to change at line 86 | skipping to change at line 88 | |||
AC_PROG_RANLIB | AC_PROG_RANLIB | |||
AC_PATH_PROG(AR,ar) | AC_PATH_PROG(AR,ar) | |||
AC_PATH_PROG(CHMOD,chmod) | AC_PATH_PROG(CHMOD,chmod) | |||
AC_PATH_PROGS(CODE_SIGN, codesign true) | AC_PATH_PROGS(CODE_SIGN, codesign true) | |||
AC_PATH_PROG(CP,cp) | AC_PATH_PROG(CP,cp) | |||
AC_PATH_PROG(GZIP,gzip) | AC_PATH_PROG(GZIP,gzip) | |||
if test x$GZIP = x; then | if test x$GZIP = x; then | |||
AC_MSG_ERROR([GNU zip not found but required.]) | AC_MSG_ERROR([GNU zip not found but required.]) | |||
fi | fi | |||
AC_PATH_PROGS(HTMLDOC, htmldoc echo) | AC_PATH_PROGS(HTMLDOC, htmldoc echo) | |||
AC_PROG_INSTALL | ||||
if test "$INSTALL" = "$ac_install_sh"; then | ||||
# Use full path to install-sh script... | ||||
INSTALL="`pwd`/install-sh -c" | ||||
fi | ||||
AC_PATH_PROG(MKDIR,mkdir) | AC_PATH_PROG(MKDIR,mkdir) | |||
AC_PATH_PROG(RM,rm) | AC_PATH_PROG(RM,rm) | |||
AC_PATH_PROG(RPM,rpm) | AC_PATH_PROG(RPM,rpm) | |||
AC_PATH_PROG(RPMBUILD,rpmbuild) | AC_PATH_PROG(RPMBUILD,rpmbuild) | |||
AC_PATH_PROG(STRIP,strip) | AC_PATH_PROG(STRIP,strip) | |||
dnl Architecture checks... | dnl Architecture checks... | |||
AC_C_CONST | AC_C_CONST | |||
AC_C_CHAR_UNSIGNED | AC_C_CHAR_UNSIGNED | |||
skipping to change at line 157 | skipping to change at line 164 | |||
;; | ;; | |||
*) | *) | |||
# All other OS's do not. | # All other OS's do not. | |||
AC_DEFINE(EPM_COMPRESS, 0) | AC_DEFINE(EPM_COMPRESS, 0) | |||
;; | ;; | |||
esac | esac | |||
dnl Update compiler options... | dnl Update compiler options... | |||
if test -n "$GCC"; then | if test -n "$GCC"; then | |||
# Add standard optimization options... | if test x$enable_sanitizer = xyes; then | |||
if test -z "$OPTIM"; then | # Use -fsanitize=address with debugging... | |||
OPTIM="-Os" | OPTIM="-g -fsanitize=address" | |||
else | ||||
# Otherwise use the Fortify enhancements to catch any unbounded | ||||
# string operations... | ||||
CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" | ||||
CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" | ||||
fi | fi | |||
# Add useful warning options... | # Add useful warning options... | |||
CFLAGS="-Wall -Wformat -Wno-format-y2k -Wunused $CFLAGS" | CFLAGS="-Wall -Wformat -Wno-format-y2k -Wunused $CFLAGS" | |||
CXXFLAGS="-Wall -Wformat -Wno-format-y2k -Wunused $CXXFLAGS" | CXXFLAGS="-Wall -Wformat -Wno-format-y2k -Wunused $CXXFLAGS" | |||
# See if GCC supports -Wno-format-truncation... | # See if GCC supports -Wno-format-truncation... | |||
AC_MSG_CHECKING(if GCC supports -Wno-format-truncation) | AC_MSG_CHECKING(if GCC supports -Wno-format-truncation) | |||
OLDCFLAGS="$CFLAGS" | OLDCFLAGS="$CFLAGS" | |||
CFLAGS="$CFLAGS -Werror -Wno-format-truncation" | CFLAGS="$CFLAGS -Werror -Wno-format-truncation" | |||
End of changes. 7 change blocks. | ||||
16 lines changed or deleted | 27 lines changed or added |