dvorka/hstr
1
1
Fork 0
mirror of https://github.com/dvorka/hstr.git synced 2025-01-27 09:18:03 +08:00
Code Issues Projects Releases Packages Wiki Activity

Making Mac related build process changes: unfortunately single configure.ac cannot be used as macro detecting the platform doesn't work when releasing hstr via launchpad.

Browse source
This commit is contained in:
Martin Dvorak 2015-02-26 23:38:44 +01:00
parent 10fca39f4a
commit 9decd1ad01
5 changed files with 68 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
INSTALLATION.md
View file

@ -100,6 +100,7 @@ port install ncurses
Build and install:
```bash
cp -vf dist/mac/configure.ac configure.ac
autoreconf -fvi
./configure CFLAGS=-I$(brew --prefix)/opt/readline/include LDFLAGS=-L$(brew --prefix)/opt/readline/lib
make

18
configure.ac
View file

@ -4,7 +4,7 @@
AC_PREREQ([2.69])
AC_INIT(hh, 1.15, martin.dvorak@mindforger.com)
AC_INIT(hh, 1.16, martin.dvorak@mindforger.com)
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
# Checks for src dir existence.
@ -16,19 +16,9 @@ AM_INIT_AUTOMAKE
# Checks for programs.
AC_PROG_CC
# Mac-specific ncurses check
AC_CANONICAL_HOST
AS_CASE([$host_os],
[darwin*],
[
AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
AC_CHECK_HEADER(curses.h)
],
[
AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
AC_CHECK_HEADER(ncursesw/curses.h)
]
)
# ncurses check.
AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
AC_CHECK_HEADER(ncursesw/curses.h)
# Checks for libraries.
AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])

4
dist/github-env.sh vendored
View file

@ -4,7 +4,7 @@ export NOW=`date +%Y-%m-%d--%H-%M-%S`
export GH_RELEASE_DIR=~/p/hstr/release
export GH_DISTRO_DIR=${GH_RELEASE_DIR}/release-${NOW}
export HHVERSION="1.15"
export GH_MSG="Enter first item auto-select, Vim keybinding, doc improvements."
export HHVERSION="1.16"
export GH_MSG="History timestamps, Zsh support and management fixes."
# eof

58
dist/mac/configure.ac vendored Normal file
View file

@ -0,0 +1,58 @@
#
# Process this file with autoconf to produce a configure script.
#
AC_PREREQ([2.69])
AC_INIT(hh, 1.16, martin.dvorak@mindforger.com)
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
# Checks for src dir existence.
AC_CONFIG_SRCDIR([src/hstr.c])
# Init (no longer takes parameters).
AM_INIT_AUTOMAKE
# Checks for programs.
AC_PROG_CC
# Mac specific ncurses check
# Unfortunately AC_CANONICAL_HOST macro cannot be used to
# detect Linux/Mac platform as it actives the use of config.sub/config.guess
# which doesn't work when building for launchpad (and @ launchpad)
AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
AC_CHECK_HEADER(curses.h)
# Checks for libraries.
AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
AC_CHECK_LIB(readline, using_history, [], [AC_MSG_ERROR([Could not find readline library])])
# Checks for header files.
AC_CHECK_HEADER(assert.h)
AC_CHECK_HEADER(ctype.h)
AC_CHECK_HEADER(fcntl.h)
AC_CHECK_HEADER(getopt.h)
AC_CHECK_HEADER(locale.h)
AC_CHECK_HEADER(math.h)
AC_CHECK_HEADER(readline/history.h)
AC_CHECK_HEADER(regex.h)
AC_CHECK_HEADER(signal.h)
AC_CHECK_HEADER(stdbool.h)
AC_CHECK_HEADER(stddef.h)
AC_CHECK_HEADER(stdio.h)
AC_CHECK_HEADER(stdlib.h)
AC_CHECK_HEADER(string.h)
AC_CHECK_HEADER(sys/ioctl.h)
AC_CHECK_HEADER(termios.h)
AC_CHECK_HEADER(unistd.h)
AC_CHECK_HEADER(wchar.h)
# Checks for typedefs, structures, and compiler characteristics.
AC_CHECK_HEADER_STDBOOL
AC_TYPE_SIZE_T
# Checks for library functions.
AC_FUNC_MALLOC
AC_CHECK_FUNCS([memset strdup strstr])
AC_OUTPUT

6
dist/ubuntu-make-all-distros.sh vendored
View file

@ -1,8 +1,8 @@
#!/bin/bash
export HHBZRMSG="Enter first item auto-select, Vim keybinding, doc improvements."
export VERSION=1.15.
export MINOR=3
export HHBZRMSG="History timestamps, Zsh support and management fixes."
export VERSION=1.16.
export MINOR=1
# precise quantal saucy / precise trusty utopic
for DISTRO in trusty utopic