Version: 1.5.3 -> 1.5.4cvs

[mdsms.git] / configure.in

diff --git a/configure.in b/configure.in
index 6f53f43..eec9a82 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(mdsms.c)
-AM_INIT_AUTOMAKE(mdsms, 1.5.1)
+AM_INIT_AUTOMAKE(mdsms, 1.5.4cvs)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
@@ -103,8 +103,10 @@ if test "$enable_debug" = yes;then
 
 AC_MSG_CHECKING(whether to use included getopt)
 if test "$with_getopt" = yes -o "$ac_cv_func_getopt_long" != yes ;then
-       LIBOBJS="$LIBOBJS getopt1.o getopt.o"
-          AC_MSG_RESULT(yes)
+       AC_LIBOBJ(getopt)
+       AC_LIBOBJ(getopt1)
+       AC_LIBSOURCE(getopt.h)
+       AC_MSG_RESULT(yes)
 else AC_MSG_RESULT(no)
 fi
 
@@ -151,6 +153,18 @@ AC_TRY_COMPILE([
        fi
        ])
 
+AC_MSG_CHECKING([for _POSIX_VDISABLE])
+AC_TRY_COMPILE([
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif], [_POSIX_VDISABLE;],
+       AC_DEFINE(HAVE__POSIX_VDISABLE)    AC_MSG_RESULT(yes),[
+       AC_DEFINE(_POSIX_VDISABLE, ['\0']) AC_MSG_RESULT(no)
+       ])
+
 AC_MSG_CHECKING([for FD_SETSIZE])
 AC_TRY_COMPILE([
 #ifdef HAVE_SYS_TIME_H
@@ -271,9 +285,14 @@ if test "$ACLOCAL" = "aclocal";then
   ACLOCAL="$ACLOCAL -I ."
 fi
 
-AC_SUBST(LIBOBJS)
-
 AC_OUTPUT([Makefile
 mdsms.spec
+macros/Makefile
 po/Makefile.in
-intl/Makefile],[sed -e "/POTFILES =/r po/POTFILES" -e "s/ ChangeLog / /" po/Makefile.in > po/Makefile])
+intl/Makefile])
+
+dnl FIXME: Why is "po/POTFILES" being substituted?
+echo mdsms.c >po/POTFILES.in
+make -C po Makefile
+
+echo done.