Ticket #244: xapian-config-kill-swig-headers.patch

xapian-config.in

@@ -32 +32 @@
 Usage: $PROG_NAME OPTION...
 
 Options:
-  --cxxflags   output all preprocessor and C++ compiler flags
-  --libs       output all linker flags
-  --ltlibs     output linker flags for linking using GNU libtool
-  --swigflags  output preprocessor flags for use with SWIG
-  --help       output this help and exit
-  --version    output version information and exit
+  --cxxflags     output all preprocessor and C++ compiler flags
+  --libs         output all linker flags
+  --ltlibs       output linker flags for linking using GNU libtool
+  --swigflags    output preprocessor flags for use with SWIG
+  --swigheaders  output list of headers for use with SWIG
+  --help         output this help and exit
+  --version      output version information and exit
 EOF
 
     exit $1
@@ -103 +104 @@
     I="$I-I@abs_srcdir@/include"
 }
 
+# Add any header files found in $1 to $H
+add_headers_in_HDIR_to_H() {
+    HDIR=$1
+    list=`echo "$HDIR"/*.h`
+    [ "$list" != "$HDIR/*.h" ] && H="$H$list "
+}
+
+# set $H to a list of header files.
+set_H_to_headers() {
+    H=
+    if is_uninstalled ; then
+        # Some header files are generated, so we need to look in builddir too.
+        add_headers_in_HDIR_to_H "@abs_builddir@/include"
+        add_headers_in_HDIR_to_H "@abs_builddir@/include/xapian"
+        if [ "@abs_srcdir@" != "@abs_builddir@" ] ; then
+            add_headers_in_HDIR_to_H "@abs_srcdir@/include"
+            add_headers_in_HDIR_to_H "@abs_srcdir@/include/xapian"
+        fi
+    else
+        add_headers_in_HDIR_to_H "@includedir@"
+        add_headers_in_HDIR_to_H "@includedir@/xapian"
+    fi
+}
+
 # Extract dlname from a libtool .la file.
 extract_dlname() {
     dlname=
@@ -199 +224 @@
         echo "$I"
         ;;
 
+    --swigheaders)
+        set_H_to_headers
+        echo "$H"
+        ;;
+
     --from-xo-lib-xapian)
         # Top Secret option which allows us to give a more helpful error
         # message if we're asked to link with an uninstalled libxapian