summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-10-31 17:04:26 +0100
committerSlávek Banko <slavek.banko@axis.cz>2012-10-31 17:04:26 +0100
commit3fc5e3c321393bbda622908a7e60adb762b7054c (patch)
treee2e881b3c65ba64415e8d568b4734f9dfa3f081a
parentf3a0bf5b56f7e391dab5825810edff3a5ae6435d (diff)
downloadktechlab-3fc5e3c321393bbda622908a7e60adb762b7054c.tar.gz
ktechlab-3fc5e3c321393bbda622908a7e60adb762b7054c.zip
Fix build without gpsim
-rw-r--r--configure.in2
-rw-r--r--configure.in.in2
-rw-r--r--src/Makefile.am2
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 4c8599d..434d2c6 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -104,7 +104,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 6d6db63..2200020 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_TDEPRINT) $(LIB_QT) $(LIB_GPSIM) -lgpsimgui
+ $(top_builddir)/src/core/libcore.la -lkutils -lktexteditor $(LIB_KFILE) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_GPSIM)
# which sources should be compiled for ktechlab
ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \