X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=a930908b24bbece04f3bacf9e940b4184ef68737;hb=0fe37e9c318904715493dc9c894f658c43e6178e;hp=9e32c1f9c041b309e960c74723d20abeb58b8df1;hpb=a62ba7c54d39fcf1e469c8df169018fa60ae7c3b;p=ctsim.git

diff --git a/configure.in b/configure.in
index 9e32c1f..a930908 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-b2)
+AM_INIT_AUTOMAKE(ctsim,1.9.1)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -284,34 +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_graphics="$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
 
 if test "$png" = "true" ; then
-  ctlibs_graphics="$ctlibs_graphics -lpng"
+  ctlibs_tools="$ctlibs_tools -lpng"
 fi
 if test "$zlib" = "true" ; then
-  ctlibs_graphics="$ctlibs_graphics -lz"
+  ctlibs_tools="$ctlibs_tools -lz"
 fi
 if test "$g2" = "true" ; then
-  ctlibs_graphics="$ctlibs_graphics -lg2"
+  ctlibs_tools="$ctlibs_tools -lg2"
 fi
 if test "$wx_gtk" = "true" ; then
-  ctlibs_graphics="$ctlibs_graphics -lwx_gtk"
+  ctlibs_tools="$ctlibs_tools -lwx_gtk"
 fi
 
 dnl Setting projet libraries and includes
-LDFLAGS="$LDFLAGS -L../libkmath -L../libk -L../libcio -L../libir" 
-ctlibs="$ctlibs_base -lir $ctlibs_graphics -lkmath -lk -lcio"
+LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim" 
+ctlibs="$ctlibs_base -lctsim $ctlibs_graphics -lctsupport $ctlibs_tools"
 AC_SUBST(ctlibs)
 
 if test -n "$lamdir" ; then
-  lamprograms="ctrec-lam phm2if-lam phm2rs-lam"
+  lamprograms="ctrec-lam phm2if-lam phm2pj-lam"
   AC_SUBST(lamprograms)
 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)