comparison configure.ac @ 25:2110e0cf64ac

* clean littles things in configure.ac * added --with-visarc and --with-nwatowav
author thib
date Fri, 27 Feb 2009 19:13:00 +0000
parents 759202cf1756
children f45da03ca631
comparison
equal deleted inserted replaced
24:c9e218c2c3f1 25:2110e0cf64ac
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_ENABLE(tremor, 81 AC_ARG_WITH(vorbis,
82 [ --enable-tremor enable tremor (integer-only implementation for vorbisfile) [ default no]]) 82 AS_HELP_STRING([--disable-vorbis], [Build with vorbis and ogg (default yes)]))
83 AC_CHECK_LIB(ogg, ogg_stream_init) 83 if test X$with_vorbis = X"yes"; then
84 AC_CHECK_LIB(vorbis, vorbis_book_decode,,,-logg) 84 AC_ARG_ENABLE(tremor, AS_HELP_STRING([--enable-tremor],
85 if test X$enable_tremor = X"yes"; then 85 [enable tremor (integer-only implementation of vorbisfile) (default no)]))
86 AC_CHECK_LIB(vorbisidec, ov_read,,,-logg -lvorbis) 86 AC_CHECK_LIB(ogg, ogg_stream_init)
87 else 87 AC_CHECK_LIB(vorbis, vorbis_book_decode,,,-logg)
88 AC_CHECK_LIB(vorbisfile, ov_read,,,-logg -lvorbis) 88 if test X$enable_tremor = X"yes"; then
89 AC_CHECK_LIB(vorbisidec, ov_read,,,-logg -lvorbis)
90 else
91 AC_CHECK_LIB(vorbisfile, ov_read,,,-logg -lvorbis)
92 fi
89 fi 93 fi
90 94
91 dnl SDL config 95 dnl SDL config
92 AM_PATH_SDL() 96 AM_PATH_SDL()
93 AC_SUBST(SDL_CFLAGS) 97 AC_SUBST(SDL_CFLAGS)
120 dnl 124 dnl
121 dnl Check option ... Zaurus or embed machines 125 dnl Check option ... Zaurus or embed machines
122 USE_X11=1 126 USE_X11=1
123 DISPSIZE="no" 127 DISPSIZE="no"
124 128
129 AC_ARG_ENABLE(nwatowav,
130 AS_HELP_STRING([--enable-nwatowav], [Build the nwatowav utility (default no)]))
131 if test X$enable_nwatowav = X"yes"; then
132 AC_SUBST(NWATOWAV, ['nwatowav${EXEEXT}'])
133 fi
134
135 AC_ARG_ENABLE(visarc,
136 AS_HELP_STRING([--enable-visarc], [Build the visarc utility (default no)]))
137 if test X$enable_visarc = X"yes"; then
138 AC_SUBST(VISARC, ['visarc${EXEEXT}'])
139 fi
140
125 AC_ARG_ENABLE(zaurus, 141 AC_ARG_ENABLE(zaurus,
126 [ --enable-zaurus compile for zaurus environment [ default no]]) 142 AS_HELP_STRING([--enable-zaurus], [Compile for zaurus environment (default no)]))
127 if test X$enable_zaurus = X"yes"; then 143 if test X$enable_zaurus = X"yes"; then
128 USE_X11=0 144 USE_X11=0
129 DISPSIZE="320x240" 145 DISPSIZE="320x240"
130 fi 146 fi
131 147
132 AC_ARG_ENABLE(x11, 148 AC_ARG_ENABLE(x11,
133 [ --disable-x11 turn off using X11 library [default enable]]) 149 AS_HELP_STRING([--disable-x11], [Use the X11 library (default yes)]))
134 if test X$x11 = X"no"; then 150 if test X$x11 = X"no"; then
135 USE_X11=0 151 USE_X11=0
136 else 152 else
137 AC_PATH_X 153 AC_PATH_X
138 AC_PATH_XTRA 154 AC_PATH_XTRA
139 X_LIBS="$X_LIBS -lX11 -lXext -L/usr/X11R6/lib" 155 X_LIBS="$X_LIBS -lX11 -lXext -L/usr/X11R6/lib"
140 LIBS="$LIBS $X_LIBS" 156 LIBS="$LIBS $X_LIBS"
141 fi 157 fi
142 158
143 AC_ARG_ENABLE(displaysize, 159 AC_ARG_ENABLE(displaysize,
144 [ --enable-displaysize=SIZE change default display size, for example --enable-displaysize=320x240], 160 AS_HELP_STRING([--enable-displaysize=SIZE],
161 [Change default display size, for example --enable-displaysize=320x240]),
145 displaysize=$enableval) 162 displaysize=$enableval)
146 if test X$displaysize != X; then 163 if test X$displaysize != X; then
147 DISPSIZE=$displaysize 164 DISPSIZE=$displaysize
148 fi 165 fi
149 166