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

diff --git a/configure.ac b/configure.ac
index 8b99796..28d29cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,105 +1,87 @@
 AC_PREREQ(2.50)
-AC_INIT(libnfs, m4_esyscmd([grep 'Version:' ./packaging/RPM/libnfs.spec.in 2>/dev/null | head -1 | sed -e 's/[ \t]*Version:[ \t]*\([^ \t]*\)[ \t]*.*/\1/' | tr -d '\n']))
-AC_CONFIG_SRCDIR([lib/init.c])
+AC_INIT([libnfs], [0.0.0])
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([foreign])
+AC_CANONICAL_HOST
 
-if test "${libdir}" = '${exec_prefix}/lib'; then
-  case `uname -m` in
-    x86_64|ppc64|powerpc64)
-      libdir='${exec_prefix}/lib64'
-      ;;
-    *)
-      libdir='${exec_prefix}/lib'
-      ;;
-  esac
-fi
+# Work around stupid autoconf default cflags. pt 1
+SAVE_CFLAGS="x${CFLAGS}"
 
-is_solaris="no"
-install="/usr/bin/install"
-ldconfig="ldconfig"
+AC_PROG_CC
+AC_PROG_LIBTOOL
 
-case `uname` in
-  Linux*)
-    ;;
-  AIX*)
-    ;;
-  SunOS)
-    is_solaris="yes"
-    install="ginstall"
-    ldconfig="echo no ldconfig on solaris"
-    LIBS="$LIBS -lsocket -lnsl"
-    ;;
-  *)
-    ;;
-esac
+AM_PROG_CC_C_O
 
-if test "$ac_cv_prog_gcc" = yes; then
-   CFLAGS="$CFLAGS -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings"
+# Work around stupid autoconf default cflags. pt 2
+if test "$SAVE_CFLAGS" = "x"; then
+  CFLAGS=""
 fi
 
-LOGDIR='${localstatedir}/log'
-AC_ARG_WITH([logdir],
-	[  --with-logdir=DIR       path to log directory [[LOCALSTATEDIR/log]]],
-	LOGDIR=$withval)
-if test ! -z "$LOGDIR"; then
-  if test "$LOGDIR" = "yes" -o "$LOGDIR" = "no"; then
-    AC_MSG_ERROR([--with-logdir must specify a path])
-  fi
+AC_CHECK_PROG([HAVE_RPCGEN], [rpcgen], [yes], [no])
+if test x$HAVE_RPCGEN != xyes; then
+  AC_MSG_ERROR([Can not find required program])
 fi
-AC_SUBST(LOGDIR)
 
-AC_CONFIG_HEADER(config.h)
+#option: examples
+AC_ARG_ENABLE([examples],
+              [AC_HELP_STRING([--enable-examples],
+                              [Build example programs])],
+	      [ENABLE_EXAMPLES=$enableval],
+	      [ENABLE_EXAMPLES="no"])
 
-EXTRA_OBJ=""
+if test x$ENABLE_EXAMPLES = xyes; then
+  MAYBE_EXAMPLES="examples"
+fi
+AC_SUBST(MAYBE_EXAMPLES)
 
-#AC_CHECK_HEADERS(sched.h)
-#AC_CHECK_FUNCS(mlockall)
+AC_ARG_ENABLE(tirpc,
+  	[AC_HELP_STRING([--enable-tirpc],
+  			[enable use of TI-RPC @<:@default=no@:>@])],
+  	enable_tirpc=$enableval,
+	enable_tirpc='no')
 
-AC_CACHE_CHECK([for sin_len in sock],libnfs_cv_HAVE_SOCK_SIN_LEN,[
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>],
-[struct sockaddr_in sock; sock.sin_len = sizeof(sock);],
-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
+case $host in
+  *darwin*)
+    RPCGENFLAGS=-DU_INT64_PLATTFORM_TYPE="u_int64_t"
+    ;;
+  *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
+    ;;
+  *)
+    ;;
+esac
 
-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>
+AC_SUBST(RPCGENFLAGS)
 
-int main(int argc, const char *argv[])
-{
-	struct poptOption popt_options[] = {
-		POPT_TABLEEND
-	};
-	poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST);
+# check for SA_LEN
+dnl Check if sockaddr data structure includes a "sa_len"
+AC_CHECK_MEMBER([struct sockaddr.sa_len],
+                [ AC_DEFINE(HAVE_SOCKADDR_LEN,1,[Whether sockaddr struct has sa_len]) ],
+                [],
+                [
+#include <sys/types.h>
+#include <sys/socket.h>
+])
 
-	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
+echo "Use TI-RPC: $enable_tirpc"
+if test "$enable_tirpc" = "yes"; then
+	CFLAGS="${CFLAGS} -I /usr/include/tirpc"
+	LDFLAGS="${LDFLAGS} -ltirpc"
 fi
 
-AC_SUBST(libdir)
-AC_SUBST(install)
-AC_SUBST(ldconfig)
-#AC_SUBST(LIBNFS_LDFLAGS)
+#output
+AC_CONFIG_FILES([Makefile]
+                [include/Makefile]
+                [lib/Makefile]
+                [mount/Makefile]
+                [nfs/Makefile]
+                [portmap/Makefile]
+                [rquota/Makefile]
+                [examples/Makefile]
+               )
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT