- Updated lash-configure-template to use pkgconfig
- Removed autogen.sh from distribution tarballs git-svn-id: svn://svn.savannah.nongnu.org/lash/trunk@34 1de19dc7-4e3f-0410-a61d-eddf686bf0b7
This commit is contained in:
parent
8b3098d96d
commit
9302fd07c4
|
@ -3,7 +3,7 @@ SUBDIRS = m4 docs lash liblash lashd clients icons
|
|||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = lash-1.0.pc
|
||||
|
||||
EXTRA_DIST = autogen.sh common.am README.SECURITY \
|
||||
EXTRA_DIST = common.am README.SECURITY \
|
||||
lash-configure-template ChangeLog.old
|
||||
|
||||
buildcheck:
|
||||
|
|
|
@ -1,34 +1,22 @@
|
|||
# This is template code you can put in your configure.ac to check
|
||||
# for LASH support
|
||||
|
||||
##############
|
||||
### LASH ###
|
||||
##############
|
||||
CHANGEME_enable_lash="yes"
|
||||
build_lash="yes"
|
||||
AC_ARG_ENABLE(lash,
|
||||
[ --disable-lash disable LASH support],[
|
||||
case "$enableval" in
|
||||
"yes")
|
||||
;;
|
||||
"no")
|
||||
CHANGEME_enable_lash="no"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([must use --enable-lash(=yes/no) or --disable-lash])
|
||||
;;
|
||||
esac
|
||||
])
|
||||
|
||||
if test "$CHANGEME_enable_lash" = "yes"; then
|
||||
PKG_CHECK_MODULES(LASH, lash-1.0 >= 0.5.0, LASH_FOUND="yes", LASH_FOUND="no")
|
||||
|
||||
if test "$LASH_FOUND" = "yes"; then
|
||||
AC_DEFINE(HAVE_LASH, 1, [whether or not we are supporting lash])
|
||||
LASH_VERSION=$( pkg-config --modversion lash-1.0 )
|
||||
AC_DEFINE_UNQUOTED(LASH_VERSION, "$LASH_VERSION", [The version of lash we're compiling against])
|
||||
AC_SUBST(LASH_CFLAGS)
|
||||
AC_SUBST(LASH_LIBS)
|
||||
fi
|
||||
else
|
||||
AC_MSG_WARN([LASH support is disabled])
|
||||
LASH_FOUND="no"
|
||||
[AS_HELP_STRING(--enable-lash, [Enable LASH session management support (true)])],
|
||||
[ if test x$enable_lash = xno ; then build_lash=no ; fi ])
|
||||
if test "$build_lash" = "yes"; then
|
||||
PKG_CHECK_MODULES(LASH, lash-1.0 >= 0.5.0, build_lash="yes", build_lash="no")
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_LASH, test "$LASH_FOUND" = "yes")
|
||||
if test "$build_lash" = "yes"; then
|
||||
AC_DEFINE(HAVE_LASH, 1, [Has lash.h])
|
||||
AC_SUBST(LASH_CFLAGS)
|
||||
AC_SUBST(LASH_LIBS)
|
||||
else
|
||||
AC_MSG_WARN([LASH not found, session support will not be built.])
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_LASH, [test "$build_lash" = "yes"])
|
||||
|
||||
|
|
Loading…
Reference in New Issue