diff options
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 42 |
1 files changed, 35 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 7b58aa0..989643c 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,7 +1,7 @@ | |||
1 | dnl configure.in for Fluxbox - created from configure.in Blackbox 0.61.1 | 1 | dnl configure.in for Fluxbox - created from configure.in Blackbox 0.61.1 |
2 | dnl Initialize autoconf and automake | 2 | dnl Initialize autoconf and automake |
3 | AC_INIT(src/main.cc) | 3 | AC_INIT(src/main.cc) |
4 | AM_INIT_AUTOMAKE(fluxbox,0.1.5,no-define) | 4 | AM_INIT_AUTOMAKE(fluxbox,0.1.10,no-define) |
5 | 5 | ||
6 | dnl Determine default prefix | 6 | dnl Determine default prefix |
7 | test x$prefix = "xNONE" && prefix="$ac_default_prefix" | 7 | test x$prefix = "xNONE" && prefix="$ac_default_prefix" |
@@ -17,7 +17,6 @@ dnl Locate required external software | |||
17 | AC_PROG_CC | 17 | AC_PROG_CC |
18 | AC_PROG_CXX | 18 | AC_PROG_CXX |
19 | AC_PROG_INSTALL | 19 | AC_PROG_INSTALL |
20 | AM_PROG_LIBTOOL | ||
21 | 20 | ||
22 | AC_CHECK_PROGS(regex_cmd, sed) | 21 | AC_CHECK_PROGS(regex_cmd, sed) |
23 | if test x$regex_cmd = "x"; then | 22 | if test x$regex_cmd = "x"; then |
@@ -84,7 +83,7 @@ else | |||
84 | AC_MSG_RESULT([no]) | 83 | AC_MSG_RESULT([no]) |
85 | fi | 84 | fi |
86 | AC_SUBST(SHAPE) | 85 | AC_SUBST(SHAPE) |
87 | 86 | CXXFLAGS="$CXXFLAGS $SHAPE" | |
88 | LIBS="$LIBS $Xext_lib" | 87 | LIBS="$LIBS $Xext_lib" |
89 | 88 | ||
90 | dnl Check for the Slit | 89 | dnl Check for the Slit |
@@ -102,6 +101,7 @@ AC_ARG_ENABLE( | |||
102 | SLIT="-DSLIT" | 101 | SLIT="-DSLIT" |
103 | ) | 102 | ) |
104 | AC_SUBST(SLIT) | 103 | AC_SUBST(SLIT) |
104 | CXXFLAGS="$CXXFLAGS $SLIT" | ||
105 | 105 | ||
106 | dnl Check for the new WM Spec | 106 | dnl Check for the new WM Spec |
107 | NEWWMSPEC="" | 107 | NEWWMSPEC="" |
@@ -119,7 +119,7 @@ AC_ARG_ENABLE( | |||
119 | AC_MSG_RESULT([no]) | 119 | AC_MSG_RESULT([no]) |
120 | ) | 120 | ) |
121 | AC_SUBST(NEWWMSPEC) | 121 | AC_SUBST(NEWWMSPEC) |
122 | 122 | CXXFLAGS="$CXXFLAGS $NEWWMSPEC" | |
123 | 123 | ||
124 | dnl Check for Interlacing | 124 | dnl Check for Interlacing |
125 | INTERLACE="" | 125 | INTERLACE="" |
@@ -136,6 +136,7 @@ AC_ARG_ENABLE( | |||
136 | INTERLACE="-DINTERLACE" | 136 | INTERLACE="-DINTERLACE" |
137 | ) | 137 | ) |
138 | AC_SUBST(INTERLACE) | 138 | AC_SUBST(INTERLACE) |
139 | CXXFLAGS="$CXXFLAGS $INTERLACE" | ||
139 | 140 | ||
140 | dnl Check for ordered 8bpp dithering | 141 | dnl Check for ordered 8bpp dithering |
141 | ORDEREDPSEUDO="" | 142 | ORDEREDPSEUDO="" |
@@ -152,6 +153,7 @@ AC_ARG_ENABLE(ordered-pseudo, | |||
152 | AC_MSG_RESULT([no]) | 153 | AC_MSG_RESULT([no]) |
153 | ) | 154 | ) |
154 | AC_SUBST(ORDEREDPSEUDO) | 155 | AC_SUBST(ORDEREDPSEUDO) |
156 | CXXFLAGS="$CXXFLAGS $ORDEREDPSEUDO" | ||
155 | 157 | ||
156 | dnl Check whether to include debugging code | 158 | dnl Check whether to include debugging code |
157 | DEBUG="" | 159 | DEBUG="" |
@@ -160,13 +162,14 @@ AC_ARG_ENABLE(debug, | |||
160 | [ --enable-debug include verbose debugging code [default=no]], | 162 | [ --enable-debug include verbose debugging code [default=no]], |
161 | if test x$enableval = "xyes"; then | 163 | if test x$enableval = "xyes"; then |
162 | AC_MSG_RESULT([yes]) | 164 | AC_MSG_RESULT([yes]) |
163 | DEBUG="-DDEBUG" | 165 | DEBUG="-DDEBUG" |
164 | else | 166 | else |
165 | AC_MSG_RESULT([no]) | 167 | AC_MSG_RESULT([no]) |
166 | fi, | 168 | fi, |
167 | AC_MSG_RESULT([no]) | 169 | AC_MSG_RESULT([no]) |
168 | ) | 170 | ) |
169 | AC_SUBST(DEBUG) | 171 | AC_SUBST(DEBUG) |
172 | CXXFLAGS="$CXXFLAGS $DEBUG" | ||
170 | 173 | ||
171 | dnl Check whether to include natural language support (i18n) | 174 | dnl Check whether to include natural language support (i18n) |
172 | NLS="" | 175 | NLS="" |
@@ -183,6 +186,7 @@ AC_ARG_ENABLE(nls, | |||
183 | NLS="-DNLS" | 186 | NLS="-DNLS" |
184 | ) | 187 | ) |
185 | AC_SUBST(NLS) | 188 | AC_SUBST(NLS) |
189 | CXXFLAGS="$CXXFLAGS $NLS" | ||
186 | 190 | ||
187 | AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4") | 191 | AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4") |
188 | 192 | ||
@@ -208,6 +212,7 @@ AC_ARG_ENABLE( | |||
208 | TIMEDCACHE="-DTIMEDCACHE" | 212 | TIMEDCACHE="-DTIMEDCACHE" |
209 | ) | 213 | ) |
210 | AC_SUBST(TIMEDCACHE) | 214 | AC_SUBST(TIMEDCACHE) |
215 | CXXFLAGS="$CXXFLAGS $TIMEDCACHE" | ||
211 | 216 | ||
212 | dnl Check KDE | 217 | dnl Check KDE |
213 | KDE="" | 218 | KDE="" |
@@ -224,13 +229,14 @@ AC_ARG_ENABLE( | |||
224 | AC_MSG_RESULT([no]) | 229 | AC_MSG_RESULT([no]) |
225 | ) | 230 | ) |
226 | AC_SUBST(KDE) | 231 | AC_SUBST(KDE) |
232 | CXXFLAGS="$CXXFLAGS $KDE" | ||
227 | 233 | ||
228 | dnl Check GNOME | 234 | dnl Check GNOME |
229 | GNOME="" | 235 | GNOME="" |
230 | AC_MSG_CHECKING([whether to have GNOME support]) | 236 | AC_MSG_CHECKING([whether to have GNOME support]) |
231 | AC_ARG_ENABLE( | 237 | AC_ARG_ENABLE( |
232 | gnome, | 238 | gnome, |
233 | [ --enable-gnome GNOME support [default=no] (DEVELOPMENT)], | 239 | [ --enable-gnome GNOME support [default=no]], |
234 | if test x$enableval = "xyes"; then | 240 | if test x$enableval = "xyes"; then |
235 | AC_MSG_RESULT([yes]) | 241 | AC_MSG_RESULT([yes]) |
236 | GNOME="-DGNOME" | 242 | GNOME="-DGNOME" |
@@ -240,12 +246,31 @@ AC_ARG_ENABLE( | |||
240 | AC_MSG_RESULT([no]) | 246 | AC_MSG_RESULT([no]) |
241 | ) | 247 | ) |
242 | AC_SUBST(GNOME) | 248 | AC_SUBST(GNOME) |
249 | CXXFLAGS="$CXXFLAGS $GNOME" | ||
250 | |||
251 | dnl Check for Xinerama support | ||
252 | XINERAMA="" | ||
253 | AC_MSG_CHECKING([whether to build support for the Xinerama extension]) | ||
254 | AC_ARG_ENABLE(xinerama, | ||
255 | [ --enable-xinerama enable xinerama extension [default=no]], , [enable_xinerama=no]) | ||
256 | |||
257 | if test "x$enable_xinerama" = "xyes"; then | ||
258 | AC_MSG_RESULT([yes]) | ||
259 | AC_CHECK_LIB(Xinerama, XineramaQueryScreens, | ||
260 | XINERAMA="-DXINERAMA"; Xinerama_libs="-lXinerama", ) | ||
261 | else | ||
262 | AC_MSG_RESULT([no]) | ||
263 | fi | ||
264 | AC_SUBST(XINERAMA) | ||
265 | CXXFLAGS="$CXXFLAGS $XINERAMA" | ||
266 | |||
267 | LIBS="$LIBS $Xinerama_libs" | ||
243 | 268 | ||
244 | dnl Determine the return type of signal handlers | 269 | dnl Determine the return type of signal handlers |
245 | AC_TYPE_SIGNAL | 270 | AC_TYPE_SIGNAL |
246 | 271 | ||
247 | dnl Determine if maintainer portions of the Makefiles should be included. | 272 | dnl Determine if maintainer portions of the Makefiles should be included. |
248 | AM_MAINTAINER_MODE | 273 | dnl AM_MAINTAINER_MODE |
249 | 274 | ||
250 | dnl Print results | 275 | dnl Print results |
251 | AC_MSG_RESULT([]) | 276 | AC_MSG_RESULT([]) |
@@ -276,4 +301,7 @@ nls/ru_RU/Makefile | |||
276 | nls/sv_SE/Makefile | 301 | nls/sv_SE/Makefile |
277 | nls/tr_TR/Makefile | 302 | nls/tr_TR/Makefile |
278 | nls/it_IT/Makefile | 303 | nls/it_IT/Makefile |
304 | nls/pt_PT/Makefile | ||
305 | nls/bg_BG/Makefile | ||
306 | nls/ja_JP/Makefile | ||
279 | version.h) | 307 | version.h) |