Changeset a0ddcf


Ignore:
Timestamp:
Apr 6, 2011, 4:05:13 PM (15 years ago)
Author:
Frederik Heber <heber@…>
Children:
2ed1a0
Parents:
624a32
git-author:
Frederik Heber <heber@…> (04/06/11 14:45:10)
git-committer:
Frederik Heber <heber@…> (04/06/11 16:05:13)
Message:

Replaced *_boost_*.m4 by boost.m4 from tsuna.

  • ​https://github.com/tsuna/boost.m4/ has a very nice boost m4 macro to check for presence of boost headers and libraries, also setting the rpath correctly.
  • required changes in all Makefile.ams as BOOST_... variable names have changed.
Files:
1 added
3 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • configure.ac

    r624a32 ra0ddcf  
    3333
    3434# Boost libraries
    35 AX_BOOST_BASE([1.40])
    36 AX_BOOST_THREAD
    37 AX_BOOST_PROGRAM_OPTIONS
     35BOOST_REQUIRE([1.40])
     36BOOST_PROGRAM_OPTIONS
     37BOOST_THREADS
    3838
    3939# Checks for typedefs, structures, and compiler characteristics.

  • src/Helpers/unittests/Makefile.am

    r624a32 ra0ddcf  
    44INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
    55
    6 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_LDFLAGS)
     6AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
    77AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
    88AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    … …  
    1818check_PROGRAMS = $(TESTS)
    1919noinst_PROGRAMS = $(TESTS)
    20 
    21 BOOST_LIB = $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    22 TESTLIBS = \
    23         ../../libCodePatterns-debug.la \
    24         $(BOOST_LIB)
    25 
    2620
    2721AssertUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    … …  
    4741        ../Info.hpp
    4842ChronosUnitTest_LDADD = \
    49         $(BOOST_THREAD_LIB)
     43        $(BOOST_THREAD_LIBS)
    5044
    5145InfoUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    … …  
    6862        ../MemDebug.hpp
    6963InfoUnitTest_LDADD = \
    70         $(BOOST_THREAD_LIB)
     64        $(BOOST_THREAD_LIBS)
    7165
    7266IteratorAdaptorsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    … …  
    9286        ../MemDebug.hpp
    9387LogUnitTest_LDADD = \
    94         $(BOOST_THREAD_LIB)
     88        $(BOOST_THREAD_LIBS)
    9589
    9690RangeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \

  • src/Makefile.am

    r624a32 ra0ddcf  
    44INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
    55
    6 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_LDFLAGS)
    7 # Position-Independent Code necessary for shared library
     6AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
    87AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS)
    9 
    10 BOOST_LIB = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_THREAD_LIB)
    11 
    128
    139## config utility ###
    … …  
    2016        codepatterns-config.hpp \
    2117        version.hpp
    22 codepatterns_config_LDFLAGS = \
    23         $(BOOST_LDFLAGS) \
    24         $(BOOST_PROGRAM_OPTIONS_LIB) \
    25         $(BOOST_THREAD_LIB) \
     18codepatterns_config_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
     19codepatterns_config_LDADD = \
     20        $(BOOST_THREAD_LIBS) \
     21        $(BOOST_PROGRAM_OPTIONS_LIBS) \
    2622        libCodePatterns.la
    2723

  • src/Patterns/unittests/Makefile.am

    r624a32 ra0ddcf  
    44INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
    55
    6 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_LDFLAGS)
     6AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
    77AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
    88AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    … …  
    2525noinst_PROGRAMS = $(TESTS)
    2626
    27 BOOST_LIB = $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    2827TESTLIBS = \
    2928        ../../libCodePatterns-debug.la \
    30         $(BOOST_LIB)
     29        $(BOOST_THREAD_LIBS)
    3130
    3231CacheableUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \

  • src/unittests/Makefile.am

    r624a32 ra0ddcf  
    44INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
    55
    6 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_LDFLAGS)
     6AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
    77AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
    88AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    … …  
    1111noinst_PROGRAMS = TestRunner
    1212
    13 BOOST_LIB = $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    1413TESTLIBS = \
    1514        ../libCodePatterns-debug.la \
    16         $(BOOST_LIB)
     15        $(BOOST_THREAD_LIBS)
    1716
    1817TESTSOURCES = \
Note: See TracChangeset for help on using the changeset viewer.