X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=3a7ab6c4dc51b10c78c1715681f5139658e00af0;hb=013445d4e52c07491291289eb32fa325d9f9f8ff;hp=580d9d2dd80da591f8ad0a620a7ca8a97f2a24c9;hpb=f24b761bf648dd317adae95ecdee6587e41bffe2;p=ctsim.git

diff --git a/configure.in b/configure.in
index 580d9d2..3a7ab6c 100644
--- a/configure.in
+++ b/configure.in
@@ -77,11 +77,12 @@ AC_CHECK_LIB(m, main)
 AC_CHECK_LIB(curses, main, [curses=true], [curses=false])
 AC_CHECK_LIB(ncurses, main, [ncurses=true], [ncurses=false])
 AC_CHECK_LIB(g2, main, [g2=true], [g2=false])
+AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true], [wxwin=false])
+AC_CHECK_LIB(wx_msw, main, [wxwin=true; wx_msw=true], [wxwin=false])
+
 if test "$zlib" = "true" ; then
   AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
 fi
-AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true], [wxwin=false])
-AC_CHECK_LIB(wx_msw, main, [wxwin=true; wx_msw=true], [wxwin=false])
 
 dnl Checks for header files.
 AC_HEADER_STDC
@@ -293,15 +294,12 @@ fi
 dnl Setting projet libraries and includes
 LDFLAGS="$LDFLAGS -L../libkmath -L../libk -L../libcio -L../libir" 
 ctlibs_base="$ctlibs_base -lkmath -lk -lcio"
-if test -n "$pngdir" ; then
+if test "$png" = "true" ; then
   ctlibs_base="$ctlibs_base -lpng"
 fi
 if test "$zlib" = "true" ; then
   ctlibs_base="$ctlibs_base -lz"
 fi
-if test "$png" = "true" ; then
-  ctlibs_base="$ctlibs_base -lpng"
-fi
 if test "$g2" = "true" ; then
   ctlibs_base="$ctlibs_base -lg2"
 fi
@@ -311,10 +309,10 @@ ctlibs="-lir $ctlibs_base"
 AC_SUBST(ctlibs)
 
 if test -n "$lamdir" ; then
-  ctlamlibs="-lir_lam $ctlibs_base"
-  lamprograms="ctrec-lam phm2sdf-lam phm2rs-lam"
+dnl  ctlamlibs="-lir_lam $ctlibs_base"
+dnl  AC_SUBST(ctlamlibs)
+  lamprograms="ctrec-lam phm2if-lam phm2rs-lam"
   AC_SUBST(lamprograms)
-  AC_SUBST(ctlamlibs)
-fi
+ fi
 
 AC_OUTPUT(Makefile libezplot/Makefile src/Makefile libgraph/Makefile libkmath/Makefile Makefile libk/Makefile libir/Makefile libcio/Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile src/sample-ctrec.sh cgi-bin/ctsim.conf)