Aiksaurus fix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4258 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-05-28 23:31:39 +00:00
parent b74d4e8b93
commit 2c92b6db99
2 changed files with 16 additions and 10 deletions

View File

@ -1,3 +1,8 @@
2002-05-29 John Levon <moz@compsoc.man.ac.uk>
* configure.in: move Aiksaurus configure to catch
extra-lib/inc (bug 383)
2002-05-27 Lars Gullik Bjønnes <larsbj@birdstep.com>
* autogen.sh (ACINCLUDE_FILES): add pkg.m4

View File

@ -106,16 +106,6 @@ dnl by testing these we check if it is ok to have
dnl -lc and -lm as args to the compiler
AC_CHECK_LIB(m, sin)
AC_CHECK_LIB(c, fopen)
AC_ARG_WITH(aiksaurus,
[ --without-aiksaurus do not use the Aiksaurus library],
[lyx_use_aiksaurus=$withval])
if test x$lyx_use_aiksaurus != xno; then
AC_CHECK_LIB(Aiksaurus, main,
[AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
AIKSAURUS_LIBS="-lAiksaurus -lbz2"
],,"-lbz2")
fi
AC_SUBST(AIKSAURUS_LIBS)
### Add extra directories to check for libraries.
LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
@ -143,6 +133,17 @@ if test x$lyx_use_liberty = xyes; then
AC_CHECK_LIB(iberty,main)
fi
AC_ARG_WITH(aiksaurus,
[ --without-aiksaurus do not use the Aiksaurus library],
[lyx_use_aiksaurus=$withval])
if test x$lyx_use_aiksaurus != xno; then
AC_CHECK_LIB(Aiksaurus, main,
[AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
AIKSAURUS_LIBS="-lAiksaurus -lbz2"
],,"-lbz2")
fi
AC_SUBST(AIKSAURUS_LIBS)
### Setup libtool
AC_DISABLE_SHARED
AC_LIBTOOL_WIN32_DLL