Make autoconf use correct options to build solaris shared libraries

[fontconfig.git] / configure.in

diff --git a/configure.in b/configure.in
index c98fff9f3e1628bb136bab973cb44e4194386b95..93b625c3abbfaf100c052d748f6ad93aff137ea9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl
-dnl $XFree86: xc/lib/fontconfig/configure.in,v 1.3 2002/05/21 17:48:15 keithp Exp $
+dnl $XFree86: xc/lib/fontconfig/configure.in,v 1.5 2002/05/24 05:19:30 keithp Exp $
 dnl
 dnl Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
 dnl
@@ -29,7 +29,7 @@ AC_CONFIG_HEADER(config.h)
 
 AC_ARG_WITH(freetype_includes, [  --with-freetype-includes=DIR  Use FreeType includes in DIR], freetype_includes=$withval, freetype_includes=yes)
 AC_ARG_WITH(freetype_lib,      [  --with-freetype-lib=DIR       Use FreeType library in DIR], freetype_lib=$withval, freetype_lib=yes)
-AC_ARG_WITH(freetype_config,   [  --with-freeetype-config=PROG  Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
+AC_ARG_WITH(freetype_config,   [  --with-freetype-config=PROG   Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
 AC_ARG_WITH(expat,             [  --with-expat=DIR              Use Expat in DIR instead of xml2], expat=$withval, expat=maybe)
 AC_ARG_WITH(expat_includes,    [  --with-expat-includes=DIR     Use Expat includes in DIR], expat_includes=$withval, expat_includes=yes)
 AC_ARG_WITH(expat_lib,         [  --with-expat-lib=DIR          Use Expat library in DIR], expat_lib=$withval, expat_lib=yes)
@@ -81,10 +81,21 @@ if test "$GCC" = "yes"; then
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC -DPIC'
 else
+    AC_CANONICAL_HOST
+    
     MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-    DSO_LDOPTS='-shared -h $@'
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-KPIC -DPIC'
+    
+    case "$host" in
+    *solaris*)
+       DSO_LDOPTS='-G -z text -z defs -h $@'
+       LIBS="$LIBS -lc"
+       ;;
+    *)
+       DSO_LDOPTS='-shared -h $@'
+       ;;
+    esac
 fi
 
 AC_SUBST(MKSHLIB)