[Mod-c-cvs] mod_c/src Makefile.am,1.16,1.17

[Gonzalo A. <ga...@us...>]

Update of /cvsroot/mod-c/mod_c/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32383/src

Modified Files:
	Makefile.am 
Log Message:
Fixed FreeBSD portability issues:
* Added a check for '-ldl'.
* Added missing -l$(EHTML_LIB_DIR) (linking fails under FreeBSD).


Index: Makefile.am
===================================================================
RCS file: /cvsroot/mod-c/mod_c/src/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.am	12 Sep 2006 22:42:07 -0000	1.16
--- Makefile.am	1 Apr 2007 13:25:08 -0000	1.17
***************
*** 2,5 ****
--- 2,6 ----
  HTTPD_INCLUDE_DIR = @APACHE_LOCATION@
  EHTML_INCLUDE_DIR = @EHTML_LOCATION@
+ EHTML_LIB_DIR = @EHTML_LOCATION@/../../lib
  INCLUDE_DIRS = -I$(APR_0_INCLUDE) -I$(HTTPD_INCLUDE_DIR) -I$(EHTML_INCLUDE_DIR) -I$(srcdir)/../include
  AM_CXXFLAGS = $(INCLUDE_DIRS)
***************
*** 7,10 ****
--- 8,12 ----
  APXS = @APXS@
  TEMP_LIBPATH = @abs_srcdir@
+ DL = @DL@
  
  noinst_LIBRARIES = libmod_c.a
***************
*** 16,20 ****
  
  mod_c$(EXEEXT): mod_c.c libmod_c.a
! 	$(APXS) $(INCLUDE_DIRS) -Wc,"$(CFLAGS)" -L$(srcdir) -c mod_c.c -lmod_c -ldl -lstdc++ -lehtml
  	rm -f mod_c.so
  	ln -s .libs/mod_c.so mod_c.so
--- 18,22 ----
  
  mod_c$(EXEEXT): mod_c.c libmod_c.a
! 	$(APXS) $(INCLUDE_DIRS) -Wc,"$(CFLAGS)" -L$(srcdir) -c mod_c.c -lmod_c $(DL) -lstdc++ -L$(EHTML_LIB_DIR) -lehtml
  	rm -f mod_c.so
  	ln -s .libs/mod_c.so mod_c.so