ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Only check for libgettextpo when explicitly requested. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-02-26 18:20:21 +09:00
parent 77c1b7e352
commit d5b3afe357
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -12416,7 +12416,7 @@ This is an error since --with-zlib was requested." "$LINENO" 5 ;;
esac esac
fi fi
if test "x$enable_tools" != xno if test "x$enable_tools" != xno -a "x$with_gettextpo" = xyes
then then
if test "$ac_cv_header_gettext_po_h" = "yes" if test "$ac_cv_header_gettext_po_h" = "yes"
then then
@ -12465,8 +12465,6 @@ $as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h
fi fi
fi fi
if test "x$with_gettextpo" = xyes
then
if test "x$GETTEXTPO_LIBS" = "x"; then : if test "x$GETTEXTPO_LIBS" = "x"; then :
case "x$with_gettextpo" in case "x$with_gettextpo" in
x) as_fn_append wine_notices "|GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt." ;; x) as_fn_append wine_notices "|GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt." ;;
@ -12483,7 +12481,6 @@ fi
This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; This is an error since --with-gettextpo was requested." "$LINENO" 5 ;;
esac esac
fi fi
fi
fi fi
if test "x$with_pulse" != "xno"; if test "x$with_pulse" != "xno";

5
configure.ac
View File

@ -1435,7 +1435,7 @@ fi
WINE_NOTICE_WITH(zlib,[test "x$Z_LIBS" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.]) WINE_NOTICE_WITH(zlib,[test "x$Z_LIBS" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.])
dnl **** Check for gettextpo **** dnl **** Check for gettextpo ****
if test "x$enable_tools" != xno if test "x$enable_tools" != xno -a "x$with_gettextpo" = xyes
then then
if test "$ac_cv_header_gettext_po_h" = "yes" if test "$ac_cv_header_gettext_po_h" = "yes"
then then
@ -1443,13 +1443,10 @@ then
[AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).]) [AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).])
AC_SUBST(GETTEXTPO_LIBS,"-lgettextpo")]) AC_SUBST(GETTEXTPO_LIBS,"-lgettextpo")])
fi fi
if test "x$with_gettextpo" = xyes
then
WINE_NOTICE_WITH(gettextpo,[test "x$GETTEXTPO_LIBS" = "x"], WINE_NOTICE_WITH(gettextpo,[test "x$GETTEXTPO_LIBS" = "x"],
[GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.])
WINE_NOTICE_WITH(gettextpo,[test "$srcdir" != .], WINE_NOTICE_WITH(gettextpo,[test "$srcdir" != .],
[Rebuilding po files is not supported for out of tree builds.]) [Rebuilding po files is not supported for out of tree builds.])
fi
fi fi
dnl **** Check for PulseAudio **** dnl **** Check for PulseAudio ****