Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Python extension hook support.

  • Loading branch information...
commit 7f60f31fa1d0ea9adfb4830c58341838069ce975 1 parent 70da382
Barry Schwartz authored
323 INSTALL
View
@@ -1,48 +1,80 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
+
Basic Installation
==================
- These are generic installation instructions.
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
- The file `configure.in' is used to create `configure' by a program
-called `autoconf'. You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
-The simplest way to compile this package is:
+ The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
@@ -51,62 +83,119 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. You can give `configure'
-initial values for variables by setting them in the environment. Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
- CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
-Or on systems that have the `env' program, you can do it like this:
- env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
- If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory. After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
Installation Names
==================
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-Optional Features
-=================
-
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -119,25 +208,75 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
- There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on. Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
CPU-COMPANY-SYSTEM
-See the file `config.sub' for the possible values of each field. If
+where SYSTEM can have one of these forms:
+
+ OS
+ KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
+need to know the machine type.
- If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
Sharing Defaults
================
@@ -150,19 +289,55 @@ default values for variables like `CC', `cache_file', and `prefix'.
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
-Operation Controls
+Defining Variables
==================
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
`configure' recognizes the following options to control how it
operates.
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
`--cache-file=FILE'
- Use and save the results of the tests in FILE instead of
- `./config.cache'. Set FILE to `/dev/null' to disable caching, for
- debugging `configure'.
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
-`--help'
- Print a summary of the options to `configure', and exit.
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
@@ -175,8 +350,16 @@ operates.
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
-`--version'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
-`configure' also accepts some other, not widely useful, options.
12 Makefile.am
View
@@ -1,20 +1,20 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = inc Unicode gutils
+
if GRAPHICAL_USER_INTERFACE
SUBDIRS += gdraw
endif GRAPHICAL_USER_INTERFACE
-SUBDIRS += fontforge po htdocs
+
+SUBDIRS += fontforge po htdocs $(subdirs)
pkgconfigdir = "${libdir}/pkgconfig"
-nodist_pkgconfig_DATA = fontforge.pc
+nodist_pkgconfig_DATA = fontforge.pc libfontforge.pc \
+ libfontforgeexe.pc
-EXTRA_DIST = LICENSE README-Mac.html README-MS.html README-unix \
+EXTRA_DIST = LICENSE README-Mac.html README-MS.html README-unix \
README-Unix.html Readme.VMS
-MOSTLYCLEANFILES = GNUmakefile GNUmakefile.preamble \
- GNUmakefile.postamble
-
3  Unicode/Makefile.am
View
@@ -9,6 +9,3 @@ libgunicode_la_CPPFLAGS = "-I$(top_builddir)/inc" \
libgunicode_la_LDFLAGS = $(MY_CFLAGS) $(MY_LIBS) -version-info \
"$(GUNI_VERSION):$(GUNI_REVISION):$(GUNI_AGE)"
-
-MOSTLYCLEANFILES = GNUmakefile GNUmakefile.preamble \
- GNUmakefile.postamble
38 configure.ac
View
@@ -46,13 +46,15 @@ PKG_PROG_PKG_CONFIG
AC_PATH_PROG([MSGFMT],[msgfmt])
FONTFORGE_ARG_ENABLE_REAL
-FONTFORGE_ARG_DISABLE_PYTHON_SCRIPTING
FONTFORGE_ARG_DISABLE([native-scripting],
[AS_HELP_STRING([--disable-native-scripting],[disable the legacy fontforge scripting language])],
[_NO_FFSCRIPT])
AM_CONDITIONAL([NATIVE_SCRIPTING],[test x"${i_do_have_native_scripting}" = xyes])
+FONTFORGE_ARG_DISABLE_PYTHON_SCRIPTING
+FONTFORGE_ARG_DISABLE_PYTHON_EXTENSION
+
AC_ARG_ENABLE([freetype-debugger],
[AS_HELP_STRING([--enable-freetype-debugger[[=DIR]]],
[use freetype's internal debugger within fontforge; requires source code of the
@@ -356,19 +358,44 @@ AC_CONFIG_FILES([fontforge/GNUmakefile.preamble fontforge/GNUmakefile.postamble]
AC_CONFIG_FILES([overall_common.mk])
AC_CONFIG_FILES([fontforge.pc])
+AC_CONFIG_FILES([libfontforge.pc])
+AC_CONFIG_FILES([libfontforgeexe.pc])
#AC_CONFIG_FILES([gtkui/Makefile])
#AC_CONFIG_FILES([plugins/Makefile])
-AC_CONFIG_COMMANDS_POST(
-[
+#--------------------------------------------------------------------------
+#
+# Configure the Python extension.
+#
+# The Python extension has its own configure script, so it can be
+# configured for an already installed libfontforge. Here, where we
+# want the extension configured for the libfontforge we are making
+# ourselves, the pkg-config settings for "libfontforge" are
+# overridden.
+
+if test x"${i_do_have_python_extension}" = xyes; then
+ export LIBFONTFORGE_CFLAGS
+ LIBFONTFORGE_CFLAGS="AS_ESCAPE([-I"$(top_srcdir)/../inc"])"
+
+ export LIBFONTFORGE_LIBS
+ LIBFONTFORGE_LIBS="AS_ESCAPE(["$(top_builddir)/../fontforge/libfontforge.la"])"
+
+ AC_CONFIG_SUBDIRS([pyhook])
+fi
+
+#--------------------------------------------------------------------------
+
+AC_OUTPUT
+
AC_MSG_NOTICE([
Summary of optional features:
real (floating pt) ${my_real_type}
- python scripting ${i_do_have_python_scripting}
native scripting ${i_do_have_native_scripting}
+ python scripting ${i_do_have_python_scripting}
+ python extension ${i_do_have_python_extension}
freetype debugger ${i_do_have_freetype_debugger}
capslock for alt ${i_do_have_capslock_for_alt}
raw points mode ${i_do_have_capslock_for_alt}
@@ -395,8 +422,5 @@ Summary of optional dependencies:
regular link ${i_do_have_regular_link}
gnustep-make ${with_gnustep_make}
])
-])
-
-AC_OUTPUT
#--------------------------------------------------------------------------
12 fontforge.pc.in
View
@@ -1,8 +1,12 @@
-# FIXME: Update this to the pkg-config file from my patch.
-
prefix=@prefix@
-exec_prefix=${prefix}
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+mandir=@mandir@
+localedir=@localedir@
Name: FontForge
-Description: Outline font editor.
+Description: an outline font editor.
Version: @VERSION@
13 fontforge/Makefile.am
View
@@ -52,11 +52,13 @@ libfontforge_la_CPPFLAGS = "-I$(top_builddir)/inc" \
"-I$(top_srcdir)/inc" "-DSHAREDIR=\"${pkgdatadir}\"" \
"-DDOCDIR=\"${docdir}\"" $(MY_CFLAGS)
-libfontforge_la_LIBADD = splinerefigure.lo ../Unicode/libgunicode.la \
- ../gutils/libgutils.la ../gutils/libgioftp.la
+libfontforge_la_LIBADD = splinerefigure.lo \
+ $(top_builddir)/Unicode/libgunicode.la \
+ $(top_builddir)/gutils/libgutils.la \
+ $(top_builddir)/gutils/libgioftp.la
if GRAPHICAL_USER_INTERFACE
-libfontforge_la_LIBADD += ../gdraw/libgdraw.la $(XINPUT_LIBS) \
- $(XKB_LIBS)
+libfontforge_la_LIBADD += $(top_builddir)/gdraw/libgdraw.la \
+ $(XINPUT_LIBS) $(XKB_LIBS)
endif GRAPHICAL_USER_INTERFACE
libfontforge_la_LDFLAGS = $(MY_CFLAGS) $(MY_LIBS) -version-info \
@@ -95,5 +97,4 @@ splinerefigure.lo: $(srcdir)/splinerefigure.c $(srcdir)/splinefont.h
EXTRA_DIST = fontimage.pe fontlint.pe sfddiff.pe libstamp.pre exelibstamp.pre
MOSTLYCLEANFILES = fontimage fontlint sfddiff libstamp.c \
- exelibstamp.c GNUmakefile GNUmakefile.preamble \
- GNUmakefile.postamble
+ exelibstamp.c
24 fontforge/common.mk
View
@@ -48,17 +48,19 @@ NODIST_LIBFFEXE_C_SRCFILES = exelibstamp.c
FF_C_SRCFILES = main.c
-# FIXME: Decide which of these to install.
-FF_H_SRCFILES = autowidth2.h ffpython.h nonlineartrans.h sfd1.h \
- autowidth.h fontforge.h ofl.h sflayoutP.h baseviews.h \
- fontforgeui.h PfEd.h sftextfieldP.h bezctx_ff.h fontforgevw.h \
- plugins.h splinefont.h bitmapcontrol.h fvmetrics.h print.h \
- stemdb.h configure-fontforge.h groups.h psfont.h ttf.h delta.h \
- import.h savefont.h ttfinstrs.h edgelist2.h libffstamp.h \
- scriptfuncs.h uiinterface.h edgelist.h lookups.h scripting.h \
- unicoderange.h encoding.h mm.h sd.h views.h fffreetype.h \
- namehash.h search.h usermenu.h
+FF_H_SRCFILES = fontforgeui.h sftextfieldP.h configure-fontforge.h \
+ views.h
-INST_FF_H_SRCFILES =
+INST_FF_H_SRCFILES = autowidth2.h configure-fontforge.h fontforge.h \
+ libffstamp.h psfont.h stemdb.h autowidth.h delta.h \
+ fontforgevw.h lookups.h savefont.h ttf.h baseviews.h \
+ fvmetrics.h mm.h scriptfuncs.h ttfinstrs.h \
+ edgelist2.h namehash.h scripting.h \
+ uiinterface.h bezctx_ff.h edgelist.h groups.h \
+ nonlineartrans.h sd.h unicoderange.h bitmapcontrol.h encoding.h \
+ ofl.h search.h usermenu.h \
+ fffreetype.h PfEd.h sfd1.h \
+ ffpython.h import.h plugins.h sflayoutP.h \
+ print.h splinefont.h
FF_M_SRCFILES = gnustepappmain.m
3  fontforge/pixmaps/Makefile.am
View
@@ -12,7 +12,4 @@ $(srcdir)/png_list.mk: $(srcdir)/RUN_ME_TO_CHANGE_THE_PNGS.sh
EXTRA_DIST = RUN_ME_TO_CHANGE_THE_PNGS.sh $(srcdir)/png_list.mk
-MOSTLYCLEANFILES = GNUmakefile GNUmakefile.preamble \
- GNUmakefile.postamble
-
MAINTAINERCLEANFILES = $(srcdir)/png_list.mk
6 gdraw/Makefile.am
View
@@ -7,10 +7,8 @@ libgdraw_la_SOURCES = $(GDRAW_C_SRCFILES) $(GDRAW_H_SRCFILES)
libgdraw_la_CPPFLAGS = "-I$(top_builddir)/inc" "-I$(top_srcdir)/inc" \
$(MY_CFLAGS)
-libgdraw_la_LIBADD = ../Unicode/libgunicode.la ../gutils/libgutils.la
+libgdraw_la_LIBADD = $(top_builddir)/Unicode/libgunicode.la \
+ $(top_builddir)/gutils/libgutils.la
libgdraw_la_LDFLAGS = $(MY_CFLAGS) $(MY_LIBS) -version-info \
"$(GD_VERSION):$(GD_REVISION):$(GD_AGE)"
-
-MOSTLYCLEANFILES = GNUmakefile GNUmakefile.preamble \
- GNUmakefile.postamble
5 gutils/Makefile.am
View
@@ -10,12 +10,9 @@ libgutils_la_CPPFLAGS = "-I$(top_builddir)/inc" "-I$(top_srcdir)/inc" \
libgioftp_la_CPPFLAGS = "-I$(top_builddir)/inc" "-I$(top_srcdir)/inc" \
$(MY_CFLAGS)
-libgutils_la_LIBADD = ../Unicode/libgunicode.la
+libgutils_la_LIBADD = $(top_builddir)/Unicode/libgunicode.la
libgutils_la_LDFLAGS = $(MY_CFLAGS) $(MY_LIBS) -version-info \
"$(GUTL_VERSION):$(GUTL_REVISION):$(GUTL_AGE)"
libgioftp_la_LDFLAGS = $(MY_CFLAGS) $(MY_LIBS) -version-info \
"$(GFTP_VERSION):$(GFTP_REVISION):$(GFTP_AGE)"
-
-MOSTLYCLEANFILES = GNUmakefile GNUmakefile.preamble \
- GNUmakefile.postamble
3  htdocs/Makefile.am
View
@@ -11,7 +11,4 @@ nobase_doc_DATA = $(INSTALLED_DOC_LIST)
EXTRA_DIST = $(DOC_LIST) RUN_ME_TO_CHANGE_THE_DOCS.sh \
$(srcdir)/doc_list.mk
-MOSTLYCLEANFILES = GNUmakefile GNUmakefile.preamble \
- GNUmakefile.postamble
-
MAINTAINERCLEANFILES = $(srcdir)/doc_list.mk
8 inc/Makefile.am
View
@@ -1,4 +1,4 @@
-include_HEADERS = basics.h config.h gdraw.h gicons.h gkeysym.h \
- gresource.h intl.h chardata.h dynamic.h gfile.h gimage.h \
- gprogress.h gwidget.h ustring.h charset.h fileutil.h ggadget.h \
- gio.h gresedit.h gwwiconv.h utype.h
+pkginclude_HEADERS = basics.h chardata.h charset.h config.h dynamic.h \
+ fileutil.h gdraw.h gfile.h ggadget.h gicons.h gimage.h gio.h \
+ gkeysym.h gprogress.h gresedit.h gresource.h gwidget.h gwwiconv.h \
+ intl.h ustring.h utype.h
14 libfontforge.pc.in
View
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+mandir=@mandir@
+localedir=@localedir@
+
+Name: libfontforge
+Description: a font manipulation library.
+Version: @VERSION@
+Libs: -L${libdir} -lfontforge
+Cflags: -I${includedir}/fontforge
14 libfontforgeexe.pc.in
View
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+mandir=@mandir@
+localedir=@localedir@
+
+Name: libfontforgeexe
+Description: for embedding the FontForge UI in a program.
+Version: @VERSION@
+Libs: -L${libdir} -lfontforgeexe
+Cflags: -I${includedir}/fontforge
12 m4/fontforge_arg_enable.m4
View
@@ -41,6 +41,18 @@ fi
])
+dnl FONTFORGE_ARG_DISABLE_PYTHON_EXTENSION
+dnl --------------------------------------
+AC_DEFUN([FONTFORGE_ARG_DISABLE_PYTHON_EXTENSION],
+[
+AC_ARG_ENABLE([python-extension],
+ [AS_HELP_STRING([--disable-python-extension],
+ [do not build the Python extension modules "psMat" and "fontforge"])],
+ [i_do_have_python_extension="${enableval}"],
+ [i_do_have_python_extension=yes])
+])
+
+
dnl FONTFORGE_ARG_ENABLE_REAL
dnl -------------------------
AC_DEFUN([FONTFORGE_ARG_ENABLE_REAL],
3  po/Makefile.am
View
@@ -29,5 +29,4 @@ uninstall-local:
done)
EXTRA_DIST = $(PO_FILES)
-MOSTLYCLEANFILES = GNUmakefile GNUmakefile.preamble \
- GNUmakefile.postamble $(MO_FILES)
+MOSTLYCLEANFILES = $(MO_FILES)
3  po/mackeys/Makefile.am
View
@@ -20,5 +20,4 @@ uninstall-local:
done)
EXTRA_DIST = $(MACKEYS_PO_FILES)
-MOSTLYCLEANFILES = GNUmakefile GNUmakefile.preamble \
- GNUmakefile.postamble $(MACKEYS_MO_FILES)
+MOSTLYCLEANFILES = $(MACKEYS_MO_FILES)
15 pyhook/Makefile.am
View
@@ -0,0 +1,15 @@
+ACLOCAL_AMFLAGS = -I m4
+
+python_LTLIBRARIES = psMat.la fontforge.la
+
+psMat_la_SOURCES = psMatpyhook.c loadfontforge.h
+psMat_la_CPPFLAGS = -DLIBDIR='"$(libdir)"' $(PYTHON_CFLAGS) \
+ $(LIBFONTFORGE_CFLAGS)
+psMat_la_LDFLAGS = -module -shared -avoid-version
+psMat_la_LIBADD = $(LIBFONTFORGE_LIBS)
+
+fontforge_la_SOURCES = fontforgepyhook.c loadfontforge.h
+fontforge_la_CPPFLAGS = -DLIBDIR='"$(libdir)"' $(PYTHON_CFLAGS) \
+ $(LIBFONTFORGE_CFLAGS)
+fontforge_la_LDFLAGS = -module -shared -avoid-version
+fontforge_la_LIBADD = $(LIBFONTFORGE_LIBS)
43 pyhook/configure.ac
View
@@ -0,0 +1,43 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.68])
+AC_INIT([fontforge-python-extension],[9999-experimental],[fontforge-devel@lists.sourceforge.net])
+AC_CONFIG_SRCDIR([fontforgepyhook.c])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AM_INIT_AUTOMAKE([1.11.1 foreign silent-rules -Wall -Werror])
+AM_MAINTAINER_MODE([enable])
+AC_USE_SYSTEM_EXTENSIONS
+
+LT_INIT([dlopen])
+
+# Checks for programs.
+AC_PROG_AWK
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_CPP
+AC_PROG_CXX
+AC_PROG_OBJC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_MKDIR_P
+AC_PROG_SED
+AM_PATH_PYTHON([2.3])
+PKG_PROG_PKG_CONFIG
+
+# Checks for libraries.
+PKG_CHECK_MODULES([PYTHON],[python-"${PYTHON_VERSION}"])
+PKG_CHECK_MODULES([LIBFONTFORGE],[libfontforge])
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+
16 pyhook/loadfontforge.h
View
@@ -1,5 +1,5 @@
-#include "Python.h"
-#include "../inc/dynamic.h"
+#include <Python.h>
+#include <dynamic.h>
#if defined(__Mac)
# undef dlopen
@@ -10,8 +10,8 @@ PyMODINIT_FUNC ENTRY_POINT(void) {
void (*initer)(void);
if ( (lib = dlopen("libgunicode" SO_EXT,RTLD_LAZY))==NULL ) {
-#ifdef PREFIX
- lib = dlopen( PREFIX "/lib/" "libgunicode" SO_EXT,RTLD_LAZY);
+#ifdef LIBDIR
+ lib = dlopen( LIBDIR "libgunicode" SO_EXT,RTLD_LAZY);
#endif
}
if ( lib==NULL ) {
@@ -20,8 +20,8 @@ return;
}
if ( (lib = dlopen("libgutils" SO_EXT,RTLD_LAZY))==NULL ) {
-#ifdef PREFIX
- lib = dlopen( PREFIX "/lib/" "libgutils" SO_EXT,RTLD_LAZY);
+#ifdef LIBDIR
+ lib = dlopen( LIBDIR "libgutils" SO_EXT,RTLD_LAZY);
#endif
}
if ( lib==NULL ) {
@@ -30,8 +30,8 @@ return;
}
if ( (lib = dlopen("libfontforge" SO_EXT,RTLD_LAZY))==NULL ) {
-#ifdef PREFIX
- lib = dlopen( PREFIX "/lib/" "libfontforge" SO_EXT,RTLD_LAZY);
+#ifdef LIBDIR
+ lib = dlopen( LIBDIR "/lib/" "libfontforge" SO_EXT,RTLD_LAZY);
#endif
}
if ( lib==NULL ) {
Please sign in to comment.
Something went wrong with that request. Please try again.