diff -r d40f34cdb609 -r fb41a361817a Makefile.in
--- a/Makefile.in	Mon Sep 20 18:28:27 2010 -0400
+++ b/Makefile.in	Mon Sep 20 19:14:38 2010 -0400
@@ -31,7 +31,6 @@
 	@echo 
 	@echo ccmalloc Configuration and Build Completed
 	@echo
-	
 
 
 identd: 
diff -r d40f34cdb609 -r fb41a361817a configure.in
--- a/configure.in	Mon Sep 20 18:28:27 2010 -0400
+++ b/configure.in	Mon Sep 20 19:14:38 2010 -0400
@@ -228,14 +228,10 @@
 AC_ARG_ENABLE(debug,
 [  --enable-debug	build with debugging options turned on],
 [
-	CXX_OPTIMIZATIONS="";
-	CXX_OPTS="-D__DEBUG__ -g -Wall";
 	AC_DEFINE(__DEBUG__)
   	AC_MSG_RESULT(__DEBUG__ now defined)
 ],
 [
-	CXX_OPTIMIZATIONS=-O2
-	CXX_OPTS=-Wall
 	AC_MSG_RESULT(no)
 ])
 
@@ -350,8 +346,6 @@
 AC_SUBST(SSL_INCLUDE)
 
 
-AC_SUBST(CXX_OPTS)
-AC_SUBST(CXX_OPTIMIZATIONS)
 AC_SUBST(CXX_LINKER)
 AC_SUBST(CXX_LINKER_LIBS)
 
diff -r d40f34cdb609 -r fb41a361817a lib/Makefile.in
--- a/lib/Makefile.in	Mon Sep 20 18:28:27 2010 -0400
+++ b/lib/Makefile.in	Mon Sep 20 19:14:38 2010 -0400
@@ -4,11 +4,10 @@
 #
 ##########################################
 
+CPPFLAGS           = @CPPFLAGS@
 CXX                = @CXX@
 CC                 = @CC@
-CXX_OPTS           = @CXX_OPTS@ @NO_EXCEPTIONS@ @NO_RTTI@ @SSL_DEBUG@ @SSL_INCLUDE@
-CXX_OPTIMIZATIONS  = @CXX_OPTIMIZATIONS@
-CXX_LIBS 	       =
+CXXFLAGS           = @CXXFLAGS@ @NO_EXCEPTIONS@ @NO_RTTI@ @SSL_DEBUG@ @SSL_INCLUDE@
 
 all: libs
 
@@ -24,19 +23,19 @@
 
 
 dynbuff.o: dynbuff.cpp dynbuff.h general.h autoconf.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c dynbuff.cpp
- 
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c dynbuff.cpp
+
 general.o: general.cpp general.h autoconf.h 
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c general.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c general.cpp
 
 linkedlist.o: linkedlist.cpp linkedlist.h autoconf.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c linkedlist.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c linkedlist.cpp
 
 lib_mdidentd.o: lib_mdidentd.h lib_mdidentd.c autoconf.h
-	$(CC) -Wall $(CXX_OPTIMIZATIONS) -c lib_mdidentd.c
-	
+	$(CC) $(CFLAGS) $(CPPFLAGS) -Wall -c lib_mdidentd.c
+
 hash.o: hash.h hash.cpp autoconf.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c hash.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c hash.cpp
 
 install:
 	@true
diff -r d40f34cdb609 -r fb41a361817a mdidentd/Makefile.in
--- a/mdidentd/Makefile.in	Mon Sep 20 18:28:27 2010 -0400
+++ b/mdidentd/Makefile.in	Mon Sep 20 19:14:38 2010 -0400
@@ -4,9 +4,9 @@
 #
 ########################### 
 
+CPPFLAGS           = @CPPFLAGS@
 CXX                = @CXX@
-CXX_OPTS           = @CXX_OPTS@ @NO_EXCEPTIONS@ @NO_RTTI@ -I../lib
-CXX_OPTIMIZATIONS  = @CXX_OPTIMIZATIONS@
+CXXFLAGS           = @CXXFLAGS@ @NO_EXCEPTIONS@ @NO_RTTI@ -I../lib
 CXX_LIBS           = @CXX_LINKER_LIBS@
 CXX_LINKER	   = @CXX_LINKER@ 
 
@@ -22,13 +22,13 @@
 	rm -f *.o mdidentd core
 
 mdidentd: libs identd.o ilist.o 
-	$(CXX_LINKER) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -o mdidentd identd.o ilist.o ../lib/linkedlist.o $(CXX_LIBS)
+	$(CXX_LINKER) $(CXXFLAGS) $(LDFLAGS) -o mdidentd identd.o ilist.o ../lib/linkedlist.o $(CXX_LIBS)
 
 identd.o: identd.cpp identd.h ilist.h autoconf.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c identd.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c identd.cpp
 
 ilist.o: ilist.cpp ilist.h autoconf.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c ilist.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c ilist.cpp
 
 libs:
 	cd ../lib/ ; $(MAKE) all
@@ -38,5 +38,3 @@
 	@echo
 	@echo Copied mdidentd to /usr/local/sbin/
 	@echo
-	
-
diff -r d40f34cdb609 -r fb41a361817a src/Makefile.in
--- a/src/Makefile.in	Mon Sep 20 18:28:27 2010 -0400
+++ b/src/Makefile.in	Mon Sep 20 19:14:38 2010 -0400
@@ -4,11 +4,11 @@
 #
 ###############################
 
+CPPFLAGS           = @CPPFLAGS@
 CXX                = @CXX@
-CXX_OPTS           = @CXX_OPTS@ @NO_EXCEPTIONS@ @NO_RTTI@ @SSL_INCLUDE@ @SSL_DEBUG@ -I../lib
-CXX_OPTIMIZATIONS  = @CXX_OPTIMIZATIONS@
+CXXFLAGS           = @CXXFLAGS@ @NO_EXCEPTIONS@ @NO_RTTI@ @SSL_INCLUDE@ @SSL_DEBUG@ -I../lib
 CXX_LIBS           = @CXX_LINKER_LIBS@ @SSL_LIBS@
-CXX_LINKER	       = @CXX_LINKER@
+CXX_LINKER         = @CXX_LINKER@
 
 OBJS               = commands.o config.o conn.o dcc.o ezbounce.o help.o ircaddr.o logfile.o ruleset.o server.o socket.o timer.o user.o
 
@@ -25,13 +25,13 @@
 	rm -f *.o ezbounce core
 
 ccmalloc: libs $(OBJS)
-	ccmalloc g++ $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -o ezbounce $(OBJS) ../lib/hash.o ../lib/linkedlist.o ../lib/dynbuff.o ../lib/general.o ../lib/lib_mdidentd.o $(CXX_LIBS)
+	ccmalloc $(CXX_LINKER) $(CXXFLAGS) $(LDFLAGS) -o ezbounce $(OBJS) ../lib/hash.o ../lib/linkedlist.o ../lib/dynbuff.o ../lib/general.o ../lib/lib_mdidentd.o $(CXX_LIBS)
 	cp ezbounce ..
 	ln -sf ezbounce ../ezb
 
 
 ezbounce:  libs $(OBJS)
-	$(CXX_LINKER) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -o ezbounce $(OBJS) ../lib/hash.o ../lib/linkedlist.o ../lib/dynbuff.o ../lib/general.o ../lib/lib_mdidentd.o $(CXX_LIBS)
+	$(CXX_LINKER) $(CXXFLAGS) $(LDFLAGS) -o ezbounce $(OBJS) ../lib/hash.o ../lib/linkedlist.o ../lib/dynbuff.o ../lib/general.o ../lib/lib_mdidentd.o $(CXX_LIBS)
 	cp ezbounce ..
 	ln -sf ezbounce ../ezb
 
@@ -39,44 +39,44 @@
 	cd ../lib/ ; $(MAKE) all
 
 ezbounce.o: ezbounce.cpp server.h ezbounce.h config.h autoconf.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c ezbounce.cpp
-	
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c ezbounce.cpp
+
 socket.o: socket.cpp socket.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c socket.cpp
-        
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c socket.cpp
+
 conn.o: conn.cpp server.h conn.h autoconf.h messages.h socket.h commands.h help.cc ircaddr.cc ircaddr.h timer.cc timer.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c conn.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c conn.cpp
 
 dcc.o: dcc.cpp dcc.h autoconf.h socket.h timer.cc timer.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c dcc.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c dcc.cpp
 
 server.o: server.cpp server.h conn.h autoconf.h socket.h timer.cc timer.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c server.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c server.cpp
 
 config.o: config.cpp config.h autoconf.h ruleset.cpp ruleset.h user.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c config.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c config.cpp
 
 ruleset.o: ruleset.cpp ruleset.h autoconf.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c ruleset.cpp
-	
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c ruleset.cpp
+
 logfile.o: logfile.cpp autoconf.h ezbounce.h logfile.h conn.h 
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c logfile.cpp
-	
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c logfile.cpp
+
 commands.o: commands.cpp commands.h autoconf.h conn.h help.cc ircaddr.cc ircaddr.h messages.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c commands.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c commands.cpp
 
 user.o: user.h user.cc ruleset.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c user.cc
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c user.cc
 
 help.o:	help.cc messages.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c help.cc
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c help.cc
 
 ircaddr.o: ircaddr.cc
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c ircaddr.cc
-	
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c ircaddr.cc
+
 timer.o: timer.cc timer.h
-	$(CXX) $(CXX_OPTS) $(CXX_OPTIMIZATIONS) -c timer.cc
-	    
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c timer.cc
+
 install:
 	@echo
 	@echo ezbounce can be installed anywhere!