Changeset 1584

Show
Ignore:
Timestamp:
04/30/10 20:17:57 (3 years ago)
Author:
ahu
Message:

revamp our auto* stuff, plus add useful 'boost.m4' for finding boost paths & library names

Location:
trunk/pdns
Files:
1 added
1 removed
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/pdns/Makefile.am

    r574 r1584  
    33codedocs/Makefile codedocs/doxygen.conf contrib/powerdns.solaris.init.d \ 
    44bootstrap 
     5 
     6ACLOCAL_AMFLAGS = -I. 
    57 
    68man8_MANS=pdns/docs/pdns_control.8 pdns/docs/pdns_server.8 pdns/docs/zone2sql.8  

  • trunk/pdns/bootstrap

    r284 r1584  
    11#!/bin/sh 
    2 echo Please ignore this warning when you see it: 
    3 echo warning: AC_TRY_RUN called without default to allow cross compiling 
    4 echo 
    5  
    6  
    7 aclocal 
    8 autoheader 
    9 libtoolize 
    10 automake --add-missing --copy --foreign  
    11 autoconf 
    12  
     2autoreconf 

  • trunk/pdns/pdns/Makefile.am

    r1579 r1584  
    1 AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ -I/usr/include/lua5.1 -Iext/polarssl/include 
     1AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ -I/usr/include/lua5.1 -Iext/polarssl/include $(BOOST_CPPFLAGS) 
    22AM_CPPFLAGS=-Ibackends/bind @THREADFLAGS@ 
    33 
    … …  
    4848 
    4949# 
    50 pdns_server_LDFLAGS= @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ -Lext/polarssl/library -lpolarssl -lboost_filesystem-mt -lboost_system-mt 
     50pdns_server_LDFLAGS= @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ -Lext/polarssl/library -lpolarssl $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) 
    5151 
    5252pdnssec_SOURCES=pdnssec.cc dnsseckeeper.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh \ 
    … …  
    5555        base32.cc  
    5656 
    57 pdnssec_LDFLAGS=-Lext/polarssl/library/ -lboost_filesystem-mt -lboost_system-mt -lpolarssl -lboost_program_options-mt 
     57pdnssec_LDFLAGS=-Lext/polarssl/library/ $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) -lpolarssl $(BOOST_FILESYSTEM_LIBS) $(BOOST_PROGRAM_OPTION_LIBS) 
    5858                         
    5959 
    … …  
    104104        unix_utility.cc utility.hh sillyrecords.cc       
    105105 
    106 dnsreplay_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ -lboost_program_options 
     106dnsreplay_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_FILESYSTEM_LIBS) $(BOOST_PROGRAM_OPTION_LIBS) 
    107107 
    108108nproxy_SOURCES=nproxy.cc dnsparser.cc dnsrecords.cc dnsparser.hh  \ 
    … …  
    110110        sillyrecords.cc selectmplexer.cc  mplexer.hh 
    111111 
    112 nproxy_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ -lboost_program_options 
     112nproxy_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_FILESYSTEM_LIBS) $(BOOST_PROGRAM_OPTION_LIBS) 
    113113 
    114114notify_SOURCES=notify.cc dnsparser.cc dnsrecords.cc dnsparser.hh  \ 
    … …  
    116116        sillyrecords.cc selectmplexer.cc  
    117117 
    118 notify_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ -lboost_program_options 
     118notify_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_FILESYSTEM_LIBS) $(BOOST_PROGRAM_OPTION_LIBS) 
    119119 
    120120 
    … …  
    147147aes/dns_random.cc aes/aescrypt.c aes/aeskey.c aes/aestab.c aes/aes_modes.c \ 
    148148lua-pdns-recursor.cc lua-pdns-recursor.hh randomhelper.cc  \ 
    149 recpacketcache.cc recpacketcache.hh dns.cc 
     149recpacketcache.cc recpacketcache.hh dns.cc nsecrecords.cc base32.cc 
    150150 
    151151#../modules/gmysqlbackend/smysql.cc