From: Matej U. <mat...@us...> - 2006-09-12 22:16:39
|
Update of /cvsroot/mod-c/mod_c/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30293/src Modified Files: ChangeLog Makefile.am Makefile.in Log Message: Told apxs not to link against libehtml - it would complain about ehtml not being portable (and exit with error). Index: Makefile.in =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.in 8 Sep 2006 15:00:32 -0000 1.14 --- Makefile.in 12 Sep 2006 22:16:30 -0000 1.15 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ *************** *** 16,21 **** - SOURCES = $(libmod_c_a_SOURCES) mod_c.c - srcdir = @srcdir@ top_srcdir = @top_srcdir@ --- 16,19 ---- *************** *** 478,482 **** 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 --- 476,480 ---- mod_c$(EXEEXT): mod_c.c libmod_c.a ! $(APXS) $(INCLUDE_DIRS) -Wc,"$(CFLAGS)" -L$(srcdir) -c mod_c.c -lmod_c -ldl -lstdc++ rm -f mod_c.so ln -s .libs/mod_c.so mod_c.so Index: Makefile.am =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.am 8 Sep 2006 15:01:38 -0000 1.14 --- Makefile.am 12 Sep 2006 22:16:30 -0000 1.15 *************** *** 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 --- 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++ rm -f mod_c.so ln -s .libs/mod_c.so mod_c.so Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChangeLog 25 Aug 2006 14:23:57 -0000 1.2 --- ChangeLog 12 Sep 2006 22:16:30 -0000 1.3 *************** *** 1,2 **** --- 1,6 ---- + 2006-09-13 Matej Urbas <mat...@gm...> + + * Makefile.am: We mustn't tell APXS to link against libehtml - it will + report an error, saying that libehtml isn't portable. 2006-08-25 Gonzalo Arana <gon...@gm...> |