X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.in;h=7814d8e40d9ec1510b62788462be4adba3a420e0;hp=9e32c1f9c041b309e960c74723d20abeb58b8df1;hb=f4a23943110823118f35756dd41fbd6707f04511;hpb=a62ba7c54d39fcf1e469c8df169018fa60ae7c3b diff --git a/configure.in b/configure.in index 9e32c1f..7814d8e 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.0) AM_CONFIG_HEADER(config.h) dnl Checks for programs. @@ -292,25 +292,25 @@ else 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" +ctlibs="$ctlibs_base -lir $ctlibs_graphics -lkmath -lk -lcio $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