Changeset 668 for trunk

Timestamp:

Jul 4, 2008, 1:28:06 AM (14 years ago)

Author:

Jari Häkkinen

Message:

Fixes #340. Run 'bootstrap' after update.

Location:

trunk

Files:

• bin/Makefile.am (modified) (2 diffs)
• configure.ac (modified) (4 diffs)
• lib/Makefile.am (modified) (3 diffs)
• test/Makefile.am (modified) (4 diffs)

trunk/bin/Makefile.am

@@ -5 +5 @@
 # Copyright (C) 2005 Jari Häkkinen
 # Copyright (C) 2006 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2007, 2008 Peter Johansson
+# Copyright (C) 2007 Peter Johansson
+# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
 #
 # This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -30 +31 @@
 noinst_HEADERS = Parameter.h
 
-LDADD = @top_builddir@/lib/libsvndigest.la $(SVNDIGEST_LIBS)
-AM_LDFLAGS = $(STATICFLAG) $(SVNDIGEST_LDFLAGS)
+LDADD = @top_builddir@/lib/libsvndigest.a $(SVNDIGEST_LIBS)
+AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
 
 AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS)

trunk/configure.ac

@@ -72 +72 @@
 AC_PROG_CXX
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+AC_PROG_RANLIB
 AC_PROG_SED
 AC_CHECK_PROG([GNUPLOT],[gnuplot],[ok])
@@ -92 +92 @@
   [SD_CXXFLAGS="$SD_CXXFLAGS -g -O"], 
   [SD_CPPFLAGS="-DNDEBUG" SD_CXXFLAGS="$SD_CXXFLAGS -O3"])
-
-# optionally prepare for building static libraries.
-AC_ARG_ENABLE(staticbin,
-  [AS_HELP_STRING([--enable-staticbin], [create a static binary,
-  at least as static as the available underlying libraries
-  allows])])
-if test "$enable_staticbin" = "yes"; then
-  case $host in
-  *-apple-darwin*)
-    # At the time of creating this libsvn_subr uses
-    # Keychain on Mac OSX. In consequence the below
-    # frameworks are needed for succesful static builds.
-    SD_LIBS="$SD_LIBS -framework Security"
-    SD_LIBS="$SD_LIBS -framework CoreFoundation"
-    SD_LIBS="$SD_LIBS -framework CoreServices"
-    ;;
-  esac
-  STATICFLAG=-static
-  AC_SUBST(STATICFLAG)
-fi
 
 # Apache Portable Runtime (APR) API checks
@@ -147 +127 @@
 AC_CHECK_HEADER([apr_allocator.h],,apr_found="no")
 AC_CHECK_HEADER([subversion-1/svn_types.h],,svn_found="no")
-# The library checks below may match shared libs even when
-# --enable-staticbin is given to configure. This should probably not
-# pose any problems since in a properly installed system the shared
-# and static libraries should be the same.
 AC_SEARCH_LIBS([svn_cmdline_setup_auth_baton],[svn_subr-1],
                [SD_LIBS="-lsvn_subr-1 $SD_LIBS"],svn_found="no")
@@ -300 +276 @@
 fi
 
-if test "$enable_staticbin" = "yes"; then
-    AC_MSG_NOTICE([A statically linked 'svndigest' binary will be created.])
-else
-    AC_MSG_NOTICE([A dynamically linked 'svndigest' binary will be created.])
-fi
-    AC_MSG_NOTICE([])
-
 AC_MSG_NOTICE([Now type 'make ; make check'.])
-

trunk/lib/Makefile.am

@@ -28 +28 @@
 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
 
-noinst_lib_LTLIBRARIES = libsvndigest.la
-noinst_libdir = /tmp
+noinst_LIBRARIES = libsvndigest.a
 
 noinst_HEADERS = AddStats.h Alias.h BlameStats.h ClassicStats.h ColumnStream.h \
@@ -39 +38 @@
   SVNinfo.h SVNlog.h SVNproperty.h Trac.h utility.h
 
-libsvndigest_la_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
+libsvndigest_a_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
   ClassicStats.cc ColumnStream.cc \
   Commitment.cc Configuration.cc \
@@ -45 +44 @@
   Functor.cc Gnuplot.cc GnuplotFE.cc  HtmlBuf.cc HtmlStream.cc \
   html_utility.cc LineTypeParser.cc Node.cc \
-  rmdirhier.cc Stats.cc StatsCollection.cc subversion_info.cc SVN.cc        \
+  rmdirhier.cc Stats.cc StatsCollection.cc subversion_info.cc SVN.cc \
   SVNblame.cc SVNinfo.cc SVNlog.cc SVNproperty.cc Trac.cc utility.cc
 

trunk/test/Makefile.am

@@ -3 +3 @@
 ## $Id$
 
-# Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2008 Peter Johansson
+# Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
 #
 # This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -42 +41 @@
 noinst_HEADERS = Suite.h
 
-check_LTLIBRARIES = libsvndigesttest.la
+check_LIBRARIES = libsvndigesttest.a
 
 
-LDADD = @builddir@/libsvndigesttest.la \
-  @top_builddir@/lib/libsvndigest.la \
+LDADD = @builddir@/libsvndigesttest.a \
+  @top_builddir@/lib/libsvndigest.a \
   $(SVNDIGEST_LIBS)
-AM_LDFLAGS = $(STATICFLAG) $(SVNDIGEST_LDFLAGS)
+AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
 
 AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS)
 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
 
-libsvndigesttest_la_SOURCES = Suite.cc
+libsvndigesttest_a_SOURCES = Suite.cc
 
 config_test_SOURCES = config_test.cc
@@ -71 +70 @@
 
 # some tests need the test repo to be checked out
-stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
-copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.la
+stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a
+copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a
 
-@top_builddir@/lib/libsvndigest.la:
+@top_builddir@/lib/libsvndigest.a:
   @cd @top_builddir@/lib/ && $(MAKE) $(AM_MAKEFLAGS);
 
@@ -84 +83 @@
   rm -rf *.png *.tmp *~ $(targetdir)
 
-.PHONY: @top_builddir@/lib/libsvndigest.la
+.PHONY: @top_builddir@/lib/libsvndigest.a