Fix build with Sun Studio

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@113 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/simd/Makefile.am b/simd/Makefile.am
index e57c47729046dfa77fd814e3f21bea5856a272cd..a114c3716f59c3579d4b073848d4ed8b89f6d25c 100644 (file)
--- a/simd/Makefile.am
+++ b/simd/Makefile.am
@@ -55,5 +55,4 @@ AM_CPPFLAGS = -I$(top_srcdir)
        $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(NASM) $(NAFLAGS) -I$(srcdir) $< -o $@
 
 jsimdcfg.inc: $(srcdir)/jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h
-       $(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) ^[\;%] | sed 's%_cpp_protection_%%' > $@
-
+       $(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) "^[\;%]|^\ %" | sed 's%_cpp_protection_%%' | sed 's@% define@%define@g' > $@

diff --git a/simd/nasm_lt.sh b/simd/nasm_lt.sh
index b112862ac18370fec03ed0604985117c0f090821..7ba5253458a4d6f647ebe70b9f60a5977b4dab08 100755 (executable)
--- a/simd/nasm_lt.sh
+++ b/simd/nasm_lt.sh
@@ -5,7 +5,7 @@ o_opt=no
 pic=no
 while [ $# -gt 0 ]; do
     case "$1" in
-        -DPIC|-fPIC|-fpic)
+        -DPIC|-fPIC|-fpic|-Kpic|-KPIC)
             if [ "$pic" != "yes" ] ; then
                 command="$command -DPIC"
                 pic=yes