luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed IS_SIZE_T_LONG. 

Now only test for ncurses etc., when either Readline or Editline are being used.  This will fix the basic problem of building on MinGW which does not have these libraries as standard.
Fixed the typo in the AC_REVISION() macro.
This commit is contained in:
sjborley 2005-05-21 17:05:48 +00:00
parent 6f01a35b81
commit 705d40681b
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure.in
View File

@ -318,12 +318,6 @@ AC_TYPE_SIGNAL
dnl Check for a few libraries and headers: dnl Check for a few libraries and headers:
dnl Look for ncurses first, then termcap
AC_SEARCH_LIBS(tputs,ncurses termcap,
AC_DEFINE(HAVE_TERMCAP,[],[Define if we have ncurses or termcap]),
AC_MSG_ERROR(Found neither ncurses or termcap))
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_CHECK_HEADERS(ctype.h unistd.h pwd.h fcntl.h string.h) AC_CHECK_HEADERS(ctype.h unistd.h pwd.h fcntl.h string.h)
AC_HEADER_SYS_WAIT AC_HEADER_SYS_WAIT
@ -335,17 +329,6 @@ AC_STRUCT_TM
AC_STRUCT_TIMEZONE AC_STRUCT_TIMEZONE
AC_CHECK_FUNCS(localtime) AC_CHECK_FUNCS(localtime)
dnl Some special AMD64 processor issues. This change may be common to many
dnl 64 bit processors, but I have only this platform to work with and did not
dnl find a good way of automatically determining this information.
case $host in
x86_64-*-linux*)
AC_DEFINE(IS_SIZE_T_LONG,[1],[define if size_t is long])
;;
*)
;;
esac
case $host_os in case $host_os in
*cygwin* | *mingw* ) *cygwin* | *mingw* )
AC_CHECK_FUNCS(ftime) AC_CHECK_FUNCS(ftime)
@ -655,6 +638,7 @@ fi
AC_SUBST(NUMPARAMDIR) AC_SUBST(NUMPARAMDIR)
AC_SUBST(NUMPARAMLIB) AC_SUBST(NUMPARAMLIB)
dnl ---- Option to include GNU readline support in ngspice CLI ---- dnl ---- Option to include GNU readline support in ngspice CLI ----
dnl ---- Default: disabled. ---- dnl ---- Default: disabled. ----
dnl ---- Hope to see in the future readline replacement. ---- dnl ---- Hope to see in the future readline replacement. ----
@ -665,7 +649,10 @@ else
AC_MSG_RESULT(Checking for readline:) AC_MSG_RESULT(Checking for readline:)
AC_CHECK_HEADERS([readline/readline.h readline/history.h], AC_CHECK_HEADERS([readline/readline.h readline/history.h],
[AC_DEFINE(HAVE_GNUREADLINE,[],[Define if we have GNU readline])], [AC_DEFINE(HAVE_GNUREADLINE,[],[Define if we have GNU readline])],
[AC_MSG_ERROR(Couldn't find GNU readline headers.)]) [AC_MSG_ERROR(Couldn't find GNU readline headers.)])
AC_SEARCH_LIBS(tputs,ncurses termcap,
AC_DEFINE(HAVE_TERMCAP,[],[Define if we have ncurses or termcap]),
AC_MSG_ERROR(Found neither ncurses or termcap))
AC_CHECK_LIB(readline, readline, AC_CHECK_LIB(readline, readline,
[LIBS="$LIBS -lreadline"], [LIBS="$LIBS -lreadline"],
[AC_MSG_ERROR(Couldn't find readline libraries.)]) [AC_MSG_ERROR(Couldn't find readline libraries.)])
@ -681,9 +668,12 @@ else
AC_MSG_RESULT(Checking for editline:) AC_MSG_RESULT(Checking for editline:)
AC_CHECK_HEADERS([editline/readline.h], AC_CHECK_HEADERS([editline/readline.h],
[AC_DEFINE([HAVE_BSDEDITLINE],[1],[Define to enable BSD editline])], [AC_DEFINE([HAVE_BSDEDITLINE],[1],[Define to enable BSD editline])],
[AC_MSG_ERROR(Couldn't find BSD editline headers.)]) [AC_MSG_ERROR(Couldn't find BSD editline headers.)])
AC_SEARCH_LIBS(tputs,ncurses termcap,
AC_DEFINE(HAVE_TERMCAP,[],[Define if we have ncurses or termcap]),
AC_MSG_ERROR(Found neither ncurses or termcap))
AC_CHECK_LIB(edit, readline, AC_CHECK_LIB(edit, readline,
[LIBS="$LIBS -ledit -lncurses"], [LIBS="$LIBS -ledit"],
[AC_MSG_ERROR(Couldn't find editline libraries.)], [AC_MSG_ERROR(Couldn't find editline libraries.)],
-lncurses ) -lncurses )
fi fi