projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added more elements.
[yaz-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
3551f37
..
5e6d0c0
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,24
+1,34
@@
dnl YAZ Toolkit
dnl (c) Index Data 1994-1999
dnl See the file LICENSE for details.
dnl YAZ Toolkit
dnl (c) Index Data 1994-1999
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.11 1999-06-09 14:23:58 adam Exp $
-AC_INIT(include/yaz-version.h)
+dnl $Id: configure.in,v 1.14 1999-12-16 23:36:19 adam Exp $
+AC_INIT(include/yaz/yaz-version.h)
dnl
dnl ------ Checking programs
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_RANLIB
dnl
dnl ------ Checking programs
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_RANLIB
+dnl
+dnl ----- Build root
+AC_SUBST(build_root)
+AC_ARG_WITH(build-root, [ --with-buildroot RPM Build root],[build_root=$withval],[build_root=""])
dnl
dnl ----- YC: The Yaz Compiler
AC_SUBST(ASNMODULE)
dnl
dnl ----- YC: The Yaz Compiler
AC_SUBST(ASNMODULE)
-AC_ARG_ENABLE(yc,[ --enable-yc compile using YAZ' ASN.1 Compiler (YC)])
+AC_SUBST(ILLMODULE)
+AC_SUBST(ILLLIB)
+AC_ARG_ENABLE(yc,[ --enable-yc compile using YAZ' ASN.1 Compiler], , enable_yc=yes)
if test "$enable_yc" = "yes"; then
ASNMODULE="z39.50"
if test "$enable_yc" = "yes"; then
ASNMODULE="z39.50"
- cp -f include/z-proto.h include/proto.h
+ ILLMODULE="ill"
+ ILLLIB=libill.a
+ cp -f include/yaz/z-proto.h include/yaz/proto.h
else
else
+ ILLMODULE=""
ASNMODULE=asn
ASNMODULE=asn
- cp -f include/prt-proto.h include/proto.h
+ ILLLIB=""
+ cp -f include/yaz/prt-proto.h include/yaz/proto.h
fi
dnl
dnl ----- Sockets
fi
dnl
dnl ----- Sockets
@@
-46,7
+56,7
@@
AC_ARG_ENABLE(tcpd,[ --enable-tcpd enable TCP wrapper for server if a
if test "$enable_tcpd" = "yes"; then
AC_MSG_CHECKING(for working tcpd.h)
oldLibs=$LIBS
if test "$enable_tcpd" = "yes"; then
AC_MSG_CHECKING(for working tcpd.h)
oldLibs=$LIBS
- LIBS="$LIBS -lwrap"
+ LIBS="$LIBS -lwrap -lnsl"
AC_TRY_LINK([#include <syslog.h>
#include <tcpd.h>
int allow_severity = LOG_INFO;
AC_TRY_LINK([#include <syslog.h>
#include <tcpd.h>
int allow_severity = LOG_INFO;
@@
-80,4
+90,4
@@
if test "$enable_threads" = "yes"; then
fi
dnl
dnl ------ Makefiles
fi
dnl
dnl ------ Makefiles
-AC_OUTPUT(Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile zutil/Makefile comstack/Makefile client/Makefile server/Makefile ztest/Makefile retrieval/Makefile ccl/Makefile lib/Makefile rfc1006/Makefile)
+AC_OUTPUT(Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile zutil/Makefile comstack/Makefile client/Makefile server/Makefile ztest/Makefile retrieval/Makefile ccl/Makefile lib/Makefile rfc1006/Makefile ill/Makefile)