From 06d4e3b42d836b762c29cdc9dc7181caf14dcdec Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 3 Feb 1999 09:48:00 +0000
Subject: 990203

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 configure.in | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 55e74155e5..ca9ae1b7c3 100644
--- a/configure.in
+++ b/configure.in
@@ -99,6 +99,7 @@ AC_PROG_MAKE_SET
 AC_MINIX
 
 AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(void*)
 AC_CHECK_SIZEOF(float)
@@ -114,6 +115,12 @@ if test "$rb_cv_have_prototypes" = yes; then
   AC_DEFINE(HAVE_PROTOTYPES)
 fi
 
+AC_MSG_CHECKING(token paste string)
+AC_TRY_COMPILE([#define paste(a,b) a##b],
+[ int xy = 1; return paste(x,y);],
+AC_DEFINE(TOKEN_PASTE(x,y),[x##y])   AC_MSG_RESULT(ANSI),
+AC_DEFINE(TOKEN_PASTE(x,y),[x/**/y]) AC_MSG_RESULT(KnR1))
+
 AC_MSG_CHECKING(for variable length prototypes and stdarg.h)
 AC_CACHE_VAL(rb_cv_stdarg,
   [AC_TRY_COMPILE([
@@ -356,14 +363,14 @@ if test "$with_dln_a_out" != yes; then
     rhapsody*)	;;
     human*)	;;
     cygwin*)	CCDLFLAGS=-DDLLIMPORT;;
-    *) CCDLFLAGS=-fpic;;
+    *) CCDLFLAGS=-fPIC;;
     esac
   else
     case "$host_os" in
 	hpux*)		CCDLFLAGS='+z';;
-	solaris*|irix*)	CCDLFLAGS='-K pic' ;;
-	sunos*)		CCDLFLAGS='-pic' ;;
-	esix*|uxpds*)   CCDLFLAGS='-Kpic' ;;
+	solaris*|irix*)	CCDLFLAGS='-K PIC' ;;
+	sunos*)		CCDLFLAGS='-PIC' ;;
+	esix*|uxpds*)   CCDLFLAGS='-KPIC' ;;
 	*)		CCDLFLAGS='' ;;
     esac
   fi
@@ -391,7 +398,6 @@ if test "$with_dln_a_out" != yes; then
 	netbsd*) 	LDSHARED="ld -Bshareable"
 			rb_cv_dlopen=yes ;;
 	openbsd*) 	LDSHARED="ld -Bforcearchive -Bshareable"
-			CCDLFLAGS=-fPIC
 			rb_cv_dlopen=yes ;;
 	nextstep*)	LDSHARED='cc -r'
 			LDFLAGS="-u libsys_s"
-- 
cgit v1.2.3