Version: 1.5.3 -> 1.5.4cvs

[mdsms.git] / configure.in

diff --git a/configure.in b/configure.in
index 26fc971..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
 
@@ -112,14 +114,6 @@ AC_CHECK_HEADERS(assert.h ctype.h errno.h fcntl.h limits.h signal.h stdarg.h)
 AC_CHECK_HEADERS(stdio.h stdlib.h string.h sys/poll.h sys/stat.h sys/time.h)
 AC_CHECK_HEADERS(sys/types.h sys/wait.h termios.h time.h unistd.h)
 
-AC_CHECK_FUNC(MAX, AC_DEFINE(HAVE_MAX) ,
-       AC_CHECK_FUNC(max, AC_DEFINE(MAX, max) AC_DEFINE(HAVE_MAX))
-       )
-
-AC_CHECK_FUNC(MIN, AC_DEFINE(HAVE_MIN) ,
-       AC_CHECK_FUNC(min, AC_DEFINE(MIN, min) AC_DEFINE(HAVE_MIN))
-       )
-
 AC_MSG_CHECKING([for LINE_MAX])
 AC_TRY_COMPILE([
 #ifdef HAVE_LIMITS_H
@@ -159,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
@@ -268,6 +274,10 @@ GCC_NEED_DECLARATION(pclose,[
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif])
+GCC_NEED_DECLARATION(gettext,[
+#ifdef HAVE_LIBINTL_H
+#include <libintl.h>
+#endif])
 
 # Final output.
 
@@ -275,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.