remove use of libtool from autoconf and special Mac OS X case
add ./bootstrap.sh --enable-sma-crawler option to get libtool back for ./configure --enable-sma-crawler git-svn-id: svn://svn.code.sf.net/p/openhip/code/hip/trunk@26 4c5cb64f-9889-4596-9799-84b02dc3effa
This commit is contained in:
Jeff Ahrenholz
parent
9c8dbba49d
commit
179cddf67c
40
bootstrap.sh
40
bootstrap.sh
|
|
@ -1,23 +1,43 @@
|
|||
#!/bin/sh
|
||||
|
||||
# libtool is only used to build the configuration libraries associated
|
||||
# with the --enable-sma-crawler configure option
|
||||
if [ "$1a" = "--enable-sma-crawlera" ]; then
|
||||
LIBTOOLIZE_MSG="echo Running libtoolize..."
|
||||
LIBTOOLIZE="libtoolize --force --copy --automake"
|
||||
CONFOPTS=" --enable-sma-crawler"
|
||||
if [ -e src/util/Makefile.am.disabled ]; then
|
||||
mv src/util/Makefile.am.disabled src/util/Makefile.am
|
||||
fi
|
||||
mv configure.ac configure.ac.orig
|
||||
sed -e "s,#AC_PROG_LIBTOOL,AC_PROG_LIBTOOL," configure.ac.orig > configure.ac
|
||||
elif [ "$1a" = "a" ]; then
|
||||
LIBTOOLIZE_MSG=""
|
||||
LIBTOOLIZE=""
|
||||
CONFOPTS=""
|
||||
if [ ! -e src/util/Makefile.am.disabled ]; then
|
||||
mv src/util/Makefile.am src/util/Makefile.am.disabled
|
||||
touch src/util/Makefile.am
|
||||
fi
|
||||
if [ -e configure.ac.orig ]; then
|
||||
mv configure.ac.orig configure.ac
|
||||
fi
|
||||
else
|
||||
echo "usage: ./bootstrap.sh [--enable-sma-crawler]"
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if [ -d /usr/local/share/aclocal ]; then
|
||||
EXTRA_INC="-I /usr/local/share/aclocal"
|
||||
else
|
||||
EXTRA_INC=""
|
||||
fi;
|
||||
LIBTOOLIZE="libtoolize --force --copy --automake"
|
||||
if [ `uname` = Darwin ]; then
|
||||
echo "Using Mac OS X Makefile."
|
||||
mv -n src/Makefile.am src/Makefile.orig.am
|
||||
cp src/Makefile.mac.am src/Makefile.am
|
||||
# don't run libtoolize on Mac
|
||||
LIBTOOLIZE="echo -n ' '"
|
||||
fi;
|
||||
|
||||
echo "Running aclocal..." && aclocal $EXTRA_INC \
|
||||
&& echo "Running libtoolize..." && $LIBTOOLIZE \
|
||||
&& $LIBTOOLIZE_MSG && $LIBTOOLIZE \
|
||||
&& echo "Running automake..." && automake --add-missing --copy --foreign \
|
||||
&& echo "Running autoconf..." && autoconf
|
||||
|
||||
echo ""
|
||||
echo "You are now ready to run \"./configure\"."
|
||||
echo "You are now ready to run \"./configure\"$CONFOPTS."
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
AC_PREREQ(2.59)
|
||||
# change the HIP version here
|
||||
AC_INIT(OpenHIP, 0.6, [openhip-developers@lists.sourceforge.net], openhip)
|
||||
AC_INIT(OpenHIP, 0.7, [openhip-developers@lists.sourceforge.net], openhip)
|
||||
AC_CONFIG_SRCDIR([src/protocol/hip_main.c])
|
||||
AC_CONFIG_AUX_DIR(config)
|
||||
AC_CONFIG_MACRO_DIR(config)
|
||||
|
|
@ -44,8 +44,8 @@ AC_PROG_CXX
|
|||
AC_PROG_AWK
|
||||
AC_PROG_CC
|
||||
AC_PROG_CPP
|
||||
AC_PROG_LIBTOOL
|
||||
AM_PROG_CC_C_O
|
||||
#AC_PROG_LIBTOOL
|
||||
|
||||
# Checks for libraries.
|
||||
AC_CHECK_LIB([crypto], [AES_cbc_encrypt])
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
#
|
||||
#
|
||||
# Host Identity Protocol
|
||||
# Copyright (c) 2006 the Boeing Comapny
|
||||
#
|
||||
# This program 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.
|
||||
#
|
||||
# This program 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.
|
||||
#
|
||||
# utils/Makefile.am
|
||||
#
|
||||
# Author: Jeff Ahrenholz <jeffrey.m.ahrenholz@boeing.com>
|
||||
#
|
||||
# This Makefile builds one of three possible configuration libraries,
|
||||
# controlled by the ./configure --enable-sma-crawler={file,LDAP,IFMAP} option
|
||||
#
|
||||
|
||||
if WANT_SMA_CRAWLER_FILES_CFG
|
||||
lib_LTLIBRARIES = libhipcfgfiles.la
|
||||
SRC_HIPCFGLDAP = cfg-common/hip_cfg.cpp cfg-files/hip_cfg_files.cpp
|
||||
libhipcfgfiles_la_CPPFLAGS = -DSMA_CRAWLER -Wall -Woverloaded-virtual -Wcast-qual
|
||||
libhipcfgfiles_la_LDFLAGS = -version_info $(VERSION) -release $(VERSION)
|
||||
libhipcfgfiles_la_SOURCES = $(SRC_HIPCFGLDAP)
|
||||
endif
|
||||
|
||||
if WANT_SMA_CRAWLER_LDAP_CFG
|
||||
lib_LTLIBRARIES = libhipcfgldap.la
|
||||
SRC_HIPCFGLDAP = cfg-common/hip_cfg.cpp cfg-ldap/hip_cfg_ldap.cpp
|
||||
libhipcfgldap_la_CPPFLAGS = -DSMA_CRAWLER -Wall -Woverloaded-virtual -Wcast-qual
|
||||
libhipcfgldap_la_LDFLAGS = -version_info $(VERSION) -release $(VERSION)
|
||||
libhipcfgldap_la_SOURCES = $(SRC_HIPCFGLDAP)
|
||||
endif
|
||||
|
||||
if WANT_SMA_CRAWLER_IFMAP_CFG
|
||||
# TODO
|
||||
endif
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/src/include @libxml2_CFLAGS@
|
||||
LDADD = @libxml2_LIBS@
|
||||
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
#
|
||||
#
|
||||
# Host Identity Protocol
|
||||
# Copyright (c) 2006 the Boeing Comapny
|
||||
#
|
||||
# This program 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.
|
||||
#
|
||||
# This program 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.
|
||||
#
|
||||
# utils/Makefile.am
|
||||
#
|
||||
# Author: Jeff Ahrenholz <jeffrey.m.ahrenholz@boeing.com>
|
||||
#
|
||||
# This Makefile builds one of three possible configuration libraries,
|
||||
# controlled by the ./configure --enable-sma-crawler={file,LDAP,IFMAP} option
|
||||
#
|
||||
|
||||
if WANT_SMA_CRAWLER_FILES_CFG
|
||||
lib_LTLIBRARIES = libhipcfgfiles.la
|
||||
SRC_HIPCFGLDAP = cfg-common/hip_cfg.cpp cfg-files/hip_cfg_files.cpp
|
||||
libhipcfgfiles_la_CPPFLAGS = -DSMA_CRAWLER -Wall -Woverloaded-virtual -Wcast-qual
|
||||
libhipcfgfiles_la_LDFLAGS = -version_info $(VERSION) -release $(VERSION)
|
||||
libhipcfgfiles_la_SOURCES = $(SRC_HIPCFGLDAP)
|
||||
endif
|
||||
|
||||
if WANT_SMA_CRAWLER_LDAP_CFG
|
||||
lib_LTLIBRARIES = libhipcfgldap.la
|
||||
SRC_HIPCFGLDAP = cfg-common/hip_cfg.cpp cfg-ldap/hip_cfg_ldap.cpp
|
||||
libhipcfgldap_la_CPPFLAGS = -DSMA_CRAWLER -Wall -Woverloaded-virtual -Wcast-qual
|
||||
libhipcfgldap_la_LDFLAGS = -version_info $(VERSION) -release $(VERSION)
|
||||
libhipcfgldap_la_SOURCES = $(SRC_HIPCFGLDAP)
|
||||
endif
|
||||
|
||||
if WANT_SMA_CRAWLER_IFMAP_CFG
|
||||
# TODO
|
||||
endif
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/src/include @libxml2_CFLAGS@
|
||||
LDADD = @libxml2_LIBS@
|
||||
|
||||
Loading…
Reference in New Issue