Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move to having libspiro live in its own package

  • Loading branch information...
commit 4a46a2f94afe37a66d16cdab87aa6d8cdfc62148 1 parent ea6ef19
George Williams authored
View
15 Makefile.dynamic.in
@@ -39,6 +39,7 @@ clean:
( cd gdraw ; $(MAKE) clean )
( cd plugins ; $(MAKE) clean )
-( cd po ; rm *.mo )
+ -( cd pyhook ; rm -rf build dist )
-rm -rf .libs
distclean cleaner:
@@ -47,6 +48,7 @@ distclean cleaner:
( cd gdraw ; $(MAKE) distclean )
( cd plugins ; $(MAKE) distclean )
-( cd po ; rm *.mo Makefile* )
+ -( cd pyhook ; rm -rf build dist setup.py )
-rm -rf .libs
-rm Makefile config.cache config.log config.status libtool fontforge.pc systemspecific
@@ -74,8 +76,7 @@ install_docs:
install_po:
( cd po ; make install )
-install: $(DESTDIR)$(sharedir) all install_libs install_po
-# You may need to be root to do the install
+install_prog:
mkdir -p $(DESTDIR)$(bindir)
mkdir -p $(DESTDIR)$(mandir)/man1
mkdir -p $(DESTDIR)$(sharedir)
@@ -94,12 +95,22 @@ install: $(DESTDIR)$(sharedir) all install_libs install_po
$(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(DESTDIR)$(mandir)/man1
$(INSTALL_DATA) $(srcdir)/fontforge/fontimage.1 $(DESTDIR)$(mandir)/man1
$(INSTALL_DATA) $(srcdir)/fontforge/fontlint.1 $(DESTDIR)$(mandir)/man1
+
+install: $(DESTDIR)$(sharedir) all install_libs install_po install_prog
+# You may need to be root to do the install
#explicit use of sh to make sure we don't invoke csh with different "if" syntax
sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; fi"
sh < systemspecific
#we don't always create a setup.py
-(cd pyhook ; python setup.py install )
+install_py: $(DESTDIR)$(sharedir) all install_libs install_po install_prog
+# You may need to be root to do the install
+#explicit use of sh to make sure we don't invoke csh with different "if" syntax
+ sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; fi"
+ sh < systemspecific
+ -(cd pyhook ; python setup.py bdist --formats=gztar ; cp dist/fontforge-*.tar.gz $(DESTDIR)/tmp )
+
uninstall:
-rm $(DESTDIR)$(bindir)/fontforge
-rm $(DESTDIR)$(bindir)/sfddiff
View
319 configure
@@ -20274,6 +20274,226 @@ _ACEOF
fi
+echo "$as_me:$LINENO: checking for TaggedSpiroCPsToBezier in -lspiro" >&5
+echo $ECHO_N "checking for TaggedSpiroCPsToBezier in -lspiro... $ECHO_C" >&6
+if test "${ac_cv_lib_spiro_TaggedSpiroCPsToBezier+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lspiro $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char TaggedSpiroCPsToBezier ();
+int
+main ()
+{
+TaggedSpiroCPsToBezier ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_spiro_TaggedSpiroCPsToBezier=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_spiro_TaggedSpiroCPsToBezier=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_spiro_TaggedSpiroCPsToBezier" >&5
+echo "${ECHO_T}$ac_cv_lib_spiro_TaggedSpiroCPsToBezier" >&6
+if test $ac_cv_lib_spiro_TaggedSpiroCPsToBezier = yes; then
+ :
+else
+ cat >>confdefs.h <<\_ACEOF
+#define _NO_LIBSPIRO 1
+_ACEOF
+
+fi
+
+if test "${ac_cv_header_spiroentrypoints_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for spiroentrypoints.h" >&5
+echo $ECHO_N "checking for spiroentrypoints.h... $ECHO_C" >&6
+if test "${ac_cv_header_spiroentrypoints_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_spiroentrypoints_h" >&5
+echo "${ECHO_T}$ac_cv_header_spiroentrypoints_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking spiroentrypoints.h usability" >&5
+echo $ECHO_N "checking spiroentrypoints.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <spiroentrypoints.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking spiroentrypoints.h presence" >&5
+echo $ECHO_N "checking spiroentrypoints.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <spiroentrypoints.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for spiroentrypoints.h" >&5
+echo $ECHO_N "checking for spiroentrypoints.h... $ECHO_C" >&6
+if test "${ac_cv_header_spiroentrypoints_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_spiroentrypoints_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_spiroentrypoints_h" >&5
+echo "${ECHO_T}$ac_cv_header_spiroentrypoints_h" >&6
+
+fi
+if test $ac_cv_header_spiroentrypoints_h = yes; then
+ :
+else
+ cat >>confdefs.h <<\_ACEOF
+#define _NO_LIBSPIRO 1
+_ACEOF
+
+fi
+
+
case "$host" in
*-pc-cygwin*)
echo "$as_me:$LINENO: checking for xmlParseFile in -lxml2" >&5
@@ -24293,6 +24513,105 @@ fi
fi
+ if test "$ac_cv_lib_spiro_TaggedSpiroCPsToBezier" = "yes"; then
+
+ echo "$as_me:$LINENO: checking for /lib/libspiro.la" >&5
+echo $ECHO_N "checking for /lib/libspiro.la... $ECHO_C" >&6
+if test "${ac_cv_file__lib_libspiro_la+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/lib/libspiro.la"; then
+ ac_cv_file__lib_libspiro_la=yes
+else
+ ac_cv_file__lib_libspiro_la=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__lib_libspiro_la" >&5
+echo "${ECHO_T}$ac_cv_file__lib_libspiro_la" >&6
+if test $ac_cv_file__lib_libspiro_la = yes; then
+ :
+else
+
+ echo "$as_me:$LINENO: checking for /usr/lib/libspiro.la" >&5
+echo $ECHO_N "checking for /usr/lib/libspiro.la... $ECHO_C" >&6
+if test "${ac_cv_file__usr_lib_libspiro_la+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/lib/libspiro.la"; then
+ ac_cv_file__usr_lib_libspiro_la=yes
+else
+ ac_cv_file__usr_lib_libspiro_la=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_lib_libspiro_la" >&5
+echo "${ECHO_T}$ac_cv_file__usr_lib_libspiro_la" >&6
+if test $ac_cv_file__usr_lib_libspiro_la = yes; then
+ :
+else
+
+ echo "$as_me:$LINENO: checking for /usr/local/lib/libspiro.la" >&5
+echo $ECHO_N "checking for /usr/local/lib/libspiro.la... $ECHO_C" >&6
+if test "${ac_cv_file__usr_local_lib_libspiro_la+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/local/lib/libspiro.la"; then
+ ac_cv_file__usr_local_lib_libspiro_la=yes
+else
+ ac_cv_file__usr_local_lib_libspiro_la=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_lib_libspiro_la" >&5
+echo "${ECHO_T}$ac_cv_file__usr_local_lib_libspiro_la" >&6
+if test $ac_cv_file__usr_local_lib_libspiro_la = yes; then
+ :
+else
+
+ echo "$as_me:$LINENO: checking for /usr/X11R6/lib/libspiro.la" >&5
+echo $ECHO_N "checking for /usr/X11R6/lib/libspiro.la... $ECHO_C" >&6
+if test "${ac_cv_file__usr_X11R6_lib_libspiro_la+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/X11R6/lib/libspiro.la"; then
+ ac_cv_file__usr_X11R6_lib_libspiro_la=yes
+else
+ ac_cv_file__usr_X11R6_lib_libspiro_la=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_X11R6_lib_libspiro_la" >&5
+echo "${ECHO_T}$ac_cv_file__usr_X11R6_lib_libspiro_la" >&6
+if test $ac_cv_file__usr_X11R6_lib_libspiro_la = yes; then
+ :
+else
+ STATIC_LIBS="$STATIC_LIBS -lspiro" ; cat >>confdefs.h <<\_ACEOF
+#define _STATIC_LIBSPIRO 1
+_ACEOF
+
+fi
+
+fi
+
+fi
+
+fi
+
+
+ fi
if test "$ac_cv_lib_jpeg_jpeg_CreateDecompress" = "yes"; then
echo "$as_me:$LINENO: checking for /lib/libjpeg.la" >&5
View
319 configure.dynamic
@@ -20274,6 +20274,226 @@ _ACEOF
fi
+echo "$as_me:$LINENO: checking for TaggedSpiroCPsToBezier in -lspiro" >&5
+echo $ECHO_N "checking for TaggedSpiroCPsToBezier in -lspiro... $ECHO_C" >&6
+if test "${ac_cv_lib_spiro_TaggedSpiroCPsToBezier+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lspiro $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char TaggedSpiroCPsToBezier ();
+int
+main ()
+{
+TaggedSpiroCPsToBezier ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_spiro_TaggedSpiroCPsToBezier=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_spiro_TaggedSpiroCPsToBezier=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_spiro_TaggedSpiroCPsToBezier" >&5
+echo "${ECHO_T}$ac_cv_lib_spiro_TaggedSpiroCPsToBezier" >&6
+if test $ac_cv_lib_spiro_TaggedSpiroCPsToBezier = yes; then
+ :
+else
+ cat >>confdefs.h <<\_ACEOF
+#define _NO_LIBSPIRO 1
+_ACEOF
+
+fi
+
+if test "${ac_cv_header_spiroentrypoints_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for spiroentrypoints.h" >&5
+echo $ECHO_N "checking for spiroentrypoints.h... $ECHO_C" >&6
+if test "${ac_cv_header_spiroentrypoints_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_spiroentrypoints_h" >&5
+echo "${ECHO_T}$ac_cv_header_spiroentrypoints_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking spiroentrypoints.h usability" >&5
+echo $ECHO_N "checking spiroentrypoints.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <spiroentrypoints.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking spiroentrypoints.h presence" >&5
+echo $ECHO_N "checking spiroentrypoints.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <spiroentrypoints.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for spiroentrypoints.h" >&5
+echo $ECHO_N "checking for spiroentrypoints.h... $ECHO_C" >&6
+if test "${ac_cv_header_spiroentrypoints_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_spiroentrypoints_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_spiroentrypoints_h" >&5
+echo "${ECHO_T}$ac_cv_header_spiroentrypoints_h" >&6
+
+fi
+if test $ac_cv_header_spiroentrypoints_h = yes; then
+ :
+else
+ cat >>confdefs.h <<\_ACEOF
+#define _NO_LIBSPIRO 1
+_ACEOF
+
+fi
+
+
case "$host" in
*-pc-cygwin*)
echo "$as_me:$LINENO: checking for xmlParseFile in -lxml2" >&5
@@ -24293,6 +24513,105 @@ fi
fi
+ if test "$ac_cv_lib_spiro_TaggedSpiroCPsToBezier" = "yes"; then
+
+ echo "$as_me:$LINENO: checking for /lib/libspiro.la" >&5
+echo $ECHO_N "checking for /lib/libspiro.la... $ECHO_C" >&6
+if test "${ac_cv_file__lib_libspiro_la+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/lib/libspiro.la"; then
+ ac_cv_file__lib_libspiro_la=yes
+else
+ ac_cv_file__lib_libspiro_la=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__lib_libspiro_la" >&5
+echo "${ECHO_T}$ac_cv_file__lib_libspiro_la" >&6
+if test $ac_cv_file__lib_libspiro_la = yes; then
+ :
+else
+
+ echo "$as_me:$LINENO: checking for /usr/lib/libspiro.la" >&5
+echo $ECHO_N "checking for /usr/lib/libspiro.la... $ECHO_C" >&6
+if test "${ac_cv_file__usr_lib_libspiro_la+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/lib/libspiro.la"; then
+ ac_cv_file__usr_lib_libspiro_la=yes
+else
+ ac_cv_file__usr_lib_libspiro_la=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_lib_libspiro_la" >&5
+echo "${ECHO_T}$ac_cv_file__usr_lib_libspiro_la" >&6
+if test $ac_cv_file__usr_lib_libspiro_la = yes; then
+ :
+else
+
+ echo "$as_me:$LINENO: checking for /usr/local/lib/libspiro.la" >&5
+echo $ECHO_N "checking for /usr/local/lib/libspiro.la... $ECHO_C" >&6
+if test "${ac_cv_file__usr_local_lib_libspiro_la+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/local/lib/libspiro.la"; then
+ ac_cv_file__usr_local_lib_libspiro_la=yes
+else
+ ac_cv_file__usr_local_lib_libspiro_la=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_lib_libspiro_la" >&5
+echo "${ECHO_T}$ac_cv_file__usr_local_lib_libspiro_la" >&6
+if test $ac_cv_file__usr_local_lib_libspiro_la = yes; then
+ :
+else
+
+ echo "$as_me:$LINENO: checking for /usr/X11R6/lib/libspiro.la" >&5
+echo $ECHO_N "checking for /usr/X11R6/lib/libspiro.la... $ECHO_C" >&6
+if test "${ac_cv_file__usr_X11R6_lib_libspiro_la+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/X11R6/lib/libspiro.la"; then
+ ac_cv_file__usr_X11R6_lib_libspiro_la=yes
+else
+ ac_cv_file__usr_X11R6_lib_libspiro_la=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_X11R6_lib_libspiro_la" >&5
+echo "${ECHO_T}$ac_cv_file__usr_X11R6_lib_libspiro_la" >&6
+if test $ac_cv_file__usr_X11R6_lib_libspiro_la = yes; then
+ :
+else
+ STATIC_LIBS="$STATIC_LIBS -lspiro" ; cat >>confdefs.h <<\_ACEOF
+#define _STATIC_LIBSPIRO 1
+_ACEOF
+
+fi
+
+fi
+
+fi
+
+fi
+
+
+ fi
if test "$ac_cv_lib_jpeg_jpeg_CreateDecompress" = "yes"; then
echo "$as_me:$LINENO: checking for /lib/libjpeg.la" >&5
View
5 configure.dynamic.in
@@ -316,6 +316,8 @@ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, : ,AC_DEFINE(_NO_LIBJPEG))
AC_CHECK_HEADER(jpeglib.h, : , AC_DEFINE(_NO_LIBJPEG))
AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
AC_CHECK_HEADER(tiffio.h, : , AC_DEFINE(_NO_LIBTIFF))
+AC_CHECK_LIB(spiro, TaggedSpiroCPsToBezier, : ,AC_DEFINE(_NO_LIBSPIRO))
+AC_CHECK_HEADER(spiroentrypoints.h, : , AC_DEFINE(_NO_LIBSPIRO))
case "$host" in
*-pc-cygwin*)
AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML), [-liconv -lz])
@@ -558,6 +560,9 @@ case "$host" in
if test "$ac_cv_lib_tiff_TIFFOpen" = "yes"; then
AC_CHECK_LIB_LA(tiff, :, [ STATIC_LIBS="$STATIC_LIBS -ltiff" ; AC_DEFINE(_STATIC_LIBTIFF)])
fi
+ if test "$ac_cv_lib_spiro_TaggedSpiroCPsToBezier" = "yes"; then
+ AC_CHECK_LIB_LA(spiro, :, [ STATIC_LIBS="$STATIC_LIBS -lspiro" ; AC_DEFINE(_STATIC_LIBSPIRO)])
+ fi
if test "$ac_cv_lib_jpeg_jpeg_CreateDecompress" = "yes"; then
AC_CHECK_LIB_LA(jpeg, :, [ STATIC_LIBS="$STATIC_LIBS -ljpeg" ; AC_DEFINE(_STATIC_LIBJPEG)])
fi
View
5 configure.in
@@ -316,6 +316,8 @@ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, : ,AC_DEFINE(_NO_LIBJPEG))
AC_CHECK_HEADER(jpeglib.h, : , AC_DEFINE(_NO_LIBJPEG))
AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
AC_CHECK_HEADER(tiffio.h, : , AC_DEFINE(_NO_LIBTIFF))
+AC_CHECK_LIB(spiro, TaggedSpiroCPsToBezier, : ,AC_DEFINE(_NO_LIBSPIRO))
+AC_CHECK_HEADER(spiroentrypoints.h, : , AC_DEFINE(_NO_LIBSPIRO))
case "$host" in
*-pc-cygwin*)
AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML), [-liconv -lz])
@@ -558,6 +560,9 @@ case "$host" in
if test "$ac_cv_lib_tiff_TIFFOpen" = "yes"; then
AC_CHECK_LIB_LA(tiff, :, [ STATIC_LIBS="$STATIC_LIBS -ltiff" ; AC_DEFINE(_STATIC_LIBTIFF)])
fi
+ if test "$ac_cv_lib_spiro_TaggedSpiroCPsToBezier" = "yes"; then
+ AC_CHECK_LIB_LA(spiro, :, [ STATIC_LIBS="$STATIC_LIBS -lspiro" ; AC_DEFINE(_STATIC_LIBSPIRO)])
+ fi
if test "$ac_cv_lib_jpeg_jpeg_CreateDecompress" = "yes"; then
AC_CHECK_LIB_LA(jpeg, :, [ STATIC_LIBS="$STATIC_LIBS -ljpeg" ; AC_DEFINE(_STATIC_LIBJPEG)])
fi
View
227 configure.static
@@ -5585,6 +5585,226 @@ _ACEOF
fi
+echo "$as_me:$LINENO: checking for TaggedSpiroCPsToBezier in -lspiro" >&5
+echo $ECHO_N "checking for TaggedSpiroCPsToBezier in -lspiro... $ECHO_C" >&6
+if test "${ac_cv_lib_spiro_TaggedSpiroCPsToBezier+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lspiro $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char TaggedSpiroCPsToBezier ();
+int
+main ()
+{
+TaggedSpiroCPsToBezier ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_spiro_TaggedSpiroCPsToBezier=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_spiro_TaggedSpiroCPsToBezier=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_spiro_TaggedSpiroCPsToBezier" >&5
+echo "${ECHO_T}$ac_cv_lib_spiro_TaggedSpiroCPsToBezier" >&6
+if test $ac_cv_lib_spiro_TaggedSpiroCPsToBezier = yes; then
+ :
+else
+ cat >>confdefs.h <<\_ACEOF
+#define _NO_LIBSPIRO 1
+_ACEOF
+
+fi
+
+if test "${ac_cv_header_spiroentrypoints_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for spiroentrypoints.h" >&5
+echo $ECHO_N "checking for spiroentrypoints.h... $ECHO_C" >&6
+if test "${ac_cv_header_spiroentrypoints_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_spiroentrypoints_h" >&5
+echo "${ECHO_T}$ac_cv_header_spiroentrypoints_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking spiroentrypoints.h usability" >&5
+echo $ECHO_N "checking spiroentrypoints.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <spiroentrypoints.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking spiroentrypoints.h presence" >&5
+echo $ECHO_N "checking spiroentrypoints.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <spiroentrypoints.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: spiroentrypoints.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: spiroentrypoints.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for spiroentrypoints.h" >&5
+echo $ECHO_N "checking for spiroentrypoints.h... $ECHO_C" >&6
+if test "${ac_cv_header_spiroentrypoints_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_spiroentrypoints_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_spiroentrypoints_h" >&5
+echo "${ECHO_T}$ac_cv_header_spiroentrypoints_h" >&6
+
+fi
+if test $ac_cv_header_spiroentrypoints_h = yes; then
+ :
+else
+ cat >>confdefs.h <<\_ACEOF
+#define _NO_LIBSPIRO 1
+_ACEOF
+
+fi
+
+
if test "$gww_uselessiconv" = "no" ; then
@@ -8601,6 +8821,13 @@ _ACEOF
_ACEOF
fi
+ if test "$ac_cv_lib_spiro_TaggedSpiroCPsToBezier" = "yes" -a ! -e /usr/lib/libspiro.la; then
+ STATIC_LIBS="$STATIC_LIBS -lspiro"
+ cat >>confdefs.h <<\_ACEOF
+#define _STATIC_LIBSPIRO 1
+_ACEOF
+
+ fi
if test "$ac_cv_lib_jpeg_jpeg_CreateDecompress" = "yes" -a ! -e /usr/lib/libjpeg.la; then
STATIC_LIBS="$STATIC_LIBS -ljpeg"
cat >>confdefs.h <<\_ACEOF
View
6 configure.static.in
@@ -204,6 +204,8 @@ AC_CHECK_HEADER(jpeglib.h, : , AC_DEFINE(_NO_LIBJPEG))
AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
AC_CHECK_HEADER(tiffio.h, : , AC_DEFINE(_NO_LIBTIFF))
AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML), -lz -lm)
+AC_CHECK_LIB(spiro, TaggedSpiroCPsToBezier, : ,AC_DEFINE(_NO_LIBSPIRO))
+AC_CHECK_HEADER(spiroentrypoints.h, : , AC_DEFINE(_NO_LIBSPIRO))
if test "$gww_uselessiconv" = "no" ; then
AC_CHECK_HEADERS([iconv.h])
@@ -353,6 +355,10 @@ if test "$gww_nodynamic" = "yes"; then
STATIC_LIBS="$STATIC_LIBS -ltiff"
AC_DEFINE(_STATIC_LIBTIFF)
fi
+ if test "$ac_cv_lib_spiro_TaggedSpiroCPsToBezier" = "yes" -a ! -e /usr/lib/libspiro.la; then
+ STATIC_LIBS="$STATIC_LIBS -lspiro"
+ AC_DEFINE(_STATIC_LIBSPIRO)
+ fi
if test "$ac_cv_lib_jpeg_jpeg_CreateDecompress" = "yes" -a ! -e /usr/lib/libjpeg.la; then
STATIC_LIBS="$STATIC_LIBS -ljpeg"
AC_DEFINE(_STATIC_LIBJPEG)
View
36 fontforge/bezctx_ff.h
@@ -1,37 +1,5 @@
-#if 0
-# include "bezctx_intf.h"
-# include "bezctx.h"
-#else
-typedef struct _bezctx bezctx;
-
-bezctx *
-new_bezctx(void);
-
-void
-bezctx_moveto(bezctx *bc, double x, double y, int is_open);
-
-void
-bezctx_lineto(bezctx *bc, double x, double y);
-
-void
-bezctx_quadto(bezctx *bc, double x1, double y1, double x2, double y2);
-
-void
-bezctx_curveto(bezctx *bc, double x1, double y1, double x2, double y2,
- double x3, double y3);
-
-void
-bezctx_mark_knot(bezctx *bc, int knot_idx);
-
-struct _bezctx {
- void (*moveto)(bezctx *bc, double x, double y, int is_open);
- void (*lineto)(bezctx *bc, double x, double y);
- void (*quadto)(bezctx *bc, double x1, double y1, double x2, double y2);
- void (*curveto)(bezctx *bc, double x1, double y1, double x2, double y2,
- double x3, double y3);
- void (*mark_knot)(bezctx *bc, int knot_idx);
-};
-#endif
+#include "spiroentrypoints.h"
+#include "bezctx.h"
bezctx *new_bezctx_ff(void);
View
30 fontforge/spiro.c
@@ -30,7 +30,7 @@
/* Access to Raph Levien's spiro splines */
/* See http://www.levien.com/spiro/ */
-#ifdef NODYNAMIC
+#ifdef _NO_LIBSPIRO
int hasspiro(void) {
return(false);
}
@@ -45,12 +45,16 @@ return( NULL );
#else
# include <dynamic.h>
# include "bezctx_ff.h"
-# include "spiro_exports.h"
+# if defined(_STATIC_LIBSPIRO) || defined(NODYNAMIC)
+# define _TaggedSpiroCPsToBezier TaggedSpiroCPsToBezier
+
+static void initSpiro(void) {
+return( true );
+}
+# else
static DL_CONST void *libspiro;
-static spiro_seg *(*_run_spiro)(const spiro_cp *src, int n);
-static void (*_free_spiro)(spiro_seg *s);
-static void (*_spiro_to_bpath)(const spiro_seg *s, int n, bezctx *bc);
+static void (*_TaggedSpiroCPsToBezier)(spiro_cp *spiros,bezctx *bc);
static int inited = false, has_spiro = false;
static void initSpiro(void) {
@@ -74,14 +78,13 @@ return;
return;
}
- _run_spiro = (spiro_seg *(*)(const spiro_cp *src, int n)) dlsym(libspiro,"run_spiro");
- _free_spiro = (void (*)(spiro_seg *s)) dlsym(libspiro,"free_spiro");
- _spiro_to_bpath = (void (*)(const spiro_seg *s, int n, bezctx *bc)) dlsym(libspiro,"spiro_to_bpath");
- if ( _run_spiro==NULL || _free_spiro==NULL || _spiro_to_bpath==NULL ) {
+ _TaggedSpiroCPsToBezier = (void (*)(spiro_cp *spiros,bezctx *bc)) dlsym(libspiro,"TaggedSpiroCPsToBezier");
+ if ( _TaggedSpiroCPsToBezier==NULL ) {
LogError("Hmm. This system has a libspiro, but it doesn't contain the entry points\nfontforge needs. Must be something else.\n");
} else
has_spiro = true;
}
+#endif
int hasspiro(void) {
initSpiro();
@@ -106,7 +109,6 @@ return( NULL );
ss = chunkalloc(sizeof(SplineSet));
ss->first = ss->last = SplinePointCreate(spiros[0].x,spiros[0].y);
} else {
- spiro_seg *s;
bezctx *bc = new_bezctx_ff();
if ( spiros[0].ty=='{' ) {
lastty = spiros[n-1].ty;
@@ -114,17 +116,15 @@ return( NULL );
}
if ( !any )
- s = _run_spiro(spiros,n);
+ _TaggedSpiroCPsToBezier(spiros,bc);
else {
nspiros = galloc((n+1)*sizeof(spiro_cp));
memcpy(nspiros,spiros,(n+1)*sizeof(spiro_cp));
for ( n=0; nspiros[n].ty!=SPIRO_END; ++n )
nspiros[n].ty &= ~0x80;
- s = _run_spiro(nspiros,n);
+ _TaggedSpiroCPsToBezier(nspiros,bc);
free(nspiros);
}
- _spiro_to_bpath(s,n,bc);
- _free_spiro(s);
ss = bezctx_ff_close(bc);
if ( spiros[0].ty=='{' )
@@ -217,8 +217,6 @@ return( NULL );
for ( n=0; spiros[n].ty!='z'; ++n );
nspiros = galloc((n+1)*sizeof(spiro_cp));
memcpy(nspiros,spiros,(n+1)*sizeof(spiro_cp));
- for ( n=0; nspiros[n].ty!='z'; ++n )
- nspiros[n].ty &= ~0x80;
if ( _cnt != NULL ) *_cnt = n+1;
return( nspiros );
}
View
11 fontforge/spiro_exports.h
@@ -1,11 +0,0 @@
-
-typedef struct spiro_seg_s spiro_seg;
-
-spiro_seg *
-run_spiro(const spiro_cp *src, int n);
-
-void
-free_spiro(spiro_seg *s);
-
-void
-spiro_to_bpath(const spiro_seg *s, int n, bezctx *bc);
View
4 fontforge/stamp.c
@@ -1,5 +1,5 @@
#include <time.h>
-const time_t source_modtime = 1193602680;
-const char *source_modtime_str = "20:18 GMT 28-Oct-2007";
+const time_t source_modtime = 1193609109;
+const char *source_modtime_str = "22:05 GMT 28-Oct-2007";
const char *source_version_str = "20071028";
View
4 fonttools/showttf.c
@@ -2464,7 +2464,7 @@ static void gposPairSubTable(FILE *ttf, int which, int stoffset, struct ttfinfo
free(ps_offsets);
} else if ( subformat==2 ) {
printf( "\t Class based kerning (not displayed)\n" );
- PrintGlyphs( showCoverageTable(ttf,stoffset+coverage,cnt),info);
+ PrintGlyphs( showCoverageTable(ttf,stoffset+coverage,-1),info);
} else {
printf( "\t !!! unknown sub-table format !!!!\n" );
}
@@ -2501,7 +2501,7 @@ static void gposMarkToBaseSubTable(FILE *ttf, int which, int stoffset, struct tt
printf( "\t Mark Offset=%d\n", markoff = getushort(ttf));
printf( "\t Base Offset=%d\n", baseoff = getushort(ttf));
printf( "\t Mark Glyphs\n" );
- mglyphs = showCoverageTable(ttf,stoffset+mcoverage, classcnt);
+ mglyphs = showCoverageTable(ttf,stoffset+mcoverage, -1); /* Class cnt is not the count of marks */
printf( "\t Base Glyphs\n" );
bglyphs = showCoverageTable(ttf,stoffset+bcoverage, -1);
fseek(ttf,stoffset+baseoff,SEEK_SET);
Please sign in to comment.
Something went wrong with that request. Please try again.