configure: Rename the --with-libgsm option to follow the normal option naming scheme.
This commit is contained in:
parent
7e2dfe4f74
commit
6ce32e0df2
|
@ -783,7 +783,7 @@ with_freetype
|
||||||
with_gphoto
|
with_gphoto
|
||||||
with_glu
|
with_glu
|
||||||
with_gnutls
|
with_gnutls
|
||||||
with_libgsm
|
with_gsm
|
||||||
with_hal
|
with_hal
|
||||||
with_jack
|
with_jack
|
||||||
with_jpeg
|
with_jpeg
|
||||||
|
@ -1464,7 +1464,7 @@ Optional Packages:
|
||||||
--without-gphoto do not use gphoto (Digital Camera support)
|
--without-gphoto do not use gphoto (Digital Camera support)
|
||||||
--without-glu do not use the GLU library
|
--without-glu do not use the GLU library
|
||||||
--without-gnutls do not use GnuTLS (schannel support)
|
--without-gnutls do not use GnuTLS (schannel support)
|
||||||
--without-libgsm do not use libgsm (GSM 06.10 codec support)
|
--without-gsm do not use libgsm (GSM 06.10 codec support)
|
||||||
--without-hal do not use HAL (dynamic device support)
|
--without-hal do not use HAL (dynamic device support)
|
||||||
--without-jack do not use the Jack sound support
|
--without-jack do not use the Jack sound support
|
||||||
--without-jpeg do not use JPEG
|
--without-jpeg do not use JPEG
|
||||||
|
@ -2569,9 +2569,9 @@ if test "${with_gnutls+set}" = set; then :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Check whether --with-libgsm was given.
|
# Check whether --with-gsm was given.
|
||||||
if test "${with_libgsm+set}" = set; then :
|
if test "${with_gsm+set}" = set; then :
|
||||||
withval=$with_libgsm; if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi
|
withval=$with_gsm; if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -10850,11 +10850,11 @@ _ACEOF
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test "x$ac_cv_lib_soname_gsm" = "x"; then :
|
if test "x$ac_cv_lib_soname_gsm" = "x"; then :
|
||||||
case "x$with_libgsm" in
|
case "x$with_gsm" in
|
||||||
x) wine_notices="$wine_notices|libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported." ;;
|
x) wine_notices="$wine_notices|libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported." ;;
|
||||||
xno) ;;
|
xno) ;;
|
||||||
*) as_fn_error "libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.
|
*) as_fn_error "libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.
|
||||||
This is an error since --with-libgsm was requested." "$LINENO" 5 ;;
|
This is an error since --with-gsm was requested." "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ AC_ARG_WITH(gphoto, AS_HELP_STRING([--without-gphoto],[do not use gphoto (Dig
|
||||||
AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU library]),
|
AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU library]),
|
||||||
[if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi])
|
[if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi])
|
||||||
AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)]))
|
AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)]))
|
||||||
AC_ARG_WITH(libgsm, AS_HELP_STRING([--without-libgsm],[do not use libgsm (GSM 06.10 codec support)]),
|
AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06.10 codec support)]),
|
||||||
[if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi])
|
[if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi])
|
||||||
AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
|
AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
|
||||||
AC_ARG_WITH(jack, AS_HELP_STRING([--without-jack],[do not use the Jack sound support]),
|
AC_ARG_WITH(jack, AS_HELP_STRING([--without-jack],[do not use the Jack sound support]),
|
||||||
|
@ -1370,7 +1370,7 @@ if test "$ac_cv_header_gsm_h" = "yes" -o "$ac_cv_header_gsm_gsm_h" = "yes"
|
||||||
then
|
then
|
||||||
WINE_CHECK_SONAME(gsm,gsm_create)
|
WINE_CHECK_SONAME(gsm,gsm_create)
|
||||||
fi
|
fi
|
||||||
WINE_NOTICE_WITH(libgsm,[test "x$ac_cv_lib_soname_gsm" = "x"],
|
WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"],
|
||||||
[libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.])
|
[libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.])
|
||||||
|
|
||||||
dnl **** Check for libjpeg ****
|
dnl **** Check for libjpeg ****
|
||||||
|
|
Loading…
Reference in New Issue