aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-05-07 15:18:26 (GMT)
committerfluxgen <fluxgen>2002-05-07 15:18:26 (GMT)
commitb3ea4095497ade3d3d9c894af786f5ffb307d805 (patch)
treee005b95dbed8c1edde07e6a4e2f48ac2a4b697fc
parentbf605136d02fad2f7da580b77b01519100e43223 (diff)
downloadfluxbox-b3ea4095497ade3d3d9c894af786f5ffb307d805.zip
fluxbox-b3ea4095497ade3d3d9c894af786f5ffb307d805.tar.bz2
added options direct to CXXFLAGS so we dont need to add them in every Makefile.am file, and changed version to cvs
-rw-r--r--configure.in14
1 files changed, 11 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 87c299e..f7c561b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
1dnl configure.in for Fluxbox - created from configure.in Blackbox 0.61.1 1dnl configure.in for Fluxbox - created from configure.in Blackbox 0.61.1
2dnl Initialize autoconf and automake 2dnl Initialize autoconf and automake
3AC_INIT(src/main.cc) 3AC_INIT(src/main.cc)
4AM_INIT_AUTOMAKE(fluxbox,0.1.8,no-define) 4AM_INIT_AUTOMAKE(fluxbox,cvs,no-define)
5 5
6dnl Determine default prefix 6dnl Determine default prefix
7test x$prefix = "xNONE" && prefix="$ac_default_prefix" 7test x$prefix = "xNONE" && prefix="$ac_default_prefix"
@@ -84,7 +84,7 @@ else
84 AC_MSG_RESULT([no]) 84 AC_MSG_RESULT([no])
85fi 85fi
86AC_SUBST(SHAPE) 86AC_SUBST(SHAPE)
87 87CXXFLAGS="$CXXFLAGS $SHAPE"
88LIBS="$LIBS $Xext_lib" 88LIBS="$LIBS $Xext_lib"
89 89
90dnl Check for the Slit 90dnl Check for the Slit
@@ -102,6 +102,7 @@ AC_ARG_ENABLE(
102 SLIT="-DSLIT" 102 SLIT="-DSLIT"
103) 103)
104AC_SUBST(SLIT) 104AC_SUBST(SLIT)
105CXXFLAGS="$CXXFLAGS $SLIT"
105 106
106dnl Check for the new WM Spec 107dnl Check for the new WM Spec
107NEWWMSPEC="" 108NEWWMSPEC=""
@@ -119,7 +120,7 @@ AC_ARG_ENABLE(
119 AC_MSG_RESULT([no]) 120 AC_MSG_RESULT([no])
120) 121)
121AC_SUBST(NEWWMSPEC) 122AC_SUBST(NEWWMSPEC)
122 123CXXFLAGS="$CXXFLAGS $NEWWMSPEC"
123 124
124dnl Check for Interlacing 125dnl Check for Interlacing
125INTERLACE="" 126INTERLACE=""
@@ -136,6 +137,7 @@ AC_ARG_ENABLE(
136 INTERLACE="-DINTERLACE" 137 INTERLACE="-DINTERLACE"
137) 138)
138AC_SUBST(INTERLACE) 139AC_SUBST(INTERLACE)
140CXXFLAGS="$CXXFLAGS $INTERLACE"
139 141
140dnl Check for ordered 8bpp dithering 142dnl Check for ordered 8bpp dithering
141ORDEREDPSEUDO="" 143ORDEREDPSEUDO=""
@@ -152,6 +154,7 @@ AC_ARG_ENABLE(ordered-pseudo,
152 AC_MSG_RESULT([no]) 154 AC_MSG_RESULT([no])
153) 155)
154AC_SUBST(ORDEREDPSEUDO) 156AC_SUBST(ORDEREDPSEUDO)
157CXXFLAGS="$CXXFLAGS $ORDEREDPSEUDO"
155 158
156dnl Check whether to include debugging code 159dnl Check whether to include debugging code
157DEBUG="" 160DEBUG=""
@@ -167,6 +170,7 @@ AC_ARG_ENABLE(debug,
167 AC_MSG_RESULT([no]) 170 AC_MSG_RESULT([no])
168) 171)
169AC_SUBST(DEBUG) 172AC_SUBST(DEBUG)
173CXXFLAGS="$CXXFLAGS $DEBUG"
170 174
171dnl Check whether to include natural language support (i18n) 175dnl Check whether to include natural language support (i18n)
172NLS="" 176NLS=""
@@ -208,6 +212,7 @@ AC_ARG_ENABLE(
208 TIMEDCACHE="-DTIMEDCACHE" 212 TIMEDCACHE="-DTIMEDCACHE"
209) 213)
210AC_SUBST(TIMEDCACHE) 214AC_SUBST(TIMEDCACHE)
215CXXFLAGS="$CXXFLAGS $TIMEDCACHE"
211 216
212dnl Check KDE 217dnl Check KDE
213KDE="" 218KDE=""
@@ -224,6 +229,7 @@ AC_ARG_ENABLE(
224 AC_MSG_RESULT([no]) 229 AC_MSG_RESULT([no])
225) 230)
226AC_SUBST(KDE) 231AC_SUBST(KDE)
232CXXFLAGS="$CXXFLAGS $KDE"
227 233
228dnl Check GNOME 234dnl Check GNOME
229GNOME="" 235GNOME=""
@@ -240,6 +246,7 @@ AC_ARG_ENABLE(
240 AC_MSG_RESULT([no]) 246 AC_MSG_RESULT([no])
241) 247)
242AC_SUBST(GNOME) 248AC_SUBST(GNOME)
249CXXFLAGS="$CXXFLAGS $GNOME"
243 250
244dnl Check for Xinerama support 251dnl Check for Xinerama support
245XINERAMA="" 252XINERAMA=""
@@ -255,6 +262,7 @@ else
255 AC_MSG_RESULT([no]) 262 AC_MSG_RESULT([no])
256fi 263fi
257AC_SUBST(XINERAMA) 264AC_SUBST(XINERAMA)
265CXXFLAGS="$CXXFLAGS $XINERAMA"
258 266
259LIBS="$LIBS $Xinerama_libs" 267LIBS="$LIBS $Xinerama_libs"
260 268