Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 13:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

configure xsel in configure phase

Browse source 
... and with the same arguments of fish
This commit is contained in:
Grissiom 2010-09-18 14:31:18 +08:00
parent 3aa107c4ae
commit c08bae6aeb
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile.in
View file

@ -349,13 +349,7 @@ test: $(PROGRAMS) fish_tests
# Build the xsel program, which is maintained in its own tarball # Build the xsel program, which is maintained in its own tarball
# #
${XSEL}: ${XSEL_BIN}:
tar -xf ${XSEL}.tar.gz
${XSEL}/Makefile: ${XSEL}
cd ${XSEL} && ./configure
${XSEL_BIN}: ${XSEL}/Makefile
$(MAKE) -C ${XSEL} || echo "Failed to build xsel - either add the required dependencies or use './configure --without-xsel' to disable it." $(MAKE) -C ${XSEL} || echo "Failed to build xsel - either add the required dependencies or use './configure --without-xsel' to disable it."

14
configure.ac
View file

@ -11,6 +11,11 @@
AC_INIT(fish,1.23.1,fish-users@lists.sf.net) AC_INIT(fish,1.23.1,fish-users@lists.sf.net)
#
# preserve configure arguments for xsel
#
conf_arg=$@
# #
# List of output variables produced by this configure script # List of output variables produced by this configure script
@ -200,7 +205,8 @@ AC_ARG_WITH(
xsel, xsel,
AC_HELP_STRING( AC_HELP_STRING(
[--without-xsel], [--without-xsel],
[do not build the xsel program needed for X clipboard integration] [do not build the xsel program needed for X clipboard integration.
If build xsel, it will be configured with the same options as fish.]
), ),
[xsel=$withval], [xsel=$withval],
[xsel=with_xsel] [xsel=with_xsel]
@ -977,6 +983,12 @@ if test ! x$local_found_posix_switch = xyes; then
echo "Some fish features may be disabled." echo "Some fish features may be disabled."
fi fi
if [[ "$xsel" = "with_xsel" ]]; then
echo "Now configure xsel with $conf_arg"
rm -rf $XSEL
tar xf $XSEL.tar.gz
cd $XSEL && ./configure $conf_arg
fi
echo "fish is now configured." echo "fish is now configured."
echo "Use 'make' and 'make install' to build and install fish." echo "Use 'make' and 'make install' to build and install fish."