X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=8a17be727f0465bf98d93a0927813c37d9ca88b3;hb=7438260c07e4f3d71c7f43669678c3a912682e4c;hp=2e3cc40ffe46f4524c4ce9f90dd90a2df275034c;hpb=92a7e95f339442d5d87f0febcae338306e1c6edd;p=ctsim.git

diff --git a/configure.in b/configure.in
index 2e3cc40..8a17be7 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
-AC_INIT(src/ctrec.c)
+AC_INIT(src/ctrec.cpp)
 AM_INIT_AUTOMAKE(ctsim,0.6.0-b1)
 AM_CONFIG_HEADER(config.h)
 
@@ -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
@@ -312,7 +310,7 @@ AC_SUBST(ctlibs)
 
 if test -n "$lamdir" ; then
   ctlamlibs="-lir_lam $ctlibs_base"
-  lamprograms="ctrec-lam phm2sdf-lam phm2rs-lam"
+  lamprograms="ctrec-lam phm2if-lam phm2rs-lam"
   AC_SUBST(lamprograms)
   AC_SUBST(ctlamlibs)
 fi