X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=configure.ac;h=9973c92ad4a7044cbc5a66e1ca90063145c1a102;hb=e644e70061c1fc5330ac062ec41e5949d724365f;hp=8b9979681d2e348b942161053c175d2247372c89;hpb=84004dbf9bb2ab8a7f8b968affc53ee3065fa911;p=deb_libnfs.git

diff --git a/configure.ac b/configure.ac
index 8b99796..9973c92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,12 +14,18 @@ if test "${libdir}" = '${exec_prefix}/lib'; then
 fi
 
 is_solaris="no"
+is_darwin="no"
 install="/usr/bin/install"
 ldconfig="ldconfig"
 
 case `uname` in
   Linux*)
     ;;
+  Darwin*)
+    libdir='${exec_prefix}/lib'
+    ldconfig='echo no ldconfig on darwin'
+    is_darwin="yes"
+    ;;
   AIX*)
     ;;
   SunOS)
@@ -47,6 +53,17 @@ if test ! -z "$LOGDIR"; then
 fi
 AC_SUBST(LOGDIR)
 
+AC_ARG_WITH([examples],
+              [  --without-examples  Disable build of examples],
+	      [ENABLE_EXAMPLES="no"],
+	      [ENABLE_EXAMPLES="yes"]
+	      )
+AC_SUBST(ENABLE_EXAMPLES)
+
+AC_ARG_WITH([ldconfig],
+	    [  --without-ldconfig  Disable call of ldconfig on make install],
+	    [ldconfig='echo ldconfig disabled'])
+
 AC_CONFIG_HEADER(config.h)
 
 EXTRA_OBJ=""
@@ -63,43 +80,10 @@ libnfs_cv_HAVE_SOCK_SIN_LEN=yes,libnfs_cv_HAVE_SOCK_SIN_LEN=no)])
 if test x"$libnfs_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
     AC_DEFINE(HAVE_SOCK_SIN_LEN,1,[Whether the sockaddr_in struct has a sin_len property])
 fi
-
-AC_MSG_CHECKING(whether libpopt is available)
-ac_save_CFLAGS="$CFLAGS"
-ac_save_LIBS="$LIBS"
-CFLAGS="$CFLAGS $GLIB_CFLAGS"
-LIBS="$GLIB_LIBS $LIBS -lpopt"
-AC_TRY_RUN([
-/*
- * Just see if we can compile/link with popt
- */
-#include <popt.h>
-
-int main(int argc, const char *argv[])
-{
-	struct poptOption popt_options[] = {
-		POPT_TABLEEND
-	};
-	poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST);
-
-	return 0;
-}
-], ac_cv_have_popt=yes, ac_cv_have_popt=no,
-   [echo $ac_n "compile with POPT. Assuming OK... $ac_c"
-    ac_cv_have_popt=yes])
-CFLAGS="$ac_save_CFLAGS"
-LIBS="$ac_save_LIBS"
-if test "$ac_cv_have_popt" = yes ; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-  AC_MSG_NOTICE(You need libpopt to compile libnfs. Install the libpopt-dev package.)
-  exit
-fi
-
 AC_SUBST(libdir)
 AC_SUBST(install)
 AC_SUBST(ldconfig)
+AC_SUBST(is_darwin)
 #AC_SUBST(LIBNFS_LDFLAGS)
 
 AC_OUTPUT(Makefile)