* configure.ac: export xml includes in gsweb.make

* gsweb.make.in (AUXILIARY_INCLUDE_DIRS): added.
* Makefile.postamble: moved gsweb.make in Auxiliary/ make dir.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@15193 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Mirko Viviani 2002-12-02 19:00:36 +00:00
parent 41de9e8610
commit 16a614503c
5 changed files with 16 additions and 5 deletions

View file

@ -1,5 +1,9 @@
2002-12-02 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* configure.ac: export xml includes in gsweb.make
* gsweb.make.in (AUXILIARY_INCLUDE_DIRS): added.
* Makefile.postamble: moved gsweb.make in Auxiliary/ make dir.
* GSWeb.framework/GSWTemplateParser.m ([GSWTemplateParser
-definitions]): compilable with gcc < 3
* GSWeb.framework/GSWHyperlink.m ([GSWHyperlink

View file

@ -45,13 +45,13 @@ gsdocs:
# The following rule is important mainly for packaging, because in that case
# you install into a fake system tree, and the directory is not there.
#
$(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional:
$(MKDIRS) $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional
$(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary:
$(MKDIRS) $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary
# Things to do before installing
before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional
before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary
$(INSTALL_DATA) gsweb.make \
$(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional/gsweb.make
$(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make
# Things to do after installing
#after-install::
@ -60,7 +60,8 @@ before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional
# before-uninstall::
# Things to do after uninstalling
#after-uninstall::
after-uninstall::
rm -f $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make
# Things to do before cleaning
# before-clean::

3
configure vendored
View file

@ -2255,6 +2255,7 @@ echo "${ECHO_T}no" >&6
if test $enable_libxml = yes; then
CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
AUX_INCS="$AUX_INCS $XML_CFLAGS"
LIBS="$LIBS $XML_LIBS"
HAVE_LIBXML=1
@ -2287,6 +2288,7 @@ echo "${ECHO_T}$VERSION" >&6
#--------------------------------------------------------------------
# Write the Makefiles
#--------------------------------------------------------------------
@ -2862,6 +2864,7 @@ s,@MAJOR_VERSION@,$MAJOR_VERSION,;t t
s,@MINOR_VERSION@,$MINOR_VERSION,;t t
s,@SUBMINOR_VERSION@,$SUBMINOR_VERSION,;t t
s,@GCC_VERSION@,$GCC_VERSION,;t t
s,@AUX_INCS@,$AUX_INCS,;t t
s,@AUX_LIBS@,$AUX_LIBS,;t t
CEOF

View file

@ -52,6 +52,7 @@ saved_CFLAGS="$CFLAGS"
AM_PATH_XML(2.3.0, enable_libxml=yes, enable_libxml=no)
if test $enable_libxml = yes; then
CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
AUX_INCS="$AUX_INCS $XML_CFLAGS"
LIBS="$LIBS $XML_LIBS"
HAVE_LIBXML=1
AC_DEFINE(HAVE_LIBXML,1,
@ -77,6 +78,7 @@ AC_SUBST(MINOR_VERSION)
AC_SUBST(SUBMINOR_VERSION)
AC_SUBST(GCC_VERSION)
AC_SUBST(AUX_INCS)
AC_SUBST(AUX_LIBS)
#--------------------------------------------------------------------

View file

@ -30,6 +30,7 @@ GSWEB_MINOR_VERSION = @MINOR_VERSION@
GSWEB_SUBMINOR_VERSION = @SUBMINOR_VERSION@
AUXILIARY_INCLUDE_DIRS += @AUX_INCS@
AUXILIARY_INCLUDE_LIBS += @AUX_LIBS@