X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=1c06a17852bf08731e2a1d107ee26f5ab166a5bb;hb=06af2fac094c3bc000db0e42743b269383d1b99d;hp=d4b2242c4625238fe4332a6b752595726ff83d5a;hpb=7ac00a42dd5ad0f5f664ff7da4cf8c7aa2528e0a;p=netatalk.git

diff --git a/configure.in b/configure.in
index d4b2242c..1c06a178 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.152 2002-02-07 05:09:59 jmarcus Exp $
+dnl $Id: configure.in,v 1.156 2002-02-13 16:48:10 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -123,15 +123,7 @@ AC_ARG_WITH(admin-group,
 
 NETATALK_AFS_CHECK
 
-AC_ARG_WITH(pkgconfdir,
-        [  --with-pkgconfdir=DIR   package specific configuration in DIR
-                          [[SYSCONF/netatalk]]],
-                PKGCONFDIR="$withval",
-                PKGCONFDIR="${sysconfdir}/netatalk"
-)
-
-dnl FIXME: make this an extra check
-NLSDIR="${PKGCONFDIR}/nls"
+NETATALK_CONFIG_DIRS
 
 AC_ARG_WITH(logfile,
 	[  --with-logfile=PATH     path for file used by logger [/var/log/netatalk.log]
@@ -517,7 +509,12 @@ dnl ----- NetBSD specific -----
 if test x"$this_os" = "xnetbsd"; then 
 	AC_MSG_RESULT([ * NetBSD specific configuration])
 	AC_DEFINE(BSD4_4)
-	AC_DEFINE(DLSYM_PREPEND_UNDERSCORE)
+	if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+		# NetBSD ELF machines don't have to have DLSYM_PREPEND_UNDERSCORE.
+		# If this test is true, it's not an ELF box.
+		# This REALLY should be a configure test.
+		AC_DEFINE(DLSYM_PREPEND_UNDERSCORE)
+	fi
 	CFLAGS="-I\$(top_srcdir)/sys/netbsd -I/usr/include/kerberosIV $CFLAGS"
 	need_dash_r=yes 
 
@@ -608,8 +605,6 @@ AC_SUBST(LIBS)
 AC_SUBST(AFPD_LIBS)
 AC_SUBST(PAPD_LIBS)
 AC_SUBST(CFLAGS)
-AC_SUBST(PKGCONFDIR)
-AC_SUBST(NLSDIR)
 AC_SUBST(OVERWRITE_CONFIG)
 
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)