GNOME.org
 

[patch] compiling Pango w/o X

Hi,

the following patch makes Pango compile without having X installed.
Please review...


Salut, Sven

Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- Makefile.am	2001/01/05 13:52:07	1.14
+++ Makefile.am	2001/03/15 03:22:53
@@ -11,6 +11,10 @@
 	TODO.xml	\
 	README.win32
 
+if HAVE_X
+X_PC=pango.pc
+endif
+
 if HAVE_XFT
 XFT_PC=pangoxft.pc
 endif
@@ -20,7 +24,7 @@
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pango.pc pangox.pc $(XFT_PC) $(FT2_PC)
+pkgconfig_DATA = pango.pc $(X_PC) $(XFT_PC) $(FT2_PC)
 
 dist-hook: pango.spec
 	cp pango.spec $(distdir)
Index: configure.in
===================================================================
RCS file: /cvs/gnome/pango/configure.in,v
retrieving revision 1.52
diff -u -r1.52 configure.in
--- configure.in	2001/02/12 20:27:30	1.52
+++ configure.in	2001/03/15 03:22:53
@@ -41,11 +41,13 @@
 AC_SUBST(REBUILD)
 
 if test x$no_x = xyes ; then
-  AC_MSG_ERROR([X development libraries not found])
+  AC_MSG_WARN([X development libraries not found])
+  have_x=false
+else
+  X_LIBS="$X_LIBS -lX11"
+  have_x=true
 fi
-
-X_LIBS="$X_LIBS -lX11"
-
+AM_CONDITIONAL(HAVE_X, $have_x) 
 
 #
 # Find pkg-config
Index: examples/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/examples/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- examples/Makefile.am	2000/12/14 23:22:45	1.15
+++ examples/Makefile.am	2001/03/15 03:22:53
@@ -53,7 +53,9 @@
 	pangoft2.aliases	\
 	pangowin32.aliases
 
+if HAVE_X
 alias_DATA = pangox.aliases
+endif
 
 makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/examples/makefile.mingw.in
 	cd $(top_builddir) && CONFIG_FILES=examples/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: modules/arabic/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/arabic/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- modules/arabic/Makefile.am	2001/01/03 17:54:38	1.10
+++ modules/arabic/Makefile.am	2001/03/15 03:22:53
@@ -31,6 +31,7 @@
 	arabic-ot.c \
 	arabic-ot.h
 
+if HAVE_X
 if INCLUDE_ARABIC_X
 X_MODULES=
 X_INCLUDED=libpango-arabic-x.la
@@ -40,7 +41,11 @@
 X_INCLUDED=
 X_PREFIX=
 endif
-
+else
+X_MODULES=
+X_INCLUDED=
+X_PREFIX=
+endif
 
 noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED)
 module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES)
Index: modules/basic/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/basic/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- modules/basic/Makefile.am	2001/01/03 17:54:39	1.14
+++ modules/basic/Makefile.am	2001/03/15 03:22:53
@@ -34,6 +34,7 @@
 FT2_PREFIX=
 endif
 
+if HAVE_X
 if INCLUDE_BASIC_X
 X_INCLUDED=libpango-basic-x.la
 X_MODULES=
@@ -41,6 +42,11 @@
 else
 X_INCLUDED=
 X_MODULES=pango-basic-x.la
+X_PREFIX=
+endif
+else
+X_INCLUDED=
+X_MODULES=
 X_PREFIX=
 endif
 
Index: modules/hangul/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/hangul/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- modules/hangul/Makefile.am	2001/01/05 00:17:55	1.7
+++ modules/hangul/Makefile.am	2001/03/15 03:22:53
@@ -2,6 +2,7 @@
 
 sources = hangul-x.c
 
+if HAVE_X
 if INCLUDE_HANGUL_X
 noinst_LTLIBRARIES = libpango-hangul-x.la
 moddefine = -DX_MODULE_PREFIX
@@ -9,6 +10,7 @@
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = pango-hangul-x.la
 moduleflags= -rpath $(libdir)
+endif
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
Index: modules/indic/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- modules/indic/Makefile.am	2001/01/05 00:17:55	1.5
+++ modules/indic/Makefile.am	2001/03/15 03:22:53
@@ -8,6 +8,8 @@
 	devanagari-x.c		\
 	pango-indic-script.h
 
+if HAVE_X
+
 if INCLUDE_MYANMAR_X
 myanmar_x_noinst=libpango-myanmar-x.la
 myanmar_x_cflags=-DMYANMAR_X_MODULE_PREFIX
@@ -53,6 +55,8 @@
 else
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = $(myanmar_x_inst) $(gurmukhi_x_inst) $(bengali_x_inst) $(devanagari_x_inst) $(gujarati_x_inst)
+endif
+
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(X_CFLAGS) $(myanmar_x_cflags) $(gurmukhi_x_cflags) $(bengali_x_cflags) $(devanagari_x_cflags) $(gujarati_x_cflags)
Index: modules/tamil/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/tamil/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- modules/tamil/Makefile.am	2001/01/05 00:17:55	1.7
+++ modules/tamil/Makefile.am	2001/03/15 03:22:53
@@ -2,6 +2,7 @@
 
 sources = tamil-x.c taconv.c taconv.h tadefs.h
 
+if HAVE_X
 if INCLUDE_TAMIL_X
 noinst_LTLIBRARIES = libpango-tamil-x.la
 moddefine = -DX_MODULE_PREFIX
@@ -9,6 +10,7 @@
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = pango-tamil-x.la
 moduleflags=-rpath $(libdir)
+endif
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
Index: modules/thai/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/thai/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- modules/thai/Makefile.am	2001/01/05 00:17:56	1.5
+++ modules/thai/Makefile.am	2001/03/15 03:22:53
@@ -2,6 +2,7 @@
 
 sources = thai-x.c
 
+if HAVE_X
 if INCLUDE_THAI_X
 noinst_LTLIBRARIES = libpango-thai-x.la
 moddefine = -DX_MODULE_PREFIX
@@ -9,6 +10,7 @@
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = pango-thai-x.la
 moduleflags=-rpath $(libdir)
+endif
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
Index: pango/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/pango/Makefile.am,v
retrieving revision 1.42
diff -u -r1.42 Makefile.am
--- pango/Makefile.am	2001/02/12 17:46:17	1.42
+++ pango/Makefile.am	2001/03/15 03:22:53
@@ -20,6 +20,14 @@
 	$(FREETYPE_CFLAGS)			\
 	-I$(top_srcdir)
 
+if HAVE_X
+X_HFILES=pangox.h
+X_BUILD_LIBS=libpangox.la
+else
+X_HFILES=
+X_BUILD_LIBS=
+endif
+
 if HAVE_XFT
 XFT_HFILES=pangoxft.h pango-ot.h
 XFT_BUILD_LIBS=libpangoxft.la
@@ -37,7 +45,7 @@
 endif
 
 
-lib_LTLIBRARIES = libpango.la libpangox.la $(XFT_BUILD_LIBS) $(FT2_BUILD_LIBS)
+lib_LTLIBRARIES = libpango.la $(X_BUILD_LIBS) $(XFT_BUILD_LIBS) $(FT2_BUILD_LIBS)
 
 bin_PROGRAMS = pango-querymodules
 
@@ -125,12 +133,12 @@
 	pango-modules.h	   \
 	pango-tabs.h	   \
 	pango-types.h	   \
-	pango-utils.h	   \
-	pangox.h
+	pango-utils.h
 
 pangoinclude_HEADERS = 	   	\
 	$(pango_headers)   	\
 	$(pango_built_headers)	\
+	$(X_HFILES)		\
 	$(XFT_HFILES)           \
 	$(FT2_HFILES)
 
@@ -149,9 +157,9 @@
 	querymodules.c
 
 if HAVE_XFT
-pango_querymodules_LDADD = $(FT2_BUILD_LIBS) libpangox.la libpangoxft.la libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS)
+pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.la libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS)
 else
-pango_querymodules_LDADD = $(FT2_BUILD_LIBS) libpangox.la libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS)
+pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS)
 endif
 
 EXTRA_DIST =			\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]