* Proper definition of PLUGINS_DIR

* Allow to specify location of the popt library
Initial
Stephane Bortzmeyer 20 years ago
parent 6da28180c1
commit 328fbfb9ea

766
SRC/configure vendored

File diff suppressed because it is too large Load Diff

@ -101,7 +101,19 @@ AC_ARG_WITH(gnutls,
fi], fi],
dnl Default: disable it dnl Default: disable it
) )
AC_ARG_WITH(popt,
[--with-popt[=DIR] popt command-line parsing library],dnl
[if test "$withval" != "no"; then
if test "$withval" != "yes"; then
POPTROOT=$withval
LDFLAGS="${LDFLAGS} -L$POPTROOT/lib"
CPPFLAGS="${CPPFLAGS} -I$POPTROOT/include"
fi
else
AC_MSG_ERROR([The popt command-line parsing library is mandatory for echoping])
fi],
dnl Default: disable it
)
dnl See T/TCP later dnl See T/TCP later
dnl Checks for programs. dnl Checks for programs.
@ -260,7 +272,7 @@ fi
interpolate() { interpolate() {
old=$1 old=$1
eval new=$old eval new=$old
AC_MSG_WARN(DEBUG-INTERPOL $new) AC_MSG_WARN(DEBUG-INTERPOLATE $new)
if test "$new" != "$old" ; then if test "$new" != "$old" ; then
interpolate $new interpolate $new
else else
@ -270,7 +282,7 @@ interpolate() {
dnl TODO: the following is broken because installation prefix can be changed at instal-time, dnl TODO: the following is broken because installation prefix can be changed at instal-time,
dnl not compilation time. dnl not compilation time.
plugins_dir=`interpolate '$prefix/lib/echoping'` plugins_dir=`interpolate '$prefix/lib/echoping'`
AC_DEFINE(PLUGINS_DIR, $plugins_dir, [Directory where the plugins will be installed]) AC_DEFINE_UNQUOTED(PLUGINS_DIR, "$plugins_dir", [Directory where the plugins will be installed])
AC_CONFIG_SUBDIRS(plugins) AC_CONFIG_SUBDIRS(plugins)
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)

Loading…
Cancel
Save