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.

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

Update configure.ac (fixes warnings from autoconf) #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
8 changes: 3 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@
dnl Catch macros that are not expanded.
m4_pattern_forbid([^(AX|OLN)_])

AC_PREREQ([2.61])
AC_PREREQ([2.71])
stweil marked this conversation as resolved.
Show resolved Hide resolved


## ---------------- ##
## Package set up. ##
## ---------------- ##

AC_INIT([Olena], [2.1], [[email protected]], [olena],
[http://olena.lrde.epita.fr])
AC_INIT([Olena],[2.1],[[email protected]],[olena],[http://olena.lrde.epita.fr])

# M4 macros.
AC_CONFIG_MACRO_DIR([m4])
Expand Down Expand Up @@ -231,8 +230,7 @@ AC_ARG_ENABLE([all],
## ------------------ ##

# Use Libtool.
# To be replaced by a call to LT_INIT as soon as Libtool 2.2 is used.
AC_PROG_LIBTOOL
LT_INIT

# Check for Darwin.
AC_CANONICAL_HOST
Expand Down
6 changes: 3 additions & 3 deletions m4/oln-with-lib.m4
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ AC_DEFUN([OLN_WITH_TESSERACT],
AC_REQUIRE([AC_PROG_CXX])
AC_LANG_PUSH([C++])
AC_ARG_WITH([tesseract],
[AC_HELP_STRING([--with-tesseract@<:@=DIR@:>@],
[AS_HELP_STRING([--with-tesseract@<:@=DIR@:>@],
[use $1 (DIR = prefix for TESSERACT installation)])])
TESSERACT_CPPFLAGS=''
TESSERACT_LDFLAGS=''
Expand Down Expand Up @@ -125,7 +125,7 @@ AC_DEFUN([_OLN_WITH_LIB],
AC_REQUIRE([AC_PROG_CXX])
AC_LANG_PUSH([C++])
AC_ARG_WITH([$4],
[AC_HELP_STRING([--with-$4@<:@=DIR@:>@],
[AS_HELP_STRING([--with-$4@<:@=DIR@:>@],
[use $1 (DIR = prefix for $1 installation)])])
$5_CPPFLAGS=''
$5_LDFLAGS=''
Expand Down Expand Up @@ -177,7 +177,7 @@ AC_DEFUN([_OLN_WITH_LIB_PKG_CONFIG],
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_LANG_PUSH([C++])
AC_ARG_WITH([$4],
[AC_HELP_STRING([--with-$4@<:@=DIR@:>@],
[AS_HELP_STRING([--with-$4@<:@=DIR@:>@],
[use $1 (DIR = prefix for $1 installation)])])
$5_CPPFLAGS=''
$5_LDFLAGS=''
Expand Down