Makefile.am configure.in modules/*/Makefile.am make it compile without X

2001-03-15  Sven Neumann  <sven@gimp.org>

	* Makefile.am
	* configure.in
	* modules/*/Makefile.am
	* pango/Makefile.am: make it compile without X headers

17 files changed, 97 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 62d153f9..72511465 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-15  Sven Neumann  <sven@gimp.org>
+
+	* Makefile.am
+	* configure.in
+	* modules/*/Makefile.am
+	* pango/Makefile.am: make it compile without X headers
+
 2001-03-12  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_font_describe): set the size field
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 62d153f9..72511465 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,10 @@
+2001-03-15  Sven Neumann  <sven@gimp.org>
+
+	* Makefile.am
+	* configure.in
+	* modules/*/Makefile.am
+	* pango/Makefile.am: make it compile without X headers
+
 2001-03-12  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_font_describe): set the size field
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 62d153f9..72511465 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+2001-03-15  Sven Neumann  <sven@gimp.org>
+
+	* Makefile.am
+	* configure.in
+	* modules/*/Makefile.am
+	* pango/Makefile.am: make it compile without X headers
+
 2001-03-12  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_font_describe): set the size field
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 62d153f9..72511465 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+2001-03-15  Sven Neumann  <sven@gimp.org>
+
+	* Makefile.am
+	* configure.in
+	* modules/*/Makefile.am
+	* pango/Makefile.am: make it compile without X headers
+
 2001-03-12  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_font_describe): set the size field
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 62d153f9..72511465 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+2001-03-15  Sven Neumann  <sven@gimp.org>
+
+	* Makefile.am
+	* configure.in
+	* modules/*/Makefile.am
+	* pango/Makefile.am: make it compile without X headers
+
 2001-03-12  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_font_describe): set the size field
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 62d153f9..72511465 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+2001-03-15  Sven Neumann  <sven@gimp.org>
+
+	* Makefile.am
+	* configure.in
+	* modules/*/Makefile.am
+	* pango/Makefile.am: make it compile without X headers
+
 2001-03-12  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_font_describe): set the size field
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 62d153f9..72511465 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+2001-03-15  Sven Neumann  <sven@gimp.org>
+
+	* Makefile.am
+	* configure.in
+	* modules/*/Makefile.am
+	* pango/Makefile.am: make it compile without X headers
+
 2001-03-12  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2.c (pango_ft2_font_describe): set the size field
diff --git a/Makefile.am b/Makefile.am
index a55e35d8..e083b4d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,10 @@ EXTRA_DIST = 		\
 	TODO.xml	\
 	README.win32
 
+if HAVE_X
+X_PC=pangox.pc
+endif
+
 if HAVE_XFT
 XFT_PC=pangoxft.pc
 endif
@@ -20,7 +24,7 @@ FT2_PC=pangoft2.pc
 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)
diff --git a/configure.in b/configure.in
index 02d9d43a..e26c7506 100644
--- a/configure.in
+++ b/configure.in
@@ -41,11 +41,13 @@ fi
 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
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8af03153..db7e2c57 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -53,7 +53,9 @@ EXTRA_DIST=			\
 	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
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index c456342d..4516fa99 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -31,6 +31,7 @@ xft_sources = \
 	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_MODULES=pango-arabic-x.la
 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)
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 8bcd7afb..07001520 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -34,6 +34,7 @@ FT2_INCLUDED=
 FT2_PREFIX=
 endif
 
+if HAVE_X
 if INCLUDE_BASIC_X
 X_INCLUDED=libpango-basic-x.la
 X_MODULES=
@@ -43,6 +44,11 @@ X_INCLUDED=
 X_MODULES=pango-basic-x.la
 X_PREFIX=
 endif
+else
+X_INCLUDED=
+X_MODULES=
+X_PREFIX=
+endif
 
 noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED)
 module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES)
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index a2d9f424..e82c1a17 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -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
@@ -10,6 +11,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)
 
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 31fc0dcc..7fde2ba9 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -8,6 +8,8 @@ sources =		 	\
 	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
@@ -55,6 +57,8 @@ 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)
 
 EXTRA_DIST = \
diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am
index fe8dd5b6..fc84f81c 100644
--- a/modules/tamil/Makefile.am
+++ b/modules/tamil/Makefile.am
@@ -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
@@ -10,6 +11,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)
 
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index 7be44adc..3b22ed78 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -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
@@ -10,6 +11,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)
 
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 8114d6a5..17dc9c00 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -20,6 +20,14 @@ INCLUDES = 					\
 	$(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 @@ FT2_HFILES=
 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_headers=		   \
 	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 @@ pango_querymodules_SOURCES = \
 	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 =			\