mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix some inconsistent formatting in configure.in

Browse source 
Originally committed to SVN as r6074.
This commit is contained in:
Thomas Goyne 2011-12-22 21:21:03 +00:00
parent 810ca07041
commit 848f123a98
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
aegisub/configure.in
View file

@ -1,7 +1,7 @@
AC_PREREQ(2.57) AC_PREREQ(2.57)
###################### ######################
# aegisub version info # aegisub version info
###################### ######################
# MAKE SURE YOU UPDATE THE VERSION INFO BELOW WHEN YOU SET THIS TO '1' # MAKE SURE YOU UPDATE THE VERSION INFO BELOW WHEN YOU SET THIS TO '1'
m4_define([aegisub_FINAL_RELEASE], [0]) m4_define([aegisub_FINAL_RELEASE], [0])
@ -68,8 +68,8 @@ case "$target_or_host" in
*-*-*bsd*) *-*-*bsd*)
build_bsd="yes" build_bsd="yes"
ICONV_CFLAGS="-I/usr/local/include" ICONV_CFLAGS="-I/usr/local/include"
ICONV_LDFLAGS="-L/usr/local/lib -liconv" ICONV_LDFLAGS="-L/usr/local/lib -liconv"
;; ;;
*) *)
@ -117,10 +117,10 @@ AC_SUBST(build_default)
# Handle endianess. # Handle endianess.
AC_C_BIGENDIAN( AC_C_BIGENDIAN(
AC_DEFINE([HAVE_BIG_ENDIAN], [1], [Big Endian]), AC_DEFINE([HAVE_BIG_ENDIAN], [1], [Big Endian]),
AC_DEFINE([HAVE_LITTLE_ENDIAN], [1], [Little Endian]), AC_DEFINE([HAVE_LITTLE_ENDIAN], [1], [Little Endian]),
AC_DEFINE([HAVE_DYNAMIC_ENDIAN], [1], [Unknown endian]), AC_DEFINE([HAVE_DYNAMIC_ENDIAN], [1], [Unknown endian]),
AC_DEFINE([HAVE_UNIVERSAL_ENDIAN], [1], [Universal Endian (MAC Universal PPC/Intel Binaries, uses HAVE_DYNAMIC_ENDIAN)]) AC_DEFINE([HAVE_UNIVERSAL_ENDIAN], [1], [Universal Endian (MAC Universal PPC/Intel Binaries, uses HAVE_DYNAMIC_ENDIAN)])
) )
@ -173,7 +173,7 @@ AC_SUBST(P_ICON)
# If a user doesn't supply --prefix then it is set to NONE so we # If a user doesn't supply --prefix then it is set to NONE so we
# set it to $ac_default_prefix if it hasn't been supplied. # set it to $ac_default_prefix if it hasn't been supplied.
if test "$prefix" = "NONE"; then if test "$prefix" = "NONE"; then
prefix="$ac_default_prefix" prefix="$ac_default_prefix"
fi fi
# Install prefix used by wxStandardPaths::SetInstallPrefix. # Install prefix used by wxStandardPaths::SetInstallPrefix.
@ -262,8 +262,6 @@ AC_SUBST(BUNDLE_STRING)
AC_SUBST(DMG_STRING) AC_SUBST(DMG_STRING)
################################################### ###################################################
# Check for pthreads and setup variables / compiler # Check for pthreads and setup variables / compiler
################################################### ###################################################
@ -314,16 +312,6 @@ if test "$enable_compiler_flags" != "no"; then
AC_CXX_FLAG([$opt_flag]) AC_CXX_FLAG([$opt_flag])
fi fi
##########################
# Check for X include/lib.
##########################
AC_PATH_XTRA
if test "$no_x" = "yes" && test "$build_darwin" != "yes"; then
AC_MSG_FAILURE([You must have a working copy of X installed.])
fi
###################################### ######################################
# Check Headers / Features / Libraries # Check Headers / Features / Libraries
###################################### ######################################
@ -351,6 +339,14 @@ AC_CHECK_SIZEOF([time_t])
############################## ##############################
# Program Support and Features # Program Support and Features
############################## ##############################
##########################
# X
##########################
AC_PATH_XTRA
if test "$no_x" = "yes" && test "$build_darwin" != "yes"; then
AC_MSG_FAILURE([You must have a working copy of X installed.])
fi
######### #########
## OpenGL ## OpenGL
######### #########
@ -425,7 +421,7 @@ AC_SUBST(ICONV_LDFLAGS)
AC_SUBST(ICONV_CFLAGS) AC_SUBST(ICONV_CFLAGS)
if test "$agi_cv_with_iconv" = "no" ; then if test "$agi_cv_with_iconv" = "no" ; then
AC_MSG_FAILURE([Please install a working iconv library.]) AC_MSG_FAILURE([Please install a working iconv library.])
fi fi
if test "$agi_cv_with_iconv" = "yes"; then if test "$agi_cv_with_iconv" = "yes"; then
@ -941,7 +937,7 @@ AC_ARG_WITH(player-audio,
# Default audio player. # Default audio player.
if ! test -z "$with_player_audio"; then if ! test -z "$with_player_audio"; then
default_player_audio="$with_player_audio" default_player_audio="$with_player_audio"
else else
if test "$build_linux" = "yes" && test "$with_alsa" = "yes"; then if test "$build_linux" = "yes" && test "$with_alsa" = "yes"; then
default_player_audio="alsa" default_player_audio="alsa"