Resolve recursive configure

4 files changed, 4 insertions, 45 deletions

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 9d19ee8..d7541f7 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -284,7 +284,7 @@ WARN_FORMAT = "WARNING: $text ($line, $file)"
 ###############################################################

 

 

-INPUT = @srcdir@/../include @srcdir@/Mainpage

+INPUT = @ac_abs_confdir@/include @ac_abs_confdir@/doc/Mainpage

 # The INPUT tag is used to specify the files and/or directories that contain documented source files. You may enter file names like myfile.cpp or directories like /usr/src/myproject. Separate the files or directories with spaces.

 #

 # Note: If this tag is empty the current directory is searched.

@@ -350,7 +350,7 @@ RECURSIVE = YES
 # The IMAGE_PATH tag can be used to specify one or more files or directories that contain images that are to be included in the documentation (see the \image command).

 

 

-INPUT_FILTER = "bash preprocess.sh"

+INPUT_FILTER = "bash @ac_abs_confdir@/doc/preprocess.sh"

 # The INPUT_FILTER tag can be used to specify a program that doxygen should invoke to filter for each input file. Doxygen will invoke the filter program by executing (via popen()) the command:

 #

 # <filter> <input-file>

@@ -750,7 +750,7 @@ SEARCH_INCLUDES = YES
 # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files in the INCLUDE_PATH (see below) will be searched if a #include is found.

 

 

-INCLUDE_PATH = ../include

+INCLUDE_PATH = @ac_abs_confdir@/include

 # The INCLUDE_PATH tag can be used to specify one or more directories that contain include files that are not input files but should be processed by the preprocessor.

 

 

diff --git a/doc/configure.ac b/doc/configure.ac
deleted file mode 100644
index 4e147bb..0000000
--- a/doc/configure.ac
+++ /dev/null
@@ -1,41 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.61)
-AC_INIT(Doxyfile.in)
-AC_CONFIG_AUX_DIR([../build-aux])
-AM_INIT_AUTOMAKE(uriparser-doc, 0.7.5)
-
-
-## Doxygen
-AC_CHECK_PROG(DOXY_CHECK, doxygen, found, missing)
-if test ${DOXY_CHECK} != "found" ; then
-	AC_MSG_ERROR([Please install Doxygen first.])
-fi
-
-
-## Graphviz
-AC_CHECK_PROG(GRAPHVIZ_CHECK, dot, found, missing)
-if test ${GRAPHVIZ_CHECK} != "found" ; then
-	AC_MSG_ERROR([Please install Graphviz first.])
-fi
-
-
-## HTML help, Qt Compressed Help
-host_triplet=`${ac_config_guess}`
-if echo "${host_triplet}" | grep cygwin &>/dev/null ; then
-	GENERATE_HTMLHELP=YES
-	QHG_LOCATION=../qhelpgenerator.exe
-else
-	GENERATE_HTMLHELP=NO
-	QHG_LOCATION=qhelpgenerator
-fi
-AC_SUBST(GENERATE_HTMLHELP)
-AC_SUBST(QHG_LOCATION)
-AC_SUBST(srcdir, [${ac_abs_confdir}])
-
-
-AC_CONFIG_FILES([
-	Doxyfile
-	Makefile
-])
-AC_CONFIG_FILES([release.sh], [chmod a+x release.sh])
-AC_OUTPUT
diff --git a/doc/m4/pkg.m4 b/doc/m4/pkg.m4
deleted file mode 100644
index e69de29..0000000
--- a/doc/m4/pkg.m4
+++ /dev/null
diff --git a/doc/release.sh.in b/doc/release.sh.in
index 59afb70..2082a4c 100755
--- a/doc/release.sh.in
+++ b/doc/release.sh.in
@@ -2,7 +2,7 @@
 (
 cd $(dirname $(which "$0")) || exit 1
 
-distdir="@PACKAGE@-@VERSION@"
+distdir="@PACKAGE@-@VERSION@-doc"
 [ -z $MAKE ] && MAKE=make
 
 # Clean up