diff options
author | John Wiegley <johnw@newartisans.com> | 2009-03-03 14:54:42 -0400 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2009-03-03 14:54:42 -0400 |
commit | 27c0de0da3ab0e4febe314119f059c722555e77d (patch) | |
tree | b93180ce30bad22e8f80ee710884007057a3ea60 | |
parent | 67a45a0e3cdb92ead1214740281f6f39407ad846 (diff) | |
download | ledger-27c0de0da3ab0e4febe314119f059c722555e77d.tar.gz ledger-27c0de0da3ab0e4febe314119f059c722555e77d.tar.bz2 ledger-27c0de0da3ab0e4febe314119f059c722555e77d.zip |
Using ./acprep now builds statically by default
-rw-r--r-- | Makefile.am | 6 | ||||
-rwxr-xr-x | acprep | 2 | ||||
-rw-r--r-- | configure.ac | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index e0bea53f..b59d2cf5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -166,7 +166,7 @@ ledger_CPPFLAGS += -I$(srcdir)/python endif ledger_SOURCES = src/main.cc src/global.cc ledger_LDADD = $(LIBOBJS) $(lib_LTLIBRARIES) $(INTLLIBS) -ledger_LDFLAGS = +ledger_LDFLAGS = -static info_TEXINFOS = doc/ledger.texi @@ -339,7 +339,9 @@ $(top_builddir)/test/python/UnitTests.py: $(all_py_tests_sources) @echo "]" >> $@ @echo "TextTestRunner().run(TestSuite(suites))" >> $@ -ESC_python=`echo "$(PYTHON)" | sed 's/\//\\\\\//g'` +ledger_python = $(top_builddir)/ledger$(EXEEXT) python + +ESC_python=`echo "$(ledger_python)" | sed 's/\//\\\\\//g'` ESC_srcdir=`echo "$(srcdir)" | sed 's/\//\\\\\//g'` ESC_builddir=`echo "$(top_builddir)" | sed 's/\//\\\\\//g'` ESC_distdir=`echo "$(distdir)" | sed 's/\//\\\\\//g'` @@ -33,7 +33,7 @@ git ls-files '*.cc' '*.h' | egrep '^(src|python)/' > po/POTFILES.in aclocal -I m4 -SWITCHES="--with-included-gettext" +SWITCHES="--disable-shared --with-included-gettext" if [ -z "$PYTHON_HOME" ]; then PYTHON_HOME="/usr" diff --git a/configure.ac b/configure.ac index 5292c11d..f68289f0 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,6 @@ AC_USE_SYSTEM_EXTENSIONS AC_PROG_CXX AC_PROG_MAKE_SET AC_PROG_LIBTOOL -AM_PROG_LIBTOOL AM_GNU_GETTEXT AM_GNU_GETTEXT_VERSION([0.17]) |