Merge remote branch 't-nelson/automake'

[deb_libnfs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9689a1f57a721d7a001fb5bfd872be57cc180329..94783ec74875e75b085958308691bd91aec8c884 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,18 +22,6 @@ if test x$HAVE_RPCGEN != xyes; then
   AC_MSG_ERROR([Can not find required program])
 fi
 
-# option: logdir
-AC_ARG_WITH([logdir],
-           [AC_HELP_STRING([--with-logdir=DIR],
-                            [path to log directory [[LOCALSTATEDIR/log]]])],
-            [LOGDIR=$withval],
-            [LOGDIR='${localstatedir}/log'])
-
-#if test ! -d "$LOGDIR"; then
-#  AC_MSG_ERROR([--with-logdir must specify a path])
-#fi
-AC_SUBST(LOGDIR)
-
 #option: examples
 AC_ARG_ENABLE([examples],
               [AC_HELP_STRING([--enable-examples],
@@ -52,6 +40,10 @@ case $host in
     ;;
   *solaris*)
     AC_CHECK_HEADERS([sys/filio.h])
+    if test x$ENABLE_EXAMPLES = xyes; then
+      AC_CHECK_LIB([socket], [main], , [AC_MSG_ERROR([Can not find required library])])
+      AC_CHECK_LIB([nsl],    [main], , [AC_MSG_ERROR([Can not find required library])])
+    fi
     ;;
   *)
     ;;