projects
/
m4-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.indexdata.com/m4
[m4-moved-to-github.git]
/
usemarcon.m4
diff --git
a/usemarcon.m4
b/usemarcon.m4
index
cebfa46
..
8c7fb45
100644
(file)
--- a/
usemarcon.m4
+++ b/
usemarcon.m4
@@
-6,9
+6,7
@@
AC_DEFUN([USEMARCON_INIT],
usemarconpath=NONE
AC_ARG_WITH(usemarcon, [ --with-usemarcon=DIR usemarcon-config in DIR (example /home/usemarcon145)], [usemarconpath=$withval])
usemarconpath=NONE
AC_ARG_WITH(usemarcon, [ --with-usemarcon=DIR usemarcon-config in DIR (example /home/usemarcon145)], [usemarconpath=$withval])
- if test "x$usemarconpath" != "xNONE"; then
- usemarconconfig=$usemarconpath/usemarcon-config
- else
+ if test "$usemarconpath" = "NONE"; then
if test "x$srcdir" = "x"; then
usemarconsrcdir=.
else
if test "x$srcdir" = "x"; then
usemarconsrcdir=.
else
@@
-24,6
+22,8
@@
AC_DEFUN([USEMARCON_INIT],
if test "x$usemarconconfig" = "xNONE"; then
AC_PATH_PROG(usemarconconfig, usemarcon-config, NONE)
fi
if test "x$usemarconconfig" = "xNONE"; then
AC_PATH_PROG(usemarconconfig, usemarcon-config, NONE)
fi
+ elif test "$usemarconpath" != "no"; then
+ usemarconconfig=$usemarconpath/usemarcon-config
fi
AC_MSG_CHECKING(for USEMARCON)
fi
AC_MSG_CHECKING(for USEMARCON)
@@
-32,7
+32,7
@@
AC_DEFUN([USEMARCON_INIT],
USEMARCONINC=`$usemarconconfig --cflags $1`
USEMARCONVERSION=`$usemarconconfig --version`
AC_MSG_RESULT($usemarconconfig)
USEMARCONINC=`$usemarconconfig --cflags $1`
USEMARCONVERSION=`$usemarconconfig --version`
AC_MSG_RESULT($usemarconconfig)
- AC_DEFINE(HAVE_USEMARCON)
+ AC_DEFINE([HAVE_USEMARCON],[1],[Define to 1 if USEMARCON is used])
else
AC_MSG_RESULT(Not found)
USEMARCONVERSION=NONE
else
AC_MSG_RESULT(Not found)
USEMARCONVERSION=NONE