maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

synthesis: better method of invoking Synthesis configure

Browse source 
--prefix must be passed for 'distcheck' to work correctly. Use the 'eval' trick which is used by
AC_CONFIG_SUBDIRS to do proper quotation evaluation. Explicitly pass --srcdir because otherwise
it uses the main configure's --srcdir.
This commit is contained in:
Patrick Ohly 2009-02-27 09:56:13 +01:00 committed by Patrick Ohly
parent cf9b380ebe
commit 5377fc1087
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile-gen.am
View file

@ -4,7 +4,6 @@ SUBDIRS = src test
EXTRA_DIST = HACKING description configure-pre.in configure-post.in autogen.sh Makefile-gen.am Doxyfile
MAINTAINERCLEANFILES = Makefile.in config.h.in config.guess config.sub configure depcomp install-sh ltmain.sh missing mkinstalldirs
DISTCHECK_CONFIGURE_FLAGS = --with-sync4j=@FUNAMBOL@
# binary distribution
distbin : README all

14
configure-pre.in
View file

@ -275,19 +275,7 @@ if test $SYNTHESIS_SRC != "no-synthesis-source"; then
SYNTHESIS_LIBS="-L$SYNTHESIS_SUBDIR/src -lsynthesissdk -lsynthesis"
AC_MSG_NOTICE( [configuring the Synthesis library] )
# Passing some specific configure arguments to the synthesis library's
# configure makes sense (e.g., --enable-unit-tests) or is
# required (--disable-dependency-tracking when compiling for
# multiple architectures on Mac OS X).
cxx_lib_args=`for i in --disable-dependency-tracking --enable-unit-tests --with-xmltok; do
( for e in $ac_configure_args; do echo $e; done ) | grep -e $i
done`
if test "$enable_shared" == "yes"; then
# Okay, this is a shortcut: strictly speaking we would have
# to check with autoconf for the right flags...
SYNTHESIS_LIB_SHARED_FLAGS="-DPIC -fPIC"
fi
if (set -x; mkdir -p $SYNTHESIS_SUBDIR && cd $SYNTHESIS_SUBDIR && $SYNTHESIS_CONFIGURE $SYNTHESIS_CONFIGURE_OPTIONS --build=$build_alias --host=$host_alias --target=$target_alias CFLAGS="$CFLAGS $SYNTHESIS_LIB_SHARED_FLAGS" CXXFLAGS="$CXXFLAGS $SYNTHESIS_LIB_SHARED_FLAGS" `eval echo $cxx_lib_args`); then true; else
if (set -x; mkdir -p $SYNTHESIS_SUBDIR && cd $SYNTHESIS_SUBDIR && eval "\$SHELL \"\$SYNTHESIS_CONFIGURE\" $ac_configure_args \"--srcdir=\$SYNTHESIS_SRC\" " ); then true; else
AC_MSG_ERROR( [configuring Synthesis library failed] )
fi
fi