Fixed `#include' descriptions for system independent and create `sysdep.h'.

diff --git a/kagecgi/README.en b/kagecgi/README.en
index 26f7f5a..eadee3d 100644 (file)
--- a/kagecgi/README.en
+++ b/kagecgi/README.en
@@ -6,9 +6,9 @@ PREREQUISITES
 
 KAGE/cgi needs following librarys:
 
- - Berkely DB 2 (3 is not supported yet)
+ - Berkely DB 1or2 (3 is not supported yet)
  - libpng
- - glib
+ - glib2.0
  - xlib
 
 
@@ -18,6 +18,7 @@ CONFIGURATION
 Please edit `Makefile' fit with your environment.
 
 
+
 RUNNING MAKE
 ============
 

diff --git a/kagecgi/kage.h b/kagecgi/kage.h
index 9bc33dc..ee352c7 100755 (executable)
--- a/kagecgi/kage.h
+++ b/kagecgi/kage.h
@@ -1,8 +1,7 @@
 //kage.h\r
 //\r
-#include <X11/Xlib.h>\r
-#include <X11/Xutil.h>\r
-#include <math.h>\r
+\r
+#include "sysdep.h"\r
 \r
 #ifndef _KAGE_H_\r
 #define _KAGE_H_\r

diff --git a/kagecgi/kagecgi.c b/kagecgi/kagecgi.c
index 385aab5..93f74c9 100755 (executable)
--- a/kagecgi/kagecgi.c
+++ b/kagecgi/kagecgi.c
@@ -1,12 +1,9 @@
 //kagecgi.c\r
 //\r
 \r
-#include <stdio.h>\r
-#include <stdlib.h>\r
-#include <png.h>\r
-#include <glib.h>\r
 #include "kage.h"\r
 #include "kagecgi.h"\r
+#include "sysdep.h"\r
 \r
 int main(int argc, char *argv[]){\r
        GString *tmp1, *tmp2, *test1, *test2, *filename;\r

diff --git a/kagecgi/kagecgi.h b/kagecgi/kagecgi.h
index 36dad00..9202cb2 100755 (executable)
--- a/kagecgi/kagecgi.h
+++ b/kagecgi/kagecgi.h
@@ -1,12 +1,8 @@
 //kagecgi.h\r
 //\r
 \r
-#include <db1/db.h>\r
-//#include <db2/db_185.h>\r
-\r
-#include <png.h>\r
-#include <glib.h>\r
 #include "kage.h"\r
+#include "sysdep.h"\r
 \r
 #ifndef _KAGECGI_H_\r
 #define _KAGECGI_H_\r

diff --git a/kagecgi/kagechar.c b/kagecgi/kagechar.c
index daa2d25..7cb65e8 100755 (executable)
--- a/kagecgi/kagechar.c
+++ b/kagecgi/kagechar.c
@@ -1,10 +1,9 @@
 //kagechar.c\r
 //\r
 \r
-#include <glib.h>\r
-#include <stdlib.h>\r
-#include "kagecgi.h"\r
 #include "kage.h"\r
+#include "kagecgi.h"\r
+#include "sysdep.h"\r
 \r
 int isIDS(const GString *in){\r
        //check IDC "u2ff*"\r

diff --git a/kagecgi/kagecomb.c b/kagecgi/kagecomb.c
index d90f0e0..7227d53 100755 (executable)
--- a/kagecgi/kagecomb.c
+++ b/kagecgi/kagecomb.c
@@ -1,10 +1,9 @@
 //kagecomb.c\r
 //\r
-#include <glib.h>\r
-#include <math.h>\r
-#include <stdlib.h>\r
-#include "kagecgi.h"\r
+\r
 #include "kage.h"\r
+#include "kagecgi.h"\r
+#include "sysdep.h"\r
 \r
 void combineYoko2(const GString *parts1, const GString *parts3, int *result){\r
     int f, g, h, i, j, k, l;\r

diff --git a/kagecgi/kagedb.c b/kagecgi/kagedb.c
index 21cd2ba..9254227 100755 (executable)
--- a/kagecgi/kagedb.c
+++ b/kagecgi/kagedb.c
@@ -1,13 +1,9 @@
 //kagedb.c\r
 //\r
 \r
-#include <db1/db.h>\r
-//#include <db2/db_185.h>\r
-\r
-#include <sys/fcntl.h>\r
-#include <glib.h>\r
-#include "kagecgi.h"\r
 #include "kage.h"\r
+#include "kagecgi.h"\r
+#include "sysdep.h"\r
 \r
 int initDB(){\r
        kDatabase = dbopen(databaseFileName, O_RDWR|O_CREAT, 0666, DB_HASH, NULL);\r

diff --git a/kagecgi/kageeg.c b/kagecgi/kageeg.c
index 7fb3613..6389bbe 100755 (executable)
--- a/kagecgi/kageeg.c
+++ b/kagecgi/kageeg.c
@@ -1,13 +1,9 @@
 //kageeg.c\r
 //\r
 \r
-#include <db1/db.h>\r
-//#include <db2/db_185.h>\r
-\r
-#include <glib.h>\r
-#include <stdlib.h>\r
-#include "kagecgi.h"\r
 #include "kage.h"\r
+#include "kagecgi.h"\r
+#include "sysdep.h"\r
 \r
 void generateGlyphByIDS(const GString *in, GString *out, int flag){\r
        GString *tmp1, *tmp2, *tmp3, *tmp4;\r

diff --git a/kagecgi/kagepng.c b/kagecgi/kagepng.c
index 7080bb7..5f11ef2 100755 (executable)
--- a/kagecgi/kagepng.c
+++ b/kagecgi/kagepng.c
@@ -1,9 +1,7 @@
 //kagepng.c
 //
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <png.h>
+#include "sysdep.h"
 
 png_bytepp initPng(int width, int height){
        png_bytepp image;

diff --git a/kagecgi/kagepoly.c b/kagecgi/kagepoly.c
index 358148e..571ca15 100755 (executable)
--- a/kagecgi/kagepoly.c
+++ b/kagecgi/kagepoly.c
@@ -1,10 +1,9 @@
 // kagepoly.c\r
 //\r
 \r
-#include <stdio.h>\r
-#include <stdlib.h>\r
-#include "kagecgi.h"\r
 #include "kage.h"\r
+#include "kagecgi.h"\r
+#include "sysdep.h"\r
 \r
 void fillPolygon(struct kPoint *p, int number, int col, unsigned char **image){\r
        int i, ix, iy;\r

diff --git a/kagecgi/kagetool.c b/kagecgi/kagetool.c
index 91cacdf..8254e05 100755 (executable)
--- a/kagecgi/kagetool.c
+++ b/kagecgi/kagetool.c
@@ -3,8 +3,7 @@
 \r
 #include "kage.h"\r
 #include "kagecgi.h"\r
-#include <stdlib.h>\r
-#include <png.h>\r
+#include "sysdep.h"\r
 \r
 void DotsWidth(int *dlx, int *drx){\r
        int i, j;\r