Changeset 668


Ignore:
Timestamp:
Jul 4, 2008, 1:28:06 AM (13 years ago)
Author:
Jari Häkkinen
Message:

Fixes #340. Run 'bootstrap' after update.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/Makefile.am

    r640 r668  
    55# Copyright (C) 2005 Jari Häkkinen
    66# Copyright (C) 2006 Jari Häkkinen, Peter Johansson
    7 # Copyright (C) 2007, 2008 Peter Johansson
     7# Copyright (C) 2007 Peter Johansson
     8# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
    89#
    910# This file is part of svndigest, http://trac.thep.lu.se/svndigest
     
    3031noinst_HEADERS = Parameter.h
    3132
    32 LDADD = @top_builddir@/lib/libsvndigest.la $(SVNDIGEST_LIBS)
    33 AM_LDFLAGS = $(STATICFLAG) $(SVNDIGEST_LDFLAGS)
     33LDADD = @top_builddir@/lib/libsvndigest.a $(SVNDIGEST_LIBS)
     34AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
    3435
    3536AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS)
  • trunk/configure.ac

    r641 r668  
    7272AC_PROG_CXX
    7373AC_PROG_INSTALL
    74 AC_PROG_LIBTOOL
     74AC_PROG_RANLIB
    7575AC_PROG_SED
    7676AC_CHECK_PROG([GNUPLOT],[gnuplot],[ok])
     
    9292  [SD_CXXFLAGS="$SD_CXXFLAGS -g -O"],
    9393  [SD_CPPFLAGS="-DNDEBUG" SD_CXXFLAGS="$SD_CXXFLAGS -O3"])
    94 
    95 # optionally prepare for building static libraries.
    96 AC_ARG_ENABLE(staticbin,
    97   [AS_HELP_STRING([--enable-staticbin], [create a static binary,
    98   at least as static as the available underlying libraries
    99   allows])])
    100 if test "$enable_staticbin" = "yes"; then
    101   case $host in
    102   *-apple-darwin*)
    103     # At the time of creating this libsvn_subr uses
    104     # Keychain on Mac OSX. In consequence the below
    105     # frameworks are needed for succesful static builds.
    106     SD_LIBS="$SD_LIBS -framework Security"
    107     SD_LIBS="$SD_LIBS -framework CoreFoundation"
    108     SD_LIBS="$SD_LIBS -framework CoreServices"
    109     ;;
    110   esac
    111   STATICFLAG=-static
    112   AC_SUBST(STATICFLAG)
    113 fi
    11494
    11595# Apache Portable Runtime (APR) API checks
     
    147127AC_CHECK_HEADER([apr_allocator.h],,apr_found="no")
    148128AC_CHECK_HEADER([subversion-1/svn_types.h],,svn_found="no")
    149 # The library checks below may match shared libs even when
    150 # --enable-staticbin is given to configure. This should probably not
    151 # pose any problems since in a properly installed system the shared
    152 # and static libraries should be the same.
    153129AC_SEARCH_LIBS([svn_cmdline_setup_auth_baton],[svn_subr-1],
    154130               [SD_LIBS="-lsvn_subr-1 $SD_LIBS"],svn_found="no")
     
    300276fi
    301277
    302 if test "$enable_staticbin" = "yes"; then
    303     AC_MSG_NOTICE([A statically linked 'svndigest' binary will be created.])
    304 else
    305     AC_MSG_NOTICE([A dynamically linked 'svndigest' binary will be created.])
    306 fi
    307     AC_MSG_NOTICE([])
    308 
    309278AC_MSG_NOTICE([Now type 'make ; make check'.])
    310 
  • trunk/lib/Makefile.am

    r667 r668  
    2828AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
    2929
    30 noinst_lib_LTLIBRARIES = libsvndigest.la
    31 noinst_libdir = /tmp
     30noinst_LIBRARIES = libsvndigest.a
    3231
    3332noinst_HEADERS = AddStats.h Alias.h BlameStats.h ClassicStats.h ColumnStream.h \
     
    3938  SVNinfo.h SVNlog.h SVNproperty.h Trac.h utility.h
    4039
    41 libsvndigest_la_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
     40libsvndigest_a_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
    4241  ClassicStats.cc ColumnStream.cc \
    4342  Commitment.cc Configuration.cc \
     
    4544  Functor.cc Gnuplot.cc GnuplotFE.cc  HtmlBuf.cc HtmlStream.cc \
    4645  html_utility.cc LineTypeParser.cc Node.cc \
    47   rmdirhier.cc Stats.cc StatsCollection.cc subversion_info.cc SVN.cc        \
     46  rmdirhier.cc Stats.cc StatsCollection.cc subversion_info.cc SVN.cc \
    4847  SVNblame.cc SVNinfo.cc SVNlog.cc SVNproperty.cc Trac.cc utility.cc
    4948
  • trunk/test/Makefile.am

    r640 r668  
    33## $Id$
    44
    5 # Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
    6 # Copyright (C) 2008 Peter Johansson
     5# Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
    76#
    87# This file is part of svndigest, http://trac.thep.lu.se/svndigest
     
    4241noinst_HEADERS = Suite.h
    4342
    44 check_LTLIBRARIES = libsvndigesttest.la
     43check_LIBRARIES = libsvndigesttest.a
    4544
    4645
    47 LDADD = @builddir@/libsvndigesttest.la \
    48   @top_builddir@/lib/libsvndigest.la \
     46LDADD = @builddir@/libsvndigesttest.a \
     47  @top_builddir@/lib/libsvndigest.a \
    4948  $(SVNDIGEST_LIBS)
    50 AM_LDFLAGS = $(STATICFLAG) $(SVNDIGEST_LDFLAGS)
     49AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
    5150
    5251AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS)
    5352AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
    5453
    55 libsvndigesttest_la_SOURCES = Suite.cc
     54libsvndigesttest_a_SOURCES = Suite.cc
    5655
    5756config_test_SOURCES = config_test.cc
     
    7170
    7271# some tests need the test repo to be checked out
    73 stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
    74 copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
     72stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a
     73copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a
    7574
    76 @top_builddir@/lib/libsvndigest.la:
     75@top_builddir@/lib/libsvndigest.a:
    7776  @cd @top_builddir@/lib/ && $(MAKE) $(AM_MAKEFLAGS);
    7877
     
    8483  rm -rf *.png *.tmp *~ $(targetdir)
    8584
    86 .PHONY: @top_builddir@/lib/libsvndigest.la
     85.PHONY: @top_builddir@/lib/libsvndigest.a
Note: See TracChangeset for help on using the changeset viewer.