Changeset 48fa0ee


Ignore:
Timestamp:
Sep 17, 2010 3:35:21 PM (8 years ago)
Author:
Ted Faber <faber@…>
Branches:
abac0-leak, abac0-mei, compt_changes, gec13, master, mei-id, mei-rt0-n, mei_rt0, mei_rt2, mei_rt2_fix_1, meiyap-rt1, meiyap1, rt2, tvf-new-xml
Children:
b9368f3
Parents:
0f9615e
Message:

Fix a few configure bugs:

Find lib strongswan if it is in /usr/local/lib and give a user
override

Find the site_prel directory and give the user an override

Make the ABAC.py and ABAC.pm swig entries

Find python libraries correctly on FreeBSD
(m4/ac_python_devel.m4)

Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r0f9615e r48fa0ee  
    5555swig_python__ABAC_la_LIBADD = $(top_builddir)/libabac/libabac.la
    5656
     57# ABAC.py is created as a side effect
    5758swig/python/ABAC.py swig/python/abac_wrap.cxx:  swig/python/abac.i
    58         $(SWIG) $(SWIG_PYTHON_OPT) -o $@ $<
     59        $(SWIG) $(SWIG_PYTHON_OPT) -o swig/python/abac_wrap.cxx swig/python/abac.i
    5960
    6061# perl
    6162bin_SCRIPTS += swig/perl/abac_prover.pl
    62 perldir = /usr/local/lib/site_perl
     63perldir = @SITE_PERL@
    6364perl_SCRIPTS = swig/perl/ABAC.pm
    6465perl_LTLIBRARIES = swig/perl/ABAC.la
     
    6869swig_perl_ABAC_la_LIBADD = $(top_builddir)/libabac/libabac.la -lssl
    6970
    70 swig/perl/ABAC.pm swig/perl/abac_wrap.cxx:      swig/perl/abac.i
    71         $(SWIG) -c++ -perl -o $@ $<
     71# ABAC.pm is created as a side effect
     72swig/perl/ABAC.pm swig/perl/abac_wrap.cxx:
     73        $(SWIG) -perl -o swig/perl/abac_wrap.cxx swig/perl/abac.i
    7274
    7375# preprove
  • autogen.sh

    r4918535 r48fa0ee  
    1313esac
    1414
     15# aclocal uses -I ./m4 to overlay our AC_PYTHON_DEVEL macro.
    1516$LIBTOOLIZE --force &&
    16 aclocal &&
     17aclocal -I ./m4 &&
    1718automake -a &&
    1819autoconf
  • configure.ac

    r43a5429 r48fa0ee  
    1010AC_PROG_CC
    1111AC_PROG_LIBTOOL
     12
     13# Explicitly hunt up perl
     14AC_CHECK_PROGS(PERL, perl)
    1215
    1316# for python
     
    2831AC_SUBST([LIBSTRONGSWAN_source])
    2932
     33AC_ARG_WITH([strongswan-ld-path],
     34    [AS_HELP_STRING([--with-strongswan-ld-path=PATH],
     35    [directory where libstrongswan is installed if not /usr/local/lib])],
     36    [strongswan_ld=$withval], [strongswan_ld="/usr/local/lib"])
     37LDFLAGS="$LDFLAGS -L$strongswan_ld"
     38
     39AC_ARG_WITH(
     40    [site-perl],
     41    [AS_HELP_STRING([--with-site-perl=DIR],
     42                   [directory in which to install perl modules])],
     43    [SITE_PERL="$withval"], [SITE_PERL=""])
     44   
     45
    3046# this is so wrong
    3147libstrongswan_plugins=$(grep libstrongswan_plugins $LIBSTRONGSWAN_source/Makefile | awk -F= '{ print $2 }')
    3248test -z "$libstrongswan_plugins" && AC_ERROR([Can't find libstrongswan plugins. Make sure you've run ./configure --enable-monolithic in the strongswan source tree])
    3349AC_SUBST(libstrongswan_plugins)
     50
     51# Ask perl for a likely site_perl directory.  If the user has already specified
     52# it using --with-site-perl, use that value.  NB, this does not respect prefix,
     53# so users wishing to do a local install must use --with-site-perl
     54AC_MSG_CHECKING(for site_perl directory)
     55if test -z "$SITE_PERL"; then
     56        SITE_PERL=`$PERL -e 'print((grep(/site_perl/ && !m#/mach#, @INC))[0], "\n");'`
     57fi
     58AC_MSG_RESULT($SITE_PERL)
     59AC_SUBST(SITE_PERL)
    3460
    3561# Checks for header files.
     
    4773AC_FUNC_MALLOC
    4874AC_CHECK_FUNCS([atexit memset strchr strdup])
     75
     76# Confirm that the link path includes strongswan
     77AC_CHECK_LIB(strongswan, library_init,,
     78             [AC_MSG_ERROR('set --with-strongswan-ld-path')])
    4979
    5080# snagged from strongswan, required
Note: See TracChangeset for help on using the changeset viewer.