Mercurial > otakunoraifu

comparison configure.ac @ 64:045ca45f9610

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove --displaysize, as it was not used.
author Thibaut GIRKA <thib@sitedethib.com>
date Sun, 07 Feb 2010 11:33:23 +0100
parents 6581f7eccd26
children 419761c8d9b9
comparison
equal deleted inserted replaced
63:4b9ffe15a87d 64:045ca45f9610
131 131
132 dnl >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 132 dnl >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
133 dnl 133 dnl
134 dnl Check option ... Zaurus or embed machines 134 dnl Check option ... Zaurus or embed machines
135 USE_X11=1 135 USE_X11=1
136 DISPSIZE="no"
137 136
138 AC_ARG_ENABLE(nwatowav, 137 AC_ARG_ENABLE(nwatowav,
139 AS_HELP_STRING([--enable-nwatowav], [Build the nwatowav utility (default no)])) 138 AS_HELP_STRING([--enable-nwatowav], [Build the nwatowav utility (default no)]))
140 if test X$enable_nwatowav = X"yes"; then 139 if test X$enable_nwatowav = X"yes"; then
141 AC_SUBST(NWATOWAV, ['nwatowav${EXEEXT}']) 140 AC_SUBST(NWATOWAV, ['nwatowav${EXEEXT}'])
149 148
150 AC_ARG_ENABLE(zaurus, 149 AC_ARG_ENABLE(zaurus,
151 AS_HELP_STRING([--enable-zaurus], [Compile for zaurus environment (default no)])) 150 AS_HELP_STRING([--enable-zaurus], [Compile for zaurus environment (default no)]))
152 if test X$enable_zaurus = X"yes"; then 151 if test X$enable_zaurus = X"yes"; then
153 USE_X11=0 152 USE_X11=0
154 DISPSIZE="320x240"
155 fi 153 fi
156 154
157 AC_ARG_WITH(x11, 155 AC_ARG_WITH(x11,
158 AS_HELP_STRING([--without-x11], [Use the X11 library (default yes)])) 156 AS_HELP_STRING([--without-x11], [Use the X11 library (default yes)]))
159 if test X$with_x11 = X"no"; then 157 if test X$with_x11 = X"no"; then
160 USE_X11=0 158 USE_X11=0
161 else 159 else
162 AC_PATH_X 160 AC_PATH_X
163 AC_PATH_XTRA 161 AC_PATH_XTRA
164 X_LIBS="$X_LIBS -lX11 -lXext -L/usr/X11R6/lib" 162 X_LIBS="$X_LIBS -lX11 -lXext"
165 LIBS="$LIBS $X_LIBS" 163 LIBS="$LIBS $X_LIBS"
166 fi 164 fi
167 165
168 AC_ARG_ENABLE(displaysize,
169 AS_HELP_STRING([--enable-displaysize=SIZE],
170 [Change default display size, for example --enable-displaysize=320x240]),
171 displaysize=$enableval)
172 if test X$displaysize != X; then
173 DISPSIZE=$displaysize
174 fi
175
176 AC_DEFINE_UNQUOTED(USE_X11,$USE_X11, [X11 library is used]) 166 AC_DEFINE_UNQUOTED(USE_X11,$USE_X11, [X11 library is used])
177 AC_DEFINE_UNQUOTED(DISPSIZE, "$DISPSIZE", [default display size])
178 167
179 AC_OUTPUT(Makefile system/Makefile font/Makefile window/Makefile music2/Makefile scn2k/Makefile) 168 AC_OUTPUT(Makefile system/Makefile font/Makefile window/Makefile music2/Makefile scn2k/Makefile)