From c1fd25bce8ef919433aaa26b8767bb79e5cfcf48 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 25 Apr 2005 14:32:22 +0000 Subject: sorry, I did not want to commit that CVS patchset: 7494 CVS date: 2005/04/25 14:32:22 --- configure.ac | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index e2de85710..841a10efd 100644 --- a/configure.ac +++ b/configure.ac @@ -126,7 +126,6 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_AWK AC_C_INLINE -AC_CHECK_TOOL(LDD_R, ldd -r, :) dnl --------------------------------------------- @@ -419,12 +418,12 @@ AC_ARG_ENABLE(ipv6, enable_ipv6=$enableval, enable_ipv6=no) -echo -n "*** IPv6 is " +echo -n "IPv6 is " if test x$enable_ipv6 = xyes; then CFLAGS="-DENABLE_IPV6 $CFLAGS" - echo "enabled ***" + echo "enabled" else - echo "disabled ***" + echo "disabled" fi @@ -720,7 +719,6 @@ fi AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes") - dnl --------------------------------------------- dnl Checks for Color AsCii Art library dnl --------------------------------------------- @@ -2064,7 +2062,7 @@ if test x"$SYS" = "xmingw32" -o x"$SYS" = "xcygwin"; then AC_DEFINE(XINE_FONTDIR,[exec_path_append_subdir("fonts")],[Define this to osd fonts dir location]) AC_DEFINE(XINE_LOCALEDIR,[exec_path_append_subdir("locale")],[Path where catalog files will be.]) dnl prefix in xine-config - XINE_PREFIX="\`dirname \$0\`/.." + XINE_CONFIG_PREFIX="\`dirname \$0\`/.." else dnl installation directories XINE_PLUGINDIR="$libdir/xine/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB" @@ -2079,9 +2077,9 @@ else AC_DEFINE_UNQUOTED(XINE_FONTDIR,"$XINE_FONTPATH",[Define this to osd fonts dir location]) AC_DEFINE_UNQUOTED(XINE_LOCALEDIR, "$XINE_LOCALEPATH",[Path where catalog files will be.]) dnl prefix in xine-config - XINE_PREFIX="${prefix}" + XINE_CONFIG_PREFIX="${prefix}" fi -AC_SUBST(XINE_PREFIX) +AC_SUBST(XINE_CONFIG_PREFIX) AC_SUBST(XINE_PLUGINPATH) AC_SUBST(XINE_FONTPATH) AC_SUBST(XINE_LOCALEPATH) -- cgit v1.2.3