-dnl $Id: configure.in,v 1.179.2.3.2.24 2004-03-18 02:56:31 bfernhomberg Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.25 2004-04-21 00:56:58 bfernhomberg Exp $
dnl configure.in for netatalk
AC_INIT(etc/afpd/main.c)
AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, [#include <time.h>])
AC_CACHE_SAVE
-
dnl Checks for (v)snprintf
NETATALK_SNPRINTF_CHECK
+dnl --------------------------------------------------------------------------
+dnl 64bit platform check
+dnl --------------------------------------------------------------------------
+
+AC_MSG_CHECKING([whether to check for 64bit libraries])
+dnl Determine libdir name
+case $host in
+*-*-linux*)
+ # Test if the compiler is 64bit
+ echo 'int i;' > conftest.$ac_ext
+ atalk_cv_cc_64bit_output=no
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *"ELF 64"*)
+ atalk_cv_cc_64bit_output=yes
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+esac
+
+dnl
+dnl FIXME: guess this won't work on Solaris, need to check
+dnl
+
+case $host_cpu:$atalk_cv_cc_64bit_output in
+powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+ atalk_libname="lib64"
+ AC_MSG_RESULT([yes])
+ ;;
+*:*)
+ atalk_libname="lib"
+ AC_MSG_RESULT([no])
+ ;;
+esac
+
dnl --------------------------------------------------------------------------
dnl specific configuration comes in here:
dnl --------------------------------------------------------------------------
LIBS="$LIBS -lcrack"
AC_MSG_RESULT([yes])
if test "$cracklib" = "yes"; then
- cracklib="/usr/lib/cracklib_dict"
+ cracklib="/usr/$atalk_libname/cracklib_dict"
fi
AC_DEFINE_UNQUOTED(_PATH_CRACKLIB, "$cracklib",
[path to cracklib dictionary])
/*
- * $Id: netddp_open.c,v 1.8 2003-02-17 02:02:25 srittau Exp $
+ * $Id: netddp_open.c,v 1.8.6.1 2004-04-21 00:56:58 bfernhomberg Exp $
*
* Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
* Copyright (c) 1990,1991 Regents of The University of Michigan.
bridge->sat_port = baddress.socket;
}
#else /* MACOSX_SERVER */
- size_t len;
+ socklen_t len;
if ((s = socket( AF_APPLETALK, SOCK_DGRAM, 0 )) < 0)
return -1;
-dnl $Id: db3-check.m4,v 1.11.6.5 2004-03-30 04:18:21 bfernhomberg Exp $
+dnl $Id: db3-check.m4,v 1.11.6.6 2004-04-21 00:56:58 bfernhomberg Exp $
dnl Autoconf macro to check for the Berkeley DB library
AC_DEFUN([AC_PATH_BDB],
dobdbsearch=yes
bdb_search_dirs="/usr/local/include/db4 /usr/local/include /usr/include/db4 /usr/include"
+dnl make sure atalk_libname is defined beforehand
+[[ -n "$atalk_libname" ]] || AC_MSG_ERROR([internal error, atalk_libname undefined])
AC_ARG_WITH(bdb,
[ --with-bdb=PATH specify path to Berkeley DB installation[[auto]]],
AC_MSG_CHECKING([for Berkeley DB headers in $bdbdir])
if test -f "$bdbdir/db.h" ; then
AC_MSG_RESULT([yes])
- bdblibdir="`echo $bdbdir | sed 's/include\/db4$/lib/'`"
- bdblibdir="`echo $bdblibdir | sed 's/include$/lib/'`"
+ bdblibdir="`echo $bdbdir | sed 's/\/include\/db4$//'`"
+ bdblibdir="`echo $bdblibdir | sed 's/\/include$//'`"
+ bdblibdir="${bdblibdir}/${atalk_libname}"
bdbbindir="`echo $bdbdir | sed 's/include\/db4$/bin/'`"
bdbbindir="`echo $bdbbindir | sed 's/include$/bin/'`"
*)
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -I$withval/include"
- LDFLAGS="$LDFLAGS -L$withval/lib"
+ LDFLAGS="$LDFLAGS -L$withval/$atalk_libname"
AC_CHECK_LIB(iconv, iconv_open, [
ICONV_CFLAGS="-I$withval/include"
- ICONV_LIBS="-L$withval/lib -liconv"
+ ICONV_LIBS="-L$withval/$atalk_libname -liconv"
])
AC_DEFINE_UNQUOTED(WITH_LIBICONV, "${withval}",[Path to iconv])
;;
- AC_CACHE_CHECK(checking for long long,
+ AC_CACHE_CHECK(for long long,
ac_cv_long_long,
[
AC_TRY_COMPILE([
AC_DEFINE(HAVE_LONG_LONG, 1, [Define if long long is a valid data type])
fi
- AC_CACHE_CHECK(checking for long double,
+ AC_CACHE_CHECK(for long double,
ac_cv_long_double,
[
AC_TRY_COMPILE([
AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if long double is a valid data type])
fi
- AC_CACHE_CHECK(checking for quad_t,
+ AC_CACHE_CHECK(for quad_t,
ac_cv_quad_t,
[
AC_TRY_COMPILE([
dnl Check for optional server location protocol support (used by MacOS X)
-dnl $Id: srvloc.m4,v 1.8.6.1 2003-10-29 23:53:24 bfernhomberg Exp $
+dnl $Id: srvloc.m4,v 1.8.6.2 2004-04-21 00:56:59 bfernhomberg Exp $
AC_DEFUN([NETATALK_SRVLOC], [
[srvloc=try]
)
+ dnl make sure atalk_libname is defined beforehand
+ [[ -n "$atalk_libname" ]] || AC_MSG_ERROR([internal error, atalk_libname undefined])
+
if test "x$srvloc" != "xno"; then
savedcppflags="$CPPFLAGS"
srvlocdir="$srvloc"
fi
CPPFLAGS="$CPPFLAGS -I$srvlocdir/include"
- LDFLAGS="$LDFLAGS -L$srvlocdir/lib"
+ LDFLAGS="$LDFLAGS -L$srvlocdir/$atalk_libname"
AC_MSG_CHECKING([for slp.h])
AC_TRY_CPP([#include <slp.h>],
if test "x$found_slp" = "xyes"; then
AC_CHECK_LIB(slp, SLPOpen, [
- SLP_LIBS="-L$srvlocdir/lib -lslp"
+ SLP_LIBS="-L$srvlocdir/$atalk_libname -lslp"
SLP_CFLAGS="-I$srvlocdir/include"
],[
AC_MSG_RESULT([no])
-dnl $Id: ssl-check.m4,v 1.8.6.2 2003-10-29 23:53:24 bfernhomberg Exp $
+dnl $Id: ssl-check.m4,v 1.8.6.3 2004-04-21 00:56:59 bfernhomberg Exp $
dnl Autoconf macro to check for SSL or OpenSSL
AC_DEFUN([AC_CRYPT], [
saved_LIBS=$LIBS
compile_ssl=no
+ dnl make sure atalk_libname is defined beforehand
+ [[ -n "$atalk_libname" ]] || AC_MSG_ERROR([internal error, atalk_libname undefined])
+
if test "$tryssl" = "yes"; then
AC_MSG_CHECKING([for SSL])
- for ssldir in "" $tryssldir /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl /usr/local/ssl ; do
+ for ssldir in "" $tryssldir /usr /usr/local/openssl /usr/$atalk_libname/openssl /usr/local/ssl /usr/$atalk_libname/ssl /usr/local /usr/pkg /opt /opt/openssl /usr/local/ssl ; do
if test -f "$ssldir/include/openssl/cast.h" ; then
SSL_CFLAGS="$SSL_CFLAGS -I$ssldir/include -I$ssldir/include/openssl"
- SSL_LIBS="$SSL_LIBS -L$ssldir/lib -L$ssldir -lcrypto"
+ SSL_LIBS="$SSL_LIBS -L$ssldir/$atalk_libname -L$ssldir -lcrypto"
if test "x$need_dash_r" = "xyes"; then
- SSL_LIBS="$SSL_LIBS -R$ssldir/lib -R$ssldir"
+ SSL_LIBS="$SSL_LIBS -R$ssldir/$atalk_libname -R$ssldir"
fi
AC_MSG_RESULT([$ssldir (enabling RANDNUM and DHX support)])
projects / netatalk.git / commitdiff