projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed some changes, which didn't work with certain versions of diff
[pspp-builds.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 22be61a719b47e6bf6221b36e4581529d779eb77..25631a4d87cac9d2a27fd473d7a5dcb8239bf23a 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-17,7
+17,12
@@
AM_GNU_GETTEXT_VERSION dnl Prevents autoreconf complaint.
dnl Checks for libraries.
AC_CHECK_LIB(m, sin)
AC_CHECK_LIB(gmp, mpf_get_str, [LIBS="-lgmp $LIBS"],
dnl Checks for libraries.
AC_CHECK_LIB(m, sin)
AC_CHECK_LIB(gmp, mpf_get_str, [LIBS="-lgmp $LIBS"],
- [AC_CHECK_LIB(gmp, __gmpf_get_str, [LIBS="-lgmp $LIBS"])])
+ [AC_CHECK_LIB(gmp, __gmpf_get_str, [LIBS="-lgmp $LIBS"])],
+ AC_MSG_ERROR(`You must install libgmp'))
+
+AC_CHECK_FUNC(getopt_long,,
+ AC_MSG_ERROR(`This application depends upon getopt_long'))
+
AC_CHECK_LIB(ncurses, tgetent, LIBS="-lncurses $LIBS" termcap=yes,
AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $LIBS" termcap=yes,
AC_CHECK_LIB(ncurses, tgetent, LIBS="-lncurses $LIBS" termcap=yes,
AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $LIBS" termcap=yes,
@@
-94,7
+99,10
@@
AC_SUBST(CFLAGS)
AH_BOTTOM([#include <pref.h>])
AH_BOTTOM([#include <pref.h>])
-AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile intl/Makefile
+dnl This is needed otherwise --with-included-gettext fails
+AH_BOTTOM([#include <locale.h>])
+
+AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile intl/Makefile
lib/Makefile lib/julcal/Makefile lib/misc/Makefile
lib/dcdflib/Makefile doc/Makefile src/Makefile
config/Makefile tests/Makefile])
lib/Makefile lib/julcal/Makefile lib/misc/Makefile
lib/dcdflib/Makefile doc/Makefile src/Makefile
config/Makefile tests/Makefile])
@@
-113,4
+121,4
@@
AC_CONFIG_COMMANDS([pref.h],[
])
AC_OUTPUT
])
AC_OUTPUT
-dnl configure.
in
ends here
+dnl configure.
ac
ends here