From 15fe6e72733a49dd9469aeedc5082eafdfe1a733 Mon Sep 17 00:00:00 2001 From: Arturo Espinosa Date: Mon, 7 Sep 1998 17:27:57 +0000 Subject: [PATCH] Added gnome-config support to gnome-xml module --- Makefile.am | 20 ++++++++++++++++++++ configure.in | 11 ++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 6086a1cf..a04c903c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,3 +40,23 @@ tests : tester rm result.`basename $$i` ; \ fi ; fi ; done) +## Put `exec' in the name because this should be installed by +## `install-exec', not `install-data'. + +confexecdir=$(libdir) +confexec_DATA = xmlConf.sh + +EXTRA_DIST = xmlConf.sh.in + +## We create xmlConf.sh here and not from configure because we want +## to get the paths expanded correctly. Macros like srcdir are given +## the value NONE in configure if the user doesn't specify them (this +## is an autoconf feature, not a bug). + +xmlConf.sh: xmlConf.sh.in Makefile +## Use sed and then mv to avoid problems if the user interrupts. + sed -e 's,\@XML_LIBDIR\@,$(XML_LIBDIR),g' \ + -e 's,\@XML_INCLUDEDIR\@,$(XML_INCLUDEDIR),g' \ + -e 's,\@XML_LIBS\@,$(XML_LIBS),g' \ + < $(srcdir)/xmlConf.sh.in > xmlConf.tmp \ + && mv xmlConf.tmp xmlConf.sh diff --git a/configure.in b/configure.in index 4048bb92..882a1abc 100644 --- a/configure.in +++ b/configure.in @@ -11,7 +11,7 @@ AC_PROG_CPP AC_PATH_PROG(RM, rm, /bin/rm) AC_PATH_PROG(MV, mv, /bin/mv) AC_PATH_PROG(TAR, tar, /bin/tar) -AC_PATH_PROG(GZIP, gzip, /bin/gzip) + AC_PATH_PROG(GZIP, gzip, /bin/gzip) AM_PROG_LIBTOOL @@ -29,8 +29,17 @@ AC_HEADER_STDC AC_CHECK_HEADERS(fcntl.h unistd.h ctype.h dirent.h errno.h malloc.h) AC_CHECK_HEADERS(stdarg.h sys/stat.h sys/types.h time.h zlib.h) +XML_LIBDIR='-L${libdir}' +XML_INCLUDEDIR='-L${includedir}' +XML_LIBS="-lxml $Z_LIBS" + +AC_SUBST(XML_LIBDIR) +AC_SUBST(XML_LIBS) +AC_SUBST(XML_INCLUDEDIR) + dnl Checks for library functions. AC_FUNC_STRFTIME AC_CHECK_FUNCS(strdup strndup strerror snprintf ) AC_SUBST(Z_LIBS) AC_OUTPUT(Makefile) +