Mercurial > forge
changeset 11365:1acc87346148 octave-forge
image: changes on autoconf
* rename autogen.sh to bootstrap (following Octave core)
* config AC_INIT macro and checl for mkoctfile
| author | carandraug |
|---|---|
| date | Tue, 08 Jan 2013 03:54:21 +0000 |
| parents | 18d35d9bd3f2 |
| children | b6f9246b1017 |
| files | main/image/src/autogen.sh main/image/src/bootstrap main/image/src/configure.ac |
| diffstat | 3 files changed, 14 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/main/image/src/autogen.sh Tue Jan 08 03:44:43 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -#!/bin/bash - -set -e - -autoconf \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/main/image/src/bootstrap Tue Jan 08 03:54:21 2013 +0000 @@ -0,0 +1,6 @@ +#!/bin/bash +## Octave-Forge: image package bootstrap script +## Run this to generate the configure script + +set -e # halt if unhandled error +autoconf # generate configure script
--- a/main/image/src/configure.ac Tue Jan 08 03:44:43 2013 +0000 +++ b/main/image/src/configure.ac Tue Jan 08 03:54:21 2013 +0000 @@ -1,10 +1,8 @@ AC_PREREQ([2.67]) -AC_INIT -AH_BOTTOM([#include "undef_unordered_map.h"]) +AC_INIT([Octave-Forge image package], [2.1.0+]) -AC_CONFIG_HEADERS(config.h) - - +AH_BOTTOM([#include "undef_unordered_map.h"]) +AC_CONFIG_HEADERS([config.h]) CXXFLAGS="-std=c++0x" CPPFLAGS="-std=c++0x" @@ -12,6 +10,11 @@ AC_PROG_CXX AC_LANG(C++) +AC_CHECK_PROG([HAVE_MKOCTFILE], [mkoctfile], [yes], [no]) +if [test $HAVE_MKOCTFILE = "no"]; then + AC_MSG_ERROR([mkoctfile required to install $PACKAGE_NAME]) +fi + dnl dnl Check for unordered map headers and whether tr1 namespace is dnl required. This is copied from m4/acinclude.m4 from core Octave @@ -47,5 +50,4 @@ OCTAVE_UNORDERED_MAP_HEADERS - AC_OUTPUT