diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-10-31 17:04:26 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-10-31 17:07:54 +0100 |
| commit | 6e7dccfe5f4733fa5c39344b672740e1b5fda658 (patch) | |
| tree | ea0d100528b70f471fbd3187981f7692400cfacd | |
| parent | 84097910a778761fc4768ea4d9ec2f8a9572e0e1 (diff) | |
| download | ktechlab-6e7dccfe5f4733fa5c39344b672740e1b5fda658.tar.gz ktechlab-6e7dccfe5f4733fa5c39344b672740e1b5fda658.zip | |
Fix build without gpsim
(cherry picked from commit 3fc5e3c321393bbda622908a7e60adb762b7054c)
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | configure.in.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 5d9d430..8e0d9ba 100644 --- a/configure.in +++ b/configure.in @@ -167,7 +167,7 @@ if test x$have_gpsim_0_21_4 == xyes || test x$have_gpsim_0_21_11 == xyes || test for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses" do LIBS="$ac_save_LIBS $LIBREADLINE" - LIB_GPSIM="$LIBREADLINE -lgpsim -lgpsim_eXdbm -lgpsimcli" + LIB_GPSIM="$LIBREADLINE -lgpsim -lgpsim_eXdbm -lgpsimcli -lgpsimgui" AC_TRY_RUN([ /* program */ #include <stdio.h> diff --git a/configure.in.in b/configure.in.in index 747ac83..4d83056 100644 --- a/configure.in.in +++ b/configure.in.in @@ -102,7 +102,7 @@ if test x$have_gpsim_0_21_4 == xyes || test x$have_gpsim_0_21_11 == xyes || test for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses" do LIBS="$ac_save_LIBS $LIBREADLINE" - LIB_GPSIM="$LIBREADLINE -lgpsim -lgpsim_eXdbm -lgpsimcli" + LIB_GPSIM="$LIBREADLINE -lgpsim -lgpsim_eXdbm -lgpsimcli -lgpsimgui" AC_TRY_RUN([ /* program */ #include <stdio.h> diff --git a/src/Makefile.am b/src/Makefile.am index dbd0251..620be84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \ $(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \ $(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \ $(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \ - $(top_builddir)/src/core/libcore.la -lkutils -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_GPSIM) -lgpsimgui + $(top_builddir)/src/core/libcore.la -lkutils -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_GPSIM) # which sources should be compiled for ktechlab ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \ |