all repos — fluxbox @ da8d245704832c6473eb8b9a7e4d59b16d96daad

custom fork of the fluxbox windowmanager 

--disable-regexp switches from <regexp.h> to <string> in
Regexp.cc .. but it still needs to be compiled. hence the
little fix in src/Makefile.am
mathias mathias
commit

da8d245704832c6473eb8b9a7e4d59b16d96daad

parent

8c3cfbef7d3054a90258d59bac3385f98f96a12b

3 files changed, 8 insertions(+), 7 deletions(-)

jump to
M ChangeLog → ChangeLog 
@@ -1,6 +1,9 @@ 
 (Format: Year/Month/Day)
 Changes for 0.9.14:
-*05/08/17
+*05/08/23:
+   * Fixed unresolved symbols when configure --disable-regexp (Mathias)
+     src/Makefile.am
+*05/08/17:
    * Added the 'Education' submenu to fbgm (thanx Lam)
      fluxbox-generate_menu.in
 *05/08/15
M src/Makefile.am → src/Makefile.am 
@@ -65,11 +65,9 @@ if GNOME
 gnome_SOURCE= Gnome.hh Gnome.cc
 endif
 if REMEMBER_SRC
-REMEMBER_SOURCE= Remember.hh Remember.cc
 # For now we only want regexp if we have remember
-if REGEXP_SRC
-REGEXP_SOURCE = RegExp.hh RegExp.cc ClientPattern.hh ClientPattern.cc
-endif
+REMEMBER_SOURCE= Remember.hh Remember.cc \
+	RegExp.hh RegExp.cc ClientPattern.hh ClientPattern.cc
 endif
 if TOOLBAR_SRC
 TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \

@@ -130,7 +128,7 @@ HeadArea.hh HeadArea.cc \
 	Resources.cc \
 	WindowCmd.hh WindowCmd.cc \
 	${newwmspec_SOURCE} ${gnome_SOURCE} \
-	${REMEMBER_SOURCE} ${REGEXP_SOURCE} ${TOOLBAR_SOURCE}
+	${REMEMBER_SOURCE} ${TOOLBAR_SOURCE}
 
 
 LDADD=FbTk/libFbTk.a defaults.$(OBJEXT)
M src/RegExp.cc → src/RegExp.cc 
@@ -99,6 +99,6 @@ bool RegExp::error() const {
 #ifdef USE_REGEXP
     return m_regex == 0; 
 #else
-    return return m_str == "";
+    return m_str == "";
 #endif // USE_REGEXP
 }