-dnl $Id: configure.in,v 1.121 2001-10-30 17:53:45 jmarcus Exp $
+dnl $Id: configure.in,v 1.126 2001-11-16 15:44:31 srittau Exp $
dnl configure.in for netatalk
AC_INIT(bin/adv1tov2/adv1tov2.c)
db3_required=no
dnl Check for CNID DB support
+AC_MSG_CHECKING([whether CNID support should be enabled])
AC_ARG_ENABLE(cnid-db,
[ --enable-cnid-db use persistent cnid database per volume (EXPERIMENTAL) ],
- if test "x$enableval" = "xyes"; then
- dnl Now we need DB3
- db3_required="yes"
-
- dnl Note that we don't AC_DEFINE(CNID_DB, 1) here...
- dnl we have to check for the library first.
- dnl AC_MSG_RESULT([db3 check enabled])
- fi
+ [
+ if test "x$enableval" = "xyes"; then
+ dnl Now we need DB3
+ db3_required="yes"
+ AC_DEFINE(CNID_DB)
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ ],[AC_MSG_RESULT([no])]
)
dnl Check for Berkeley DB3 library
-AC_ARG_WITH(db3,
- [ --with-db3=PATH specify path to Berkeley DB3 installation],
- if test "x$withval" != "xno"; then
- trydb3dir="$withval"
- fi
-)
-
-db3_found=no
-for db3dir in "" $trydb3dir "$trydb3dir/include" /usr/local/BerkeleyDB.3.3/include /usr/include/db3 /usr/local/include/db3 ; do
- if test -f "$db3dir/db.h" ; then
- db3libdir="`echo $db3dir | sed 's/include\/db3$/lib/'`"
- db3libdir="`echo $db3libdir | sed 's/include$/lib/'`"
- LDFLAGS="$LDFLAGS -L$db3libdir"
- CFLAGS="$CFLAGS -I$db3dir"
-
- dnl If we require DB3, die if we don't have it
- if test "x$db3_required" != "xno"; then
- AC_CHECK_LIB(db, main,
- dnl AC_MSG_RESULT([enabling db3 support])
- db3_found=yes
- dnl -- also enable CNID DB when this is found
- AC_DEFINE(CNID_DB, 1)
- AC_MSG_RESULT([using persistent cnid database per volume])
- LIBS="$LIBS -ldb",
- dnl Not Found
- AC_MSG_ERROR([Berkeley DB3 library not found!])
- )
- fi
- break
- fi
-done
-
-dnl Die if the library is required, but not found
-if test "x$db3_required" != "xno"; then
- if test "x$db3_found" = "xno"; then
- dnl Not Found
- AC_MSG_ERROR([Berkeley DB3 library not found!])
- fi
+if test "x$db3_required" = "xyes"; then
+ AC_PATH_DB3(, [AC_MSG_ERROR([Berkeley DB3 library not found!])])
fi
+CFLAGS="$CFLAGS $DB3_CFLAGS"
+LIBS="$LIBS $DB3_LIBS"
AC_ARG_WITH(did,
[ --with-did=SCHEME set DID scheme (last,mtab)],
msg_dir=""
AC_ARG_WITH(message-dir,
- [ --with-msg-dir=PATH path to message files [[PKGCONF/msg]]],
+ [ --with-message-dir=PATH path to message files [[PKGCONF/msg]]],
msg_dir="$withval"
if test x"$msg_dir" = "x"; then
msg_dir="${PKGCONFDIR}/msg"
if test "x$srvloc" != "xno"; then
for slpdir in "" $srvloc /usr /usr/local ; do
if test -f "$slpdir/include/slp.h" ; then
- LDFLAGS="$LDFLAGS -L$slpdir/lib -lslp"
+ LIBS="$LIBS -L$slpdir/lib -lslp"
CFLAGS="$CFLAGS -I$slpdir/include"
AC_CHECK_LIB(slp,SLPOpen)
AC_CHECK_FUNCS(SLPReg SLPDereg SLPClose)
fi
# Check for PAM libs
-AC_MSG_CHECKING([should we even bother with PAM])
+AC_MSG_CHECKING([if we should even bother with PAM])
AC_ARG_WITH(pam,
[ --with-pam enable PAM support],
[PAM_MSG="$withval"],
dnl --------------------------------------------------------------------------
dnl drop in includes for top level directory structures here...
dnl --------------------------------------------------------------------------
-LDFLAGS="$LDFLAGS -L\$(top_srcdir)/libatalk/"
-CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I\$(top_srcdir)/sys"
+
+dnl Note: $(top_srcdir)/include should be added before all other includes
+dnl so that includes from that directory a preferred to includes from
+dnl /usr/include or similar places.
+LIBS="$LIBS -L\$(top_srcdir)/libatalk"
+CFLAGS="-I\$(top_srcdir)/include $CFLAGS -I\$(top_srcdir)/sys"
dnl --------------------------------------------------------------------------
dnl specific configuration comes in here:
AC_DEFINE(BSD4_4)
AC_DEFINE(SENDFILE_FLAVOR_BSD)
- dnl ----- Set -shared flag
- LDSHAREDFLAGS="-shared"
AC_DEFINE(NO_CRYPT_H, 1)
fi
if test x"$this_os" = "xlinux"; then
AC_MSG_RESULT([ * Linux specific configuration])
- dnl ----- Set -shared flag
- LDSHAREDFLAGS="-shared"
-
dnl ----- check if we need the quotactl wrapper
AC_CHECK_HEADERS(sys/quota.h linux/quota.h)
AC_CHECK_FUNC(quotactl,,
AC_DEFINE(HAVE_2ARG_DBTOB)
dnl AC_DEFINE(NO_DLFCN_H)
AC_DEFINE(MACOSX_SERVER)
-
- dnl ----- Set -shared flag
- LDSHAREDFLAGS="-shared"
fi
dnl ----- NetBSD specific -----
CFLAGS="-I\$(top_srcdir)/sys/netbsd -I/usr/include/kerberosIV $CFLAGS"
need_dash_r=yes
- dnl ----- Set -shared flag
- LDSHAREDFLAGS="-shared"
-
dnl ----- NetBSD does not have crypt.h, uses unistd.h -----
AC_DEFINE(UAM_DHX, 1)
AC_DEFINE(NO_CRYPT_H, 1)
AC_DEFINE(BSD4_4)
AC_DEFINE(DLSYM_PREPEND_UNDERSCORE)
- dnl ----- Set -shared flag
- LDSHAREDFLAGS="-Bforcearchive -shared"
-
dnl ----- OpenBSD does not have crypt.h, uses unistd.h -----
AC_DEFINE(UAM_DHX, 1)
AC_DEFINE(NO_CRYPT_H, 1)
CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
need_dash_r=yes
- dnl ----- Set -shared flag
- LDSHAREDFLAGS="-G"
-
AC_MSG_RESULT([enabling Solaris kernel module build])
solaris_module=yes
fi
AC_DEFINE(TRU64)
AC_CHECK_LIB(security,set_auth_parameters)
CFLAGS="-I\$(top_srcdir)/sys/tru64 $CFLAGS"
- LDSHAREDFLAGS="-shared -expect_unresolved \*"
need_dash_r=no
sysv_style=tru64
-
- dnl ----- Set -shared flag
- LDSHAREDFLAGS="-shared"
fi
dnl -- look for openssl
AC_MSG_CHECKING([whether configuration files should be overwritten])
AC_ARG_ENABLE(overwrite,
- [ --enable-overwrite overwrite configuration files],
+ [ --enable-overwrite overwrite configuration files during installation],
[OVERWRITE_CONFIG="${enable_overwrite}"],
[OVERWRITE_CONFIG="no"]
)
AC_SUBST(AFPD_LIBS)
AC_SUBST(PAPD_LIBS)
AC_SUBST(CFLAGS)
-AC_SUBST(LDSHAREDFLAGS)
AC_SUBST(PKGCONFDIR)
AC_SUBST(OVERWRITE_CONFIG)