From 1253dda20d9202e39224d0e09b357e16f4ab3f70 Mon Sep 17 00:00:00 2001 From: Mark Nevill Date: Mon, 26 Feb 2007 20:27:13 +0100 Subject: [PATCH] Fixed configure.ac and attempted to fix include/Makefile.am --- configure.ac | 7 +++++-- include/Makefile.am | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 0c2bbb8..afc65bd 100644 --- a/configure.ac +++ b/configure.ac @@ -5,9 +5,10 @@ AC_ARG_VAR(HAS_DOXYGEN, "Is doxygen in PATH?") # Checks for programs. AC_PROG_CC AC_PROG_INSTALL -AC_CHECK_PROG([HAS_DOXYGEN], [doxygen], [yes]) +AC_PROG_LIBTOOL +AC_CHECK_PROG([has_doxygen], [doxygen], [yes]) # Checks for header files. -AC_HEADERS_STDC +AC_HEADER_STDC AC_CHECK_HEADERS([stdlib.h]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL @@ -17,6 +18,8 @@ AC_FUNC_MALLOC AC_FUNC_REALLOC AC_CHECK_FUNCS([memset]) +AM_CONDITIONAL(HAS_DOXYGEN, test x$has_doxygen = xyes) + AC_CONFIG_HEADER([config.h]) AC_CONFIG_FILES([Makefile include/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 5fc4611..d57e6bb 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,2 +1,2 @@ -pkginclude_LTLIBRARIES = libxdginclude -libxdginclude_HEADERS = basedir.h +pkginclude_LTLIBRARIES = libxdg.la +libxdg_la_HEADERS = basedir.h -- 2.11.4.GIT