Selaa lähdekoodia

* configure.ac:

+ Set the executable bit of caca-config when regenerating that file.
  * caca-config.in:
    + No longer use USE_SLANG_TRUE and USE_NCURSES_TRUE since we now
      have @CACA_LIBS@.
tags/v0.99.beta14
Sam Hocevar sam 22 vuotta sitten
vanhempi
commit
b8aecc76cd
2 muutettua tiedostoa jossa 5 lisäystä ja 10 poistoa
  1. +2
    -6
      caca-config.in
  2. +3
    -4
      configure.ac

+ 2
- 6
caca-config.in Näytä tiedosto

@@ -9,10 +9,6 @@ exec_prefix=@exec_prefix@
lib_dir=@libdir@ lib_dir=@libdir@
include_dir=@includedir@ include_dir=@includedir@


@USE_SLANG_TRUE@libs_slang="-lslang"
@USE_NCURSES_TRUE@libs_ncurses="-lncurses"
libs="$libs_slang $libs_ncurses"

usage() usage()
{ {
cat <<EOF cat <<EOF
@@ -113,11 +109,11 @@ fi


if test "$echo_libs" = "yes" if test "$echo_libs" = "yes"
then then
echo -L@libdir@ -lcaca $libs
echo -L@libdir@ -lcaca @CACA_LIBS@
fi fi


@NEED_PIC_TRUE@if test "$echo_plugin_libs" = "yes" @NEED_PIC_TRUE@if test "$echo_plugin_libs" = "yes"
@NEED_PIC_TRUE@then @NEED_PIC_TRUE@then
@NEED_PIC_TRUE@ echo -L@libdir@ -lcaca_pic $libs
@NEED_PIC_TRUE@ echo -L@libdir@ -lcaca_pic @CACA_LIBS@
@NEED_PIC_TRUE@fi @NEED_PIC_TRUE@fi



+ 3
- 4
configure.ac Näytä tiedosto

@@ -91,15 +91,14 @@ else
fi fi
AM_CONDITIONAL(LATEX, test "${LATEX}" != "no") AM_CONDITIONAL(LATEX, test "${LATEX}" != "no")


AC_OUTPUT([
AC_CONFIG_FILES([
Makefile Makefile
src/Makefile src/Makefile
examples/Makefile examples/Makefile
doc/Makefile doc/Makefile
autotools/Makefile autotools/Makefile
debian/Makefile debian/Makefile
caca-config
],[
chmod 0755 caca-config
]) ])
AC_CONFIG_FILES([caca-config], [chmod 0755 caca-config])
AC_OUTPUT



Ladataan…
Peruuta
Tallenna