silcincludes.h -> silcincludes.h.in

diff --git a/CHANGES b/CHANGES
index a525afe390eced28fa11ef5e077009e58674186f..a482f5aa66b5541e24d081b045e29d97be91e3e2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+Fri Nov  1 18:57:02 EET 2002  Pekka Riikonen <priikone@silcnet.org>
+
+       * Changed includes/silcincludes.h to silcincludes.h.in to
+         include configuration specific information.  The silcdefs.h
+         is not included in to installation anymore (it's only
+         compilation time header).
+
 Fri Nov  1 10:30:26 CET 2002  Pekka Riikonen <priikone@silcnet.org>
 
        * Moved the SilcClient and SilcClientConnection from client.h

diff --git a/acconfig.h.pre b/acconfig.h.pre
index bd9e10dadf3addaf70b10eaf8d1c5f6129d72cd6..ca82e2c58afa21b282d4e1cb8b54cfcff18916c1 100644 (file)
--- a/acconfig.h.pre
+++ b/acconfig.h.pre
@@ -37,14 +37,6 @@
 #undef HAVE_RTLD_NOW
 #undef HAVE_RTLD_LAZY
 
-/* Types */
-#undef SILC_SIZEOF_LONG_LONG
-#undef SILC_SIZEOF_LONG
-#undef SILC_SIZEOF_INT
-#undef SILC_SIZEOF_SHORT
-#undef SILC_SIZEOF_CHAR
-#undef SILC_SIZEOF_VOID_P
-
 /* MP library */
 #undef SILC_MP_GMP
 #undef SILC_MP_NSS_MPI

diff --git a/configure.in.pre b/configure.in.pre
index ab88a677afb0929e227edaf2a2c43f115a82fc1d..899177855fb9f7eb7dc18b388271e535a5498e18 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -92,17 +92,17 @@ AC_TYPE_UID_T
 AC_TYPE_PID_T
 
 AC_CHECK_SIZEOF(long long, 0)
-AC_DEFINE_UNQUOTED(SILC_SIZEOF_LONG_LONG, $ac_cv_sizeof_long_long)
+AC_SUBST(SILC_SIZEOF_LONG_LONG, $ac_cv_sizeof_long_long)
 AC_CHECK_SIZEOF(long, 0)
-AC_DEFINE_UNQUOTED(SILC_SIZEOF_LONG, $ac_cv_sizeof_long)
+AC_SUBST(SILC_SIZEOF_LONG, $ac_cv_sizeof_long)
 AC_CHECK_SIZEOF(int, 0)
-AC_DEFINE_UNQUOTED(SILC_SIZEOF_INT, $ac_cv_sizeof_int)
+AC_SUBST(SILC_SIZEOF_INT, $ac_cv_sizeof_int)
 AC_CHECK_SIZEOF(short, 0)
-AC_DEFINE_UNQUOTED(SILC_SIZEOF_SHORT, $ac_cv_sizeof_short)
+AC_SUBST(SILC_SIZEOF_SHORT, $ac_cv_sizeof_short)
 AC_CHECK_SIZEOF(char, 0)
-AC_DEFINE_UNQUOTED(SILC_SIZEOF_CHAR, $ac_cv_sizeof_char)
+AC_SUBST(SILC_SIZEOF_CHAR, $ac_cv_sizeof_char)
 AC_CHECK_SIZEOF(void *, 0)
-AC_DEFINE_UNQUOTED(SILC_SIZEOF_VOID_P, $ac_cv_sizeof_void_p)
+AC_SUBST(SILC_SIZEOF_VOID_P, $ac_cv_sizeof_void_p)
 
 # Function and library checking
 #
@@ -967,6 +967,7 @@ lib/silcutil/epoc/Makefile
 lib/silcsftp/Makefile
 lib/silcsftp/tests/Makefile
 doc/example_silcd.conf
+includes/silcincludes.h
 )
 
 if test "x$silc_dist" = "xsilc-client" ||

diff --git a/doc/Makefile.am.pre b/doc/Makefile.am.pre
index ce321a00b0a25ef403afad43e89ca7daaaaa587e..18fd585af8f35b776178c2ab3700b2cfff20013c 100644 (file)
--- a/doc/Makefile.am.pre
+++ b/doc/Makefile.am.pre
@@ -64,8 +64,9 @@ toolkit-ref-ps:
 
 toolkit-ref-pdf:
        -ps2pdf $(SILC_TOP_SRCDIR)/doc/toolkit.ps $(SILC_TOP_SRCDIR)/doc/toolkit.pdf
+endif
 
-dist-hook: toolkit-ref-html
+dist-hook:
        touch draft-riikonen-silc-spec-05.txt
        touch draft-riikonen-silc-pp-05.txt
        touch draft-riikonen-silc-ke-auth-05.txt
@@ -84,25 +85,7 @@ dist-hook: toolkit-ref-html
                draft-riikonen-silc-flags-payloads-00.txt
        $(makerfc) draft-riikonen-presence-attrs-00.nroff \
                draft-riikonen-presence-attrs-00.txt
-else
-dist-hook:
-       touch draft-riikonen-silc-spec-05.txt
-       touch draft-riikonen-silc-pp-05.txt
-       touch draft-riikonen-silc-ke-auth-05.txt
-       touch draft-riikonen-silc-commands-03.txt
-       touch draft-riikonen-silc-flags-payloads-00.txt
-       touch draft-riikonen-presence-attrs-00.txt
-       $(makerfc) draft-riikonen-silc-spec-05.nroff \
-               draft-riikonen-silc-spec-05.txt
-       $(makerfc) draft-riikonen-silc-pp-05.nroff \
-               draft-riikonen-silc-pp-05.txt
-       $(makerfc) draft-riikonen-silc-ke-auth-05.nroff \
-               draft-riikonen-silc-ke-auth-05.txt
-       $(makerfc) draft-riikonen-silc-commands-03.nroff \
-               draft-riikonen-silc-commands-03.txt
-       $(makerfc) draft-riikonen-presence-attrs-00.nroff \
-               draft-riikonen-presence-attrs-00.txt
-endif
+
 endif
 
 if SILC_DIST_TOOLKIT

diff --git a/includes/silcincludes.h b/includes/silcincludes.h.in
similarity index 94%
rename from includes/silcincludes.h
rename to includes/silcincludes.h.in
index ee0dfcfb670efb7d1438ee89ba9a2a37d12e433e..34baf790eaf395dd9ccb0bed981a851b376fa4fd 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h.in
@@ -64,6 +64,14 @@ extern "C" {
 #endif
 #endif
 
+/* Types */
+#define SILC_SIZEOF_LONG_LONG @SILC_SIZEOF_LONG_LONG@
+#define SILC_SIZEOF_LONG @SILC_SIZEOF_LONG@
+#define SILC_SIZEOF_INT @SILC_SIZEOF_INT@
+#define SILC_SIZEOF_SHORT @SILC_SIZEOF_SHORT@
+#define SILC_SIZEOF_CHAR @SILC_SIZEOF_CHAR@
+#define SILC_SIZEOF_VOID_P @SILC_SIZEOF_VOID_P@
+
 #if defined(HAVE_SILCDEFS_H)
 /* Automatically generated configuration header */
 #include "silcdefs.h"