X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.in;h=e40568a76466a356f438ccf76a5161d7ce770baa;hp=fe236e653057574d574b5f916dc3c5fc7c08258b;hb=caa021c02677851eb50fdda6d24a1259f901b20b;hpb=e2dbd11ba1c5f0535d2f73c83e95c9c2ebef5318 diff --git a/configure.in b/configure.in index fe236e6..e40568a 100644 --- a/configure.in +++ b/configure.in @@ -215,26 +215,6 @@ else AC_MSG_RESULT([no]) fi -dnl Setting projet libraries and includes -LDFLAGS="$LDFLAGS -L../libezplot -L../libgraph -L../libkmath -L../libk -L../libcio -L../libir" -ctlibs_base="$ctlibs_base -lezplot -lgraph -lkmath -lk -lcio" -if test -n "$pngdir" ; then - ctlibs_base="$ctlibs_base -lpng" -fi -if test "$zlib" = "true" ; then - ctlibs_base="$ctlibs_base -lz" -fi -ctlibs="-lir $ctlibs_base" - -AC_SUBST(ctlibs) - -if test -n "$lamdir" ; then - ctlamlibs="-lir_lam $ctlibs_base" - lamprograms="ctrec-lam phm2sdf-lam phm2rs-lam" - AC_SUBST(lamprograms) - AC_SUBST(ctlamlibs) -fi - AM_CONDITIONAL(USE_LAM, test -n "$lamdir") dnl Prepare to support X. If the user gave the command-line option @@ -290,6 +270,28 @@ AC_SUBST(my_includes) if test "x$no_x" != "xyes" ; then AC_DEFINE(HAVE_INTERACTIVE_GRAPHICS) AM_CONDITIONAL(HAVE_INTERACTIVE_GRAPHICS, test 1==1) + LDFLAGS="$LDFLAGS -L../libezplot -L../libgraph" + ctlibs_base="$ctlibs_base -lezplot -lgraph" +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 + ctlibs_base="$ctlibs_base -lpng" +fi +if test "$zlib" = "true" ; then + ctlibs_base="$ctlibs_base -lz" +fi +ctlibs="-lir $ctlibs_base" + +AC_SUBST(ctlibs) + +if test -n "$lamdir" ; then + ctlamlibs="-lir_lam $ctlibs_base" + lamprograms="ctrec-lam phm2sdf-lam phm2rs-lam" + AC_SUBST(lamprograms) + AC_SUBST(ctlamlibs) 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/ctsim.html html/Makefile include/Makefile getopt/Makefile src/sample-ctrec.sh cgi-bin/ctsim.conf)