Moved zebrautl.h to idzebra/util.h.

[idzebra-moved-to-github.git] / recctrl / recctrl.c

diff --git a/recctrl/recctrl.c b/recctrl/recctrl.c
index a19874f..0acba7d 100644 (file)
--- a/recctrl/recctrl.c
+++ b/recctrl/recctrl.c
@@ -1,6 +1,6 @@
-/* $Id: recctrl.c,v 1.14 2004-11-29 21:55:28 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: recctrl.c,v 1.18 2005-03-30 09:25:24 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -24,10 +24,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
+#if HAVE_DLFCN_H
 #include <dlfcn.h>
+#endif
 
 #include <direntz.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
 #include <idzebra/recctrl.h>
 
 struct recTypeClass {
@@ -48,6 +50,9 @@ struct recTypes {
     struct recTypeInstance *entries;
 };
 
+#ifdef IDZEBRA_STATIC_GRS_SGML
+    extern RecType idzebra_filter_grs_sgml[];
+#endif
 #ifdef IDZEBRA_STATIC_TEXT
     extern RecType idzebra_filter_text[];
 #endif
@@ -78,8 +83,9 @@ RecTypeClass recTypeClass_create (Res res, NMEM nmem)
     const char *module_path = res_get_def(res, "modulePath",
                                          DEFAULT_MODULE_PATH);
 
-    extern RecType idzebra_filter_grs_sgml[];
+#ifdef IDZEBRA_STATIC_GRS_SGML
     recTypeClass_add (&rts, idzebra_filter_grs_sgml, nmem, 0);
+#endif
 #ifdef IDZEBRA_STATIC_TEXT
     recTypeClass_add (&rts, idzebra_filter_text, nmem, 0);
 #endif
@@ -101,6 +107,7 @@ RecTypeClass recTypeClass_create (Res res, NMEM nmem)
     recTypeClass_add (&rts, idzebra_filter_safari, nmem, 0);
 #endif
 
+#if HAVE_DLFCN_H
     if (module_path)
     {
        DIR *dir = opendir(module_path);
@@ -146,6 +153,7 @@ RecTypeClass recTypeClass_create (Res res, NMEM nmem)
            closedir(dir);
        }
     }
+#endif
     return rts;
 }
 
@@ -180,8 +188,10 @@ void recTypeClass_destroy(RecTypeClass rtc)
 {
     for (; rtc; rtc = rtc->next)
     {
+#if HAVE_DLFCN_H
        if (rtc->module_handle)
            dlclose(rtc->module_handle);
+#endif
     }
 }