X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=configure.ac;h=fd7d07255f73b2f7194901a0ebb62fa0dd6b0f71;hb=4ea4c59c8c36fab87ebe4386f3b2869c1d82c1a1;hp=aadd299edc6e0e4f2d773aefd04858fd6ed33294;hpb=798f357572a3409bf5f9e14c914e7419ae9db284;p=~andy%2Frsl diff --git a/configure.ac b/configure.ac index aadd299..fd7d072 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,7 @@ LIBS="-lz -lm" # The order of the libraries is important. # This works: -# -lrsl -limplode -letor -ltsdistk -lmfhdf -ldf -ljpeg -lz -lm +# -lrsl -limplode -ltsdistk -lmfhdf -ldf -ljpeg -lz -lm # # If mounting with shared libraries we may have to specify all possible libraries. # First check with simple LIBS list, if it fails, then expand the list. @@ -52,29 +52,6 @@ AC_CHECK_LIB(df, DFopen, ,,$LIBDIR) AC_CHECK_LIB(mfhdf, SDstart, ,,$LIBDIR) AC_CHECK_LIB(tsdistk, TKopen, ,,$LIBDIR) -# Because -letor may depend on RSL being installed, just check for -# the library libetor.a in a couple of places. - -# For autoheader, generate template for HAVE_LIBETOR. -AH_TEMPLATE(HAVE_LIBETOR,[For EDGE capability. Change this - to '#define HAVE_LIBETOR 1', if you have libetor -- the EDGE decoding - library.]) - -L="" - -if test "$L" = ""; then # Check for the file directly. - AC_CHECK_FILE($prefix/lib/libetor.a, L="-letor -lrsl -letor"; AC_DEFINE(HAVE_LIBETOR)) -fi -if test "$L" = ""; then # Check for the file directly. - AC_CHECK_FILE(/usr/local/lib/libetor.a, L="-letor -lrsl -letor"; AC_DEFINE(HAVE_LIBETOR)) -fi - -if test "$L" != ""; then # libetor exists. -LIBS="$LIBDIR $L $LIBS" -else -LIBS="$LIBDIR $LIBS" -fi - # Check if yywrap is defined in toolkit, and add $LEXLIB to LIBS if not. YYWRAP="" AC_CHECK_LIB(tsdistk, yywrap, YYWRAP="yes",,$LIBDIR)