r73: Fix AM_INIT_AUTOMAKE to not have any arguments

Fix AC_ARG_ENABLE calls to work as expected when --disable-* is used.

diff --git a/configure.ac b/configure.ac
index 68ef533..61b7660 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,21 @@
 dnl Configure script for NBD system
 dnl (c) 1998 Martin Mares <mj@ucw.cz>, (c) 2000 Pavel Machek <pavel@ucw.cz>,
 dnl (c) 2003-2004 Wouter Verhelst
 dnl Configure script for NBD system
 dnl (c) 1998 Martin Mares <mj@ucw.cz>, (c) 2000 Pavel Machek <pavel@ucw.cz>,
 dnl (c) 2003-2004 Wouter Verhelst

-AC_INIT([nbd],[2.7],[wouter@debian.org])
-AM_INIT_AUTOMAKE(nbd, 2.7)
+AC_INIT([nbd],[2.7.99pre2.8],[wouter@debian.org])
+AM_INIT_AUTOMAKE()

 
 

-AC_ARG_ENABLE(lfs, AC_HELP_STRING([--enable-lfs],[Enable Large File Support]), [NBD_LFS=1], [NBD_LFS=0])
+AC_ARG_ENABLE(
+  lfs,
+  AS_HELP_STRING(--enable-lfs,Enable Large File Support),
+  [
+    if test "x$enableval" = "xyes" ; then
+      NBD_LFS=1
+    else
+      NBD_LFS=0
+    fi
+  ],
+  [NBD_LFS=0]
+)

 AC_MSG_CHECKING([whether Large File Support should be enabled])
 if test $NBD_LFS -eq 1; then
   AC_DEFINE(NBD_LFS,1, [Define to 1 if Large File Support should be enabled])
 AC_MSG_CHECKING([whether Large File Support should be enabled])
 if test $NBD_LFS -eq 1; then
   AC_DEFINE(NBD_LFS,1, [Define to 1 if Large File Support should be enabled])

@@ -14,7 +25,18 @@ else
   AC_MSG_RESULT([no])
 fi
 
   AC_MSG_RESULT([no])
 fi
 

-AC_ARG_ENABLE(syslog, AC_HELP_STRING([--enable-syslog],[Enable Syslog logging]), [ISSERVER=1], [ISSERVER=0])
+AC_ARG_ENABLE(
+  syslog,
+  AS_HELP_STRING(--enable-syslog,Enable Syslog logging),
+  [
+    if test "x$enableval" = "xyes" ; then
+      ISSERVER=1
+    else
+      ISSERVER=0
+    fi
+  ],
+  [ISSERVER=0]
+)

 AC_MSG_CHECKING([whether syslog logging is requested])
 if test $ISSERVER -eq 1; then
   AC_DEFINE(ISSERVER,1, [Define to 1 if you want nbd-server to log through syslog])
 AC_MSG_CHECKING([whether syslog logging is requested])
 if test $ISSERVER -eq 1; then
   AC_DEFINE(ISSERVER,1, [Define to 1 if you want nbd-server to log through syslog])

@@ -22,6 +44,7 @@ if test $ISSERVER -eq 1; then
 else
   AC_MSG_RESULT([no])
 fi
 else
   AC_MSG_RESULT([no])
 fi

+

 AC_PROG_CC
 AC_MSG_CHECKING(whether warnings should be enabled)
 if test -n "$GCC" ; then
 AC_PROG_CC
 AC_MSG_CHECKING(whether warnings should be enabled)
 if test -n "$GCC" ; then

@@ -30,7 +53,7 @@ if test -n "$GCC" ; then
 else
   AC_MSG_RESULT(no)
 fi
 else
   AC_MSG_RESULT(no)
 fi

-#AC_PROG_INSTALL
+AC_PROG_INSTALL

 AC_C_BIGENDIAN
 AC_C_INLINE
 AC_C_CONST
 AC_C_BIGENDIAN
 AC_C_INLINE
 AC_C_CONST

@@ -60,11 +83,12 @@ AC_CHECK_HEADERS([linux/nbd.h],,,
 #define u64 unsigned long int
 ]])
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/ioctl.h sys/mount.h sys/socket.h syslog.h])
 #define u64 unsigned long int
 ]])
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/ioctl.h sys/mount.h sys/socket.h syslog.h])

+AM_PATH_GLIB_2_0(2.2.3, [HAVE_GLIB=yes], AC_MSG_ERROR([Missing glib]))

 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_SUBST(sbin_PROGRAMS)
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_SUBST(sbin_PROGRAMS)

-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])

 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT