Mercurial > otakunoraifu

comparison configure.ac @ 49:6581f7eccd26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Correct --disable-x11 * Better use of --enable and --with. --enable is for optional features whereas --with is for the use of optional libraries
author thib
date Fri, 17 Apr 2009 08:12:18 +0000
parents a85cdca1980a
children 045ca45f9610
comparison
equal deleted inserted replaced
48:ed6c21dde840 49:6581f7eccd26
76 76
77 AC_CHECK_LIB(z, zlibVersion) 77 AC_CHECK_LIB(z, zlibVersion)
78 AC_CHECK_LIB(png, png_write_end) 78 AC_CHECK_LIB(png, png_write_end)
79 AC_CHECK_LIB(jpeg, jpeg_start_decompress) 79 AC_CHECK_LIB(jpeg, jpeg_start_decompress)
80 dnl ogg vobis 80 dnl ogg vobis
81 AC_ARG_WITH(vorbis, 81 AC_ARG_ENABLE(vorbis,
82 AS_HELP_STRING([--disable-vorbis], [Build with vorbis and ogg (default yes)])) 82 AS_HELP_STRING([--disable-vorbis], [Build with vorbis and ogg (default yes)]))
83 if test X$with_vorbis != X"no"; then 83 if test X$enable_vorbis != X"no"; then
84 AC_ARG_ENABLE(tremor, AS_HELP_STRING([--enable-tremor], 84 AC_ARG_WITH(tremor, AS_HELP_STRING([--with-tremor],
85 [enable tremor (integer-only implementation of vorbisfile) (default no)])) 85 [use the tremor (integer-only implementation of vorbisfile) library (default no)]))
86 AC_CHECK_LIB(ogg, ogg_stream_init) 86 AC_CHECK_LIB(ogg, ogg_stream_init)
87 AC_CHECK_LIB(vorbis, vorbis_book_decode,,,-logg) 87 AC_CHECK_LIB(vorbis, vorbis_book_decode,,,-logg)
88 if test X$enable_tremor = X"yes"; then 88 if test X$with_tremor = X"yes"; then
89 AC_CHECK_LIB(vorbisidec, ov_read,, 89 AC_CHECK_LIB(vorbisidec, ov_read,,
90 AC_MSG_ERROR(vorbisidec (tremor) not found),-logg -lvorbis) 90 AC_MSG_ERROR(vorbisidec (tremor) not found),-logg -lvorbis)
91 else 91 else
92 AC_CHECK_LIB(vorbisfile, ov_read,, 92 AC_CHECK_LIB(vorbisfile, ov_read,,
93 AC_MSG_ERROR(vorbisfile not found),-logg -lvorbis) 93 AC_MSG_ERROR(vorbisfile not found),-logg -lvorbis)
113 if test X"$SMPEG_LIBS" = X ; then 113 if test X"$SMPEG_LIBS" = X ; then
114 USE_SMPEG=0 114 USE_SMPEG=0
115 else 115 else
116 USE_SMPEG=1 116 USE_SMPEG=1
117 fi 117 fi
118 AC_ARG_ENABLE(mad, 118 AC_ARG_WITH(mad,
119 [ --disable-mad disable mad (integer-only implementation for mpeg decoding) [ default yes]]) 119 [ --without-mad use mad (integer-only implementation for mpeg decoding) [ default yes]])
120 if test X$enable_mad != X"no"; then 120 if test X$without_mad != X"no"; then
121 AC_CHECK_LIB(mad, mad_decoder_run) 121 AC_CHECK_LIB(mad, mad_decoder_run)
122 fi 122 fi
123 123
124 AC_DEFINE_UNQUOTED(USE_SMPEG,$USE_SMPEG, [smpeg library is used]) 124 AC_DEFINE_UNQUOTED(USE_SMPEG,$USE_SMPEG, [smpeg library is used])
125 125
152 if test X$enable_zaurus = X"yes"; then 152 if test X$enable_zaurus = X"yes"; then
153 USE_X11=0 153 USE_X11=0
154 DISPSIZE="320x240" 154 DISPSIZE="320x240"
155 fi 155 fi
156 156
157 AC_ARG_ENABLE(x11, 157 AC_ARG_WITH(x11,
158 AS_HELP_STRING([--disable-x11], [Use the X11 library (default yes)])) 158 AS_HELP_STRING([--without-x11], [Use the X11 library (default yes)]))
159 if test X$x11 = X"no"; then 159 if test X$with_x11 = X"no"; then
160 USE_X11=0 160 USE_X11=0
161 else 161 else
162 AC_PATH_X 162 AC_PATH_X
163 AC_PATH_XTRA 163 AC_PATH_XTRA
164 X_LIBS="$X_LIBS -lX11 -lXext -L/usr/X11R6/lib" 164 X_LIBS="$X_LIBS -lX11 -lXext -L/usr/X11R6/lib"