Ooops. Typo.

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index cd58f6d5f728073e78943b9798f38593988d382f..58a2f2601bc6b47f193436a4084c9df5c0576bfa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.123 2001-11-13 19:06:09 srittau 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)
@@ -277,7 +277,7 @@ AC_ARG_WITH(did,
 
 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"
@@ -442,8 +442,12 @@ AC_SUBST(UAMS_PATH)
 dnl --------------------------------------------------------------------------
 dnl drop in includes for top level directory structures here...
 dnl --------------------------------------------------------------------------
-LIBS="$LIBS -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:
@@ -491,8 +495,6 @@ if test x"$this_os" = "xfreebsd"; then
        AC_DEFINE(BSD4_4)
        AC_DEFINE(SENDFILE_FLAVOR_BSD)
 
-       dnl ----- Set -shared flag
-       LDSHAREDFLAGS="-shared"
        AC_DEFINE(NO_CRYPT_H, 1)
 fi
 
@@ -515,9 +517,6 @@ dnl ----- Linux specific -----
 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,,
@@ -561,9 +560,6 @@ if test x"$this_os" = "xmacosx"; then
        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 -----
@@ -574,9 +570,6 @@ if test x"$this_os" = "xnetbsd"; then
        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)
@@ -588,9 +581,6 @@ if test x"$this_os" = "xopenbsd"; then
        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)
@@ -606,9 +596,6 @@ if test x"$this_os" = "xsolaris"; then
        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
@@ -624,12 +611,8 @@ if test x"$this_os" = "xtru64"; then
        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
@@ -674,7 +657,6 @@ AC_SUBST(LIBS)
 AC_SUBST(AFPD_LIBS)
 AC_SUBST(PAPD_LIBS)
 AC_SUBST(CFLAGS)
-AC_SUBST(LDSHAREDFLAGS)
 AC_SUBST(PKGCONFDIR)
 AC_SUBST(OVERWRITE_CONFIG)