aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-10-13 21:44:42 (GMT)
committerfluxgen <fluxgen>2002-10-13 21:44:42 (GMT)
commitdc6ed877f6233d953292ab27ed1734b0e2858337 (patch)
tree73b8cde8a55b102ef7f7efc05c09665772a2c02b
parent6ddf8995f743ff329a99dfc88c960c9ad6036f04 (diff)
downloadfluxbox-dc6ed877f6233d953292ab27ed1734b0e2858337.zip
fluxbox-dc6ed877f6233d953292ab27ed1734b0e2858337.tar.bz2
moved defines to config.h
-rw-r--r--configure.in58
1 files changed, 20 insertions, 38 deletions
diff --git a/configure.in b/configure.in
index c9e07ac..5c41b0e 100644
--- a/configure.in
+++ b/configure.in
@@ -87,24 +87,21 @@ CXXFLAGS="$CXXFLAGS $SHAPE"
87LIBS="$LIBS $Xext_lib" 87LIBS="$LIBS $Xext_lib"
88 88
89dnl Check for the Slit 89dnl Check for the Slit
90SLIT=""
91AC_MSG_CHECKING([whether to include the Slit]) 90AC_MSG_CHECKING([whether to include the Slit])
92AC_ARG_ENABLE( 91AC_ARG_ENABLE(
93 slit, [ --enable-slit include code for the Slit [default=yes]], 92 slit, [ --enable-slit include code for the Slit [default=yes]],
94 if test x$enableval = "xyes"; then 93 if test x$enableval = "xyes"; then
95 AC_MSG_RESULT([yes]) 94 AC_MSG_RESULT([yes])
96 SLIT="-DSLIT" 95 AC_DEFINE(SLIT, 1, " compile with slit")
97 else 96 else
98 AC_MSG_RESULT([no]) 97 AC_MSG_RESULT([no])
99 fi, 98 fi,
100 AC_MSG_RESULT([yes]) 99 AC_MSG_RESULT([yes])
101 SLIT="-DSLIT" 100 AC_DEFINE(SLIT, 1, " compile with slit")
102) 101)
103AC_SUBST(SLIT) 102
104CXXFLAGS="$CXXFLAGS $SLIT"
105 103
106dnl Check for the new WM Spec 104dnl Check for the new WM Spec
107NEWWMSPEC=""
108AC_MSG_CHECKING([whether to include the new WM Spec (DOES NOTHING)]) 105AC_MSG_CHECKING([whether to include the new WM Spec (DOES NOTHING)])
109AC_ARG_ENABLE( 106AC_ARG_ENABLE(
110 newspec, 107 newspec,
@@ -112,48 +109,42 @@ AC_ARG_ENABLE(
112 [default=no]], 109 [default=no]],
113 if test x$enableval = "xyes"; then 110 if test x$enableval = "xyes"; then
114 AC_MSG_RESULT([yes]) 111 AC_MSG_RESULT([yes])
115 NEWWMSPEC="-DNEWWMSPEC" 112 AC_DEFINE(NEWWMSPEC, 1, "Extended Window Manager Hints")
116 else 113 else
117 AC_MSG_RESULT([no]) 114 AC_MSG_RESULT([no])
118 fi, 115 fi,
119 AC_MSG_RESULT([no]) 116 AC_MSG_RESULT([no])
120) 117)
121AC_SUBST(NEWWMSPEC) 118
122CXXFLAGS="$CXXFLAGS $NEWWMSPEC"
123 119
124dnl Check for Interlacing 120dnl Check for Interlacing
125INTERLACE=""
126AC_MSG_CHECKING([whether to include interlacing image code]) 121AC_MSG_CHECKING([whether to include interlacing image code])
127AC_ARG_ENABLE( 122AC_ARG_ENABLE(
128 interlace, [ --enable-interlace include code for image interlacing [default=yes]], 123 interlace, [ --enable-interlace include code for image interlacing [default=yes]],
129 if test x$enableval = "xyes"; then 124 if test x$enableval = "xyes"; then
130 AC_MSG_RESULT([yes]) 125 AC_MSG_RESULT([yes])
131 INTERLACE="-DINTERLACE" 126 AC_DEFINE(INTERLACE, 1, "Interlaced rendering")
132 else 127 else
133 AC_MSG_RESULT([no]) 128 AC_MSG_RESULT([no])
134 fi, 129 fi,
135 AC_MSG_RESULT([yes]) 130 AC_MSG_RESULT([yes])
136 INTERLACE="-DINTERLACE" 131 AC_DEFINE(INTERLACE, 1, "Interlaced rendering")
137) 132)
138AC_SUBST(INTERLACE) 133
139CXXFLAGS="$CXXFLAGS $INTERLACE"
140 134
141dnl Check for ordered 8bpp dithering 135dnl Check for ordered 8bpp dithering
142ORDEREDPSEUDO=""
143AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code]) 136AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code])
144AC_ARG_ENABLE(ordered-pseudo, 137AC_ARG_ENABLE(ordered-pseudo,
145[ --enable-ordered-pseudo include code for ordered pseudocolor (8bpp) 138[ --enable-ordered-pseudo include code for ordered pseudocolor (8bpp)
146 dithering [default=no]], 139 dithering [default=no]],
147 if test x$enableval = "xyes"; then 140 if test x$enableval = "xyes"; then
148 AC_MSG_RESULT([yes]) 141 AC_MSG_RESULT([yes])
149 ORDEREDPSEUDO="-DORDEREDPSEUDO" 142 AC_DEFINE(ORDEREDPSEUDO, 1, "ordered dithering code")
150 else 143 else
151 AC_MSG_RESULT([no]) 144 AC_MSG_RESULT([no])
152 fi, 145 fi,
153 AC_MSG_RESULT([no]) 146 AC_MSG_RESULT([no])
154) 147)
155AC_SUBST(ORDEREDPSEUDO)
156CXXFLAGS="$CXXFLAGS $ORDEREDPSEUDO"
157 148
158dnl Check whether to include debugging code 149dnl Check whether to include debugging code
159DEBUG="" 150DEBUG=""
@@ -172,21 +163,18 @@ AC_SUBST(DEBUG)
172CXXFLAGS="$CXXFLAGS $DEBUG" 163CXXFLAGS="$CXXFLAGS $DEBUG"
173 164
174dnl Check whether to include natural language support (i18n) 165dnl Check whether to include natural language support (i18n)
175NLS=""
176AC_MSG_CHECKING([whether to include NLS support]) 166AC_MSG_CHECKING([whether to include NLS support])
177AC_ARG_ENABLE(nls, 167AC_ARG_ENABLE(nls,
178 [ --enable-nls include natural language support [default=yes]], 168 [ --enable-nls include natural language support [default=yes]],
179 if test x$enableval = "xyes"; then 169 if test x$enableval = "xyes"; then
180 AC_MSG_RESULT([yes]) 170 AC_MSG_RESULT([yes])
181 NLS="-DNLS" 171 AC_DEFINE(NLS, 1, "Natural language support")
182 else 172 else
183 AC_MSG_RESULT([no]) 173 AC_MSG_RESULT([no])
184 fi, 174 fi,
185 AC_MSG_RESULT([yes]) 175 AC_MSG_RESULT([yes])
186 NLS="-DNLS" 176 AC_DEFINE(NLS, 1, "Natural language support")
187) 177)
188AC_SUBST(NLS)
189CXXFLAGS="$CXXFLAGS $NLS"
190 178
191AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4") 179AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4")
192 180
@@ -197,59 +185,51 @@ fi
197 185
198 186
199dnl Check for new timed pixmap cache 187dnl Check for new timed pixmap cache
200TIMEDCACHE=""
201AC_MSG_CHECKING([whether to use the new timed pixmap cache]) 188AC_MSG_CHECKING([whether to use the new timed pixmap cache])
202AC_ARG_ENABLE( 189AC_ARG_ENABLE(
203 timed-cache, 190 timed-cache,
204[ --enable-timed-cache use new timed pixmap cache [default=yes]], 191[ --enable-timed-cache use new timed pixmap cache [default=yes]],
205 if test x$enableval = "xyes"; then 192 if test x$enableval = "xyes"; then
206 AC_MSG_RESULT([yes]) 193 AC_MSG_RESULT([yes])
207 TIMEDCACHE="-DTIMEDCACHE" 194 AC_DEFINE(TIMEDCACHE, 1, "timed cache")
208 else 195 else
209 AC_MSG_RESULT([no]) 196 AC_MSG_RESULT([no])
210 fi, 197 fi,
211 AC_MSG_RESULT([yes]) 198 AC_MSG_RESULT([yes])
212 TIMEDCACHE="-DTIMEDCACHE" 199 AC_DEFINE(TIMEDCACHE, 1, "timed cache")
213) 200)
214AC_SUBST(TIMEDCACHE)
215CXXFLAGS="$CXXFLAGS $TIMEDCACHE"
216 201
217dnl Check KDE 202dnl Check KDE
218KDE=""
219AC_MSG_CHECKING([whether to have KDE slit support]) 203AC_MSG_CHECKING([whether to have KDE slit support])
220AC_ARG_ENABLE( 204AC_ARG_ENABLE(
221 kde, 205 kde,
222[ --enable-kde KDE slit support [default=no]], 206[ --enable-kde KDE slit support [default=no]],
223 if test x$enableval = "xyes"; then 207 if test x$enableval = "xyes"; then
224 AC_MSG_RESULT([yes]) 208 AC_MSG_RESULT([yes])
225 KDE="-DKDE" 209 AC_DEFINE(KDE, 1, "KDE slit support")
226 else 210 else
227 AC_MSG_RESULT([no]) 211 AC_MSG_RESULT([no])
228 fi, 212 fi,
229 AC_MSG_RESULT([no]) 213 AC_MSG_RESULT([no])
230) 214)
231AC_SUBST(KDE)
232CXXFLAGS="$CXXFLAGS $KDE"
233 215
234dnl Check GNOME 216dnl Check GNOME
235GNOME="" 217
236AC_MSG_CHECKING([whether to have GNOME support]) 218AC_MSG_CHECKING([whether to have GNOME support])
237AC_ARG_ENABLE( 219AC_ARG_ENABLE(
238 gnome, 220 gnome,
239[ --enable-gnome GNOME support [default=no]], 221[ --enable-gnome GNOME support [default=no]],
240 if test x$enableval = "xyes"; then 222 if test x$enableval = "xyes"; then
241 AC_MSG_RESULT([yes]) 223 AC_MSG_RESULT([yes])
242 GNOME="-DGNOME" 224 AC_DEFINE(GNOME, 1, "Gnome 1 support")
243 else 225 else
244 AC_MSG_RESULT([no]) 226 AC_MSG_RESULT([no])
245 fi, 227 fi,
246 AC_MSG_RESULT([no]) 228 AC_MSG_RESULT([no])
247) 229)
248AC_SUBST(GNOME)
249CXXFLAGS="$CXXFLAGS $GNOME"
250 230
251dnl Check for Xinerama support 231dnl Check for Xinerama support
252XINERAMA="" 232
253AC_MSG_CHECKING([whether to build support for the Xinerama extension]) 233AC_MSG_CHECKING([whether to build support for the Xinerama extension])
254AC_ARG_ENABLE(xinerama, 234AC_ARG_ENABLE(xinerama,
255[ --enable-xinerama enable xinerama extension [default=no]], , [enable_xinerama=no]) 235[ --enable-xinerama enable xinerama extension [default=no]], , [enable_xinerama=no])
@@ -284,7 +264,9 @@ AC_MSG_RESULT([])
284 264
285dnl Output files 265dnl Output files
286AM_CONFIG_HEADER(config.h) 266AM_CONFIG_HEADER(config.h)
267
287AC_OUTPUT(Makefile 268AC_OUTPUT(Makefile
269version.h
288src/Makefile 270src/Makefile
289util/Makefile 271util/Makefile
290util/fbrun/Makefile 272util/fbrun/Makefile
@@ -306,4 +288,4 @@ nls/pt_PT/Makefile
306nls/bg_BG/Makefile 288nls/bg_BG/Makefile
307nls/ja_JP/Makefile 289nls/ja_JP/Makefile
308nls/lv_LV/Makefile 290nls/lv_LV/Makefile
309version.h) 291)