merged autoconf-install branch to main branch
This commit is contained in:
parent
eac694b83a
commit
d097fd47db
163 changed files with 12931 additions and 1884 deletions
52
livesupport/modules/storage/configure
vendored
Executable file
52
livesupport/modules/storage/configure
vendored
Executable file
|
@ -0,0 +1,52 @@
|
|||
#!/bin/sh
|
||||
#-------------------------------------------------------------------------------
|
||||
# Copyright (c) 2004 Media Development Loan Fund
|
||||
#
|
||||
# This file is part of the LiveSupport project.
|
||||
# http://livesupport.campware.org/
|
||||
# To report bugs, send an e-mail to bugs@campware.org
|
||||
#
|
||||
# LiveSupport is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# LiveSupport is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with LiveSupport; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
#
|
||||
# Author : $Author: maroy $
|
||||
# Version : $Revision: 1.2 $
|
||||
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/configure,v $
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Run this script to configure the environment.
|
||||
#
|
||||
# This script in effect calls the real automake / autoconf configure script
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
# assume we're in $basedir
|
||||
reldir=`dirname $0`
|
||||
basedir=`cd $reldir; pwd;`
|
||||
test -z "$basedir" && basedir=.
|
||||
|
||||
bindir=$basedir/bin
|
||||
tmpdir=$basedir/tmp
|
||||
|
||||
|
||||
autogen=$bindir/autogen.sh
|
||||
configure=$tmpdir/configure
|
||||
|
||||
if [ -x $configure ]; then
|
||||
(cd $tmpdir && $configure "$@")
|
||||
else
|
||||
(cd $basedir && $autogen "$@")
|
||||
fi
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
#
|
||||
#
|
||||
# Author : $Author: maroy $
|
||||
# Version : $Revision: 1.23 $
|
||||
# Version : $Revision: 1.24 $
|
||||
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/Makefile.in,v $
|
||||
#
|
||||
# @configure_input@
|
||||
|
@ -34,6 +34,7 @@ MKDIR = mkdir -p
|
|||
RM = rm -f
|
||||
RMDIR = rm -rf
|
||||
DOXYGEN = doxygen
|
||||
CP = cp -f
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
@ -49,7 +50,7 @@ LIB_DIR = ${BASE_DIR}/lib
|
|||
SRC_DIR = ${BASE_DIR}/src
|
||||
TMP_DIR = ${BASE_DIR}/tmp
|
||||
|
||||
USR_DIR = ${BASE_DIR}/../../usr
|
||||
USR_DIR = @prefix@
|
||||
USR_INCLUDE_DIR = ${USR_DIR}/include
|
||||
USR_LIB_DIR = ${USR_DIR}/lib
|
||||
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31
|
||||
|
@ -135,7 +136,7 @@ TEST_RUNNER_LIBS = -l${STORAGE_LIB} -l${CORE_LIB} -l${AUTHENTICATION_LIB} \
|
|||
#-------------------------------------------------------------------------------
|
||||
# Targets
|
||||
#-------------------------------------------------------------------------------
|
||||
.PHONY: all dir_setup doc clean docclean depclean distclean check
|
||||
.PHONY: all dir_setup doc clean docclean depclean distclean check install
|
||||
|
||||
all: dir_setup ${STORAGE_LIB_FILE}
|
||||
|
||||
|
@ -162,6 +163,12 @@ distclean: clean docclean
|
|||
check: all ${TEST_RUNNER} storage_server_init
|
||||
${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT}
|
||||
|
||||
install: all
|
||||
${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/Storage
|
||||
${CP} ${INCLUDE_DIR}/LiveSupport/Storage/*.h \
|
||||
${USR_INCLUDE_DIR}/LiveSupport/Storage
|
||||
${CP} ${STORAGE_LIB_FILE} ${USR_LIB_DIR}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Specific targets
|
||||
|
|
|
@ -20,8 +20,8 @@ dnl along with LiveSupport; if not, write to the Free Software
|
|||
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
dnl
|
||||
dnl
|
||||
dnl Author : $Author: fgerlits $
|
||||
dnl Version : $Revision: 1.5 $
|
||||
dnl Author : $Author: maroy $
|
||||
dnl Version : $Revision: 1.6 $
|
||||
dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/configure.ac,v $
|
||||
dnl-----------------------------------------------------------------------------
|
||||
|
||||
|
@ -35,7 +35,7 @@ dnl-----------------------------------------------------------------------------
|
|||
AC_INIT(Storage, 1.0, bugs@campware.org)
|
||||
AC_PREREQ(2.59)
|
||||
AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
|
||||
AC_REVISION($Revision: 1.5 $)
|
||||
AC_REVISION($Revision: 1.6 $)
|
||||
|
||||
AC_CONFIG_SRCDIR(../src/StorageClientFactory.cxx)
|
||||
|
||||
|
@ -44,10 +44,25 @@ AC_PROG_CXX()
|
|||
|
||||
AC_CHECK_HEADERS(getopt.h sys/time.h time.h)
|
||||
|
||||
PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0])
|
||||
dnl-----------------------------------------------------------------------------
|
||||
dnl specify the pkg-config path
|
||||
dnl-----------------------------------------------------------------------------
|
||||
AC_ARG_WITH([pkg-config-path],
|
||||
AC_HELP_STRING([--with-pkg-config-path],
|
||||
[use the pkg-config path (prefix/lib/pkgconfig)]),
|
||||
[PKG_CONFIG_PATH=${withval}],
|
||||
[PKG_CONFIG_PATH=${prefix}/lib/pkgconfig])
|
||||
|
||||
AC_MSG_RESULT([using pkg-config path: ${PKG_CONFIG_PATH}])
|
||||
|
||||
export PKG_CONFIG_PATH
|
||||
|
||||
|
||||
PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.8.1])
|
||||
AC_SUBST(LIBXMLPP_CFLAGS)
|
||||
AC_SUBST(LIBXMLPP_LIBS)
|
||||
|
||||
|
||||
dnl-----------------------------------------------------------------------------
|
||||
dnl enable compilaton for code coverage data
|
||||
dnl-----------------------------------------------------------------------------
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue