X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.in;h=b48e0f3aa51a0f17d209fa6acca88e64701bf04b;hp=3a7ab6c4dc51b10c78c1715681f5139658e00af0;hb=44ba9ce559d2d52cbd7bbea6bcd76242840fd3eb;hpb=7643d575383b827508b1aaabd55754e1f5e591af

diff --git a/configure.in b/configure.in
index 3a7ab6c..b48e0f3 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
 AC_INIT(src/ctrec.cpp)
-AM_INIT_AUTOMAKE(ctsim,0.6.0-b1)
+AM_INIT_AUTOMAKE(ctsim,1.9.4)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -77,8 +77,8 @@ 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])
+AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)], [wxwin=false])
+AC_CHECK_LIB(wx_msw, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)], [wxwin=false])
 
 if test "$zlib" = "true" ; then
   AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
@@ -284,35 +284,34 @@ if test "$no_x" != "yes" ; then
   AC_DEFINE(HAVE_X11)
   AC_DEFINE(HAVE_SGP)
   AM_CONDITIONAL(HAVE_SGP, test 1==1)
-  LDFLAGS="$LDFLAGS -L../libezplot -L../libgraph -L/usr/X11R6/lib"
-  ctlibs_base="$ctlibs_base -lezplot -lgraph $X_BASIC_LIBS $X_TOOLKIT_LIBS"
+  LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
+  ctlibs_graphics="$ctlibs_base -lctgraphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
 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 "$png" = "true" ; then
-  ctlibs_base="$ctlibs_base -lpng"
+  ctlibs_tools="$ctlibs_tools -lpng"
 fi
 if test "$zlib" = "true" ; then
-  ctlibs_base="$ctlibs_base -lz"
+  ctlibs_tools="$ctlibs_tools -lz"
 fi
 if test "$g2" = "true" ; then
-  ctlibs_base="$ctlibs_base -lg2"
+  ctlibs_tools="$ctlibs_tools -lg2"
+fi
+if test "$wx_gtk" = "true" ; then
+  ctlibs_tools="$ctlibs_tools -lwx_gtk"
 fi
 
-ctlibs="-lir $ctlibs_base"
-
+dnl Setting projet libraries and includes
+LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim" 
+ctlibs="$ctlibs_base -lctsim $ctlibs_graphics -lctsupport $ctlibs_tools"
 AC_SUBST(ctlibs)
 
 if test -n "$lamdir" ; then
-dnl  ctlamlibs="-lir_lam $ctlibs_base"
-dnl  AC_SUBST(ctlamlibs)
-  lamprograms="ctrec-lam phm2if-lam phm2rs-lam"
+  lamprograms="ctrec-lam phm2if-lam phm2pj-lam"
   AC_SUBST(lamprograms)
- 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)
+AC_OUTPUT(Makefile src/Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile 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)