X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure.in;h=1d54f7efd7b4571e554159916596fbffb4bc58bf;hb=1b1241a3e0494a4f57e83949df3e02aa7be1f122;hp=0649c4f2f685548943878eaea110b41637f637fa;hpb=5e3d3710e142cd957b8ad112940f10efd54f291b;p=chise%2Fchise-base.git

diff --git a/configure.in b/configure.in
index 0649c4f..1d54f7e 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(chise-base, 0.25, chise-en@m17n.org)
 AC_CANONICAL_TARGET
 
 # Checks for programs.
-# AC_PROG_CC
+AC_PROG_CC
 # AC_PROG_LIBTOOL
 #  AC_CHECK_PROGS(LIBTOOL, glibtool libtool, libtool, \
 #  	/usr/local/bin:/opt/bin:/sw/bin:/usr/bin:/bin)
@@ -30,7 +30,8 @@ fi
 
 xemacs_configure_args=`echo $ac_configure_args \
 			| sed 's/--with-site-includes/--site-includes/' \
-			| sed 's/--with-site-libraries/--site-libraries/'`
+			| sed 's/--with-site-libraries/--site-libraries/' \
+			| sed "s/'CC=/'--compiler=/"`
 
 # Settings for optional paths
 AC_ARG_WITH(site_includes,
@@ -86,6 +87,20 @@ if test x"$with_canna" != x"no"; then
    xemacs_opts="$xemacs_opts --with-canna")
 fi
 
+os_name=`uname -s`
+mac_product_name=`sw_vers |grep ProductName|cut -f2`
+mac_product_version=`sw_vers |grep ProductVersion|cut -f2`
+mac_product_major_version=`echo $mac_product_version|cut -d'.' -f1`
+mac_product_minor_version=`echo $mac_product_version|cut -d'.' -f2`
+
+if test "$os_name" = "Darwin" -a \
+   	"$mac_product_name" = "Mac OS X" -a \
+ 	$mac_product_major_version -eq 10 -a \
+     	$mac_product_minor_version -ge 7
+then
+   xemacs_opts="$xemacs_opts '--ldflags=-Wl,-no_pie'"
+fi
+
 # Checks for header files.
 
 # Checks for typedefs, structures, and compiler characteristics.