diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-07-24 19:42:48 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-07-24 19:42:48 +0000 |
| commit | ebbf349278d1584843ddacce3e397f110b851135 (patch) | |
| tree | 06f626737abdc2a7a8513e8ae291ad9e00bc583f /pango/Makefile.am | |
| parent | fd8ee1c032d688a9d87b9355fe3ef1b01a9f95f5 (diff) | |
| download | pango-ebbf349278d1584843ddacce3e397f110b851135.tar.gz | |
Remove vestiges of support for external fribidi library.
Thu Jul 24 15:37:16 2003 Owen Taylor <otaylor@redhat.com>
* configure.in pango/Makefile.am pango.pc.in: Remove
vestiges of support for external fribidi library.
Diffstat (limited to 'pango/Makefile.am')
| -rw-r--r-- | pango/Makefile.am | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index ad7b4efe..bfe87958 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -8,12 +8,7 @@ if HAVE_FREETYPE OPENTYPE_SUBDIR=opentype endif -if HAVE_FRIBIDI -else -FRIBIDI_SUBDIR = mini-fribidi -endif - -SUBDIRS = $(OPENTYPE_SUBDIR) $(FRIBIDI_SUBDIR) +SUBDIRS = $(OPENTYPE_SUBDIR) mini-fribidi DIST_SUBDIRS = mini-fribidi opentype @@ -45,10 +40,7 @@ endif lib_LTLIBRARIES = libpango-1.0.la libpango_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined) -libpango_1_0_la_LIBADD = $(GLIB_LIBS) -if !HAVE_FRIBIDI -libpango_1_0_la_LIBADD += mini-fribidi/libmini-fribidi.la -endif +libpango_1_0_la_LIBADD = $(GLIB_LIBS) mini-fribidi/libmini-fribidi.la if OS_WIN32 libpango_1_0_la_LDFLAGS += -export-symbols pango.def |