luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't mess with libtools --enable-static / --enable-shared 

tie libspice to -shared
    ngspice et al to -static

and use $(STATIC) elsewhere
  which is governed by configure.ac
This commit is contained in:
rlar 2012-07-07 14:44:29 +02:00
parent cb0a48801d
commit 84b58ebd3b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -315,8 +315,6 @@ if test "x$with_tcl" != x && test "x$with_tcl" != xno ; then
esac esac
with_x=no with_x=no
enable_shared=yes
enable_static=no
AC_MSG_CHECKING([for tclConfig.sh]) AC_MSG_CHECKING([for tclConfig.sh])
tcl_config_sh="" tcl_config_sh=""
@ -434,11 +432,12 @@ EOF
done done
fi fi
AC_SUBST([STATIC], [-shared])
else else
TCL_PACKAGE_PATH="" TCL_PACKAGE_PATH=""
TCL_LIB_SPEC="" TCL_LIB_SPEC=""
enable_shared=no AC_SUBST([STATIC], [-static])
enable_static=yes
fi fi
AM_CONDITIONAL([TCL_MODULE], [test "x$has_tcl_module" = xtrue]) AM_CONDITIONAL([TCL_MODULE], [test "x$has_tcl_module" = xtrue])

4
src/Makefile.am
View File

@ -302,6 +302,8 @@ tclspinit: $(srcdir)/tclspinit.in
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_CFLAGS@ AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_CFLAGS@
AM_CFLAGS = -static
LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
if WINDOWS if WINDOWS
@ -407,7 +409,7 @@ libspice_la_LIBADD += \
misc/libmisc.la \ misc/libmisc.la \
$(LIBS) $(LIBS)
libspice_la_CFLAGS = $(AM_CFLAGS) libspice_la_CFLAGS = -shared
libspice_la_LDFLAGS = -shared -Wl,--version-script=$(srcdir)/tclspice.map libspice_la_LDFLAGS = -shared -Wl,--version-script=$(srcdir)/tclspice.map
if TCLWIN if TCLWIN
libspice_la_LDFLAGS += -no-undefined libspice_la_LDFLAGS += -no-undefined