silcincludes.h -> silcincludes.h.in

[silc.git] / configure.in.pre

diff --git a/configure.in.pre b/configure.in.pre
index a9044806d458ccba531b2f9664e1af77425d9b59..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
 #
@@ -639,8 +639,11 @@ if test x$check_iconv = xtrue; then
         [
           echo "yes"
           AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-          has_iconv=true 
-          check_iconv=true 
+          has_iconv=true
+          check_iconv=false
+        ],
+        [
+          echo "no"
         ])
      ])
 fi
@@ -690,6 +693,7 @@ if test x$check_iconv = xtrue; then
               AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
             ],
             [
+              echo "no"
               has_iconv=false
             ])
          ])
@@ -732,7 +736,7 @@ if test x$has_iconv = xtrue; then
     )
 
   if test x$ac_iconv_good = xno; then
-    AC_MSG_ERROR(Try using libiconv instead.)
+    AC_MSG_RESULT(Try using libiconv instead.)
   fi
 fi
 
@@ -963,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" ||
@@ -998,6 +1003,9 @@ win32/libsilcclient/Makefile
 )
 fi
 
+# Use our configuration in compilation
+CFLAGS="-DHAVE_SILCDEFS_H $CFLAGS"
+
 AC_OUTPUT
 
 s_bindir=`eval echo $bindir`;s_bindir=`eval echo $s_bindir`