From 89b71eb165e26c536ac2a82febfe738523c6ba36 Mon Sep 17 00:00:00 2001 From: sam Date: Wed, 14 Jun 2006 15:06:05 +0000 Subject: [PATCH] * Fixed build with recent autotools. git-svn-id: svn://svn.zoy.org/elk/trunk@267 55e467fa-43c5-0310-a8a2-de718669efc6 --- configure.ac | 29 +++++++++++++++-------------- doc/bitstring/Makefile.am | 4 ++-- doc/cprog/Makefile.am | 4 ++-- doc/kernel/Makefile.am | 4 ++-- doc/man/Makefile.am | 4 ++-- doc/oops/Makefile.am | 4 ++-- doc/record/Makefile.am | 4 ++-- doc/regexp/Makefile.am | 4 ++-- doc/unix/Makefile.am | 4 ++-- doc/usenix/Makefile.am | 4 ++-- doc/xlib/Makefile.am | 4 ++-- doc/xt/Makefile.am | 4 ++-- 12 files changed, 37 insertions(+), 36 deletions(-) diff --git a/configure.ac b/configure.ac index 4510925..01aee28 100644 --- a/configure.ac +++ b/configure.ac @@ -487,13 +487,15 @@ AC_CHECK_LIB(gdbm, gdbm_open, ac_cv_my_have_gdbm=yes, ac_cv_my_have_gdbm=no) AM_CONDITIONAL(HAVE_GDBM, test "${ac_cv_my_have_gdbm}" = "yes") AC_PATH_X +if test -n "${x_includes}"; then x_cflags="-I${x_includes}"; fi +if test -n "${x_libraries}"; then x_libs="-I${x_libraries}"; fi AC_CHECK_LIB(X11, XOpenDisplay, [ac_cv_my_have_x11=yes - X_CFLAGS="-I${x_includes}" - X_LIBS="-lX11 -L${x_libraries}"], + X_CFLAGS="${x_cflags}" + X_LIBS="${x_libs} -lX11"], [ac_cv_my_have_x11=no], - [[-L${x_libraries}]]) + [[${x_libs}]]) AM_CONDITIONAL(HAVE_X11, test "${ac_cv_my_have_x11}" = "yes") AC_SUBST(X_CFLAGS) AC_SUBST(X_LIBS) @@ -502,13 +504,13 @@ if test "${cross_compiling}" = "no"; then AC_CHECK_LIB(Xt, XtFree, [ac_cv_my_have_xt=yes AC_CHECK_LIB(Xmu, XmuDrawLogo, - [XT_CFLAGS="-I${x_includes}" - XT_LIBS="-L${x_libraries} -lXmu -lXt -lSM -lICE -lXext -lX11"], - [XT_CFLAGS="-I${x_includes}" - XT_LIBS="-L${x_libraries} -lXt -lSM -lICE -lXext -lX11"], - [[-lXt -lSM -lICE -lXext -lX11 -L${x_libraries}]])], + [XT_CFLAGS="${x_cflags}" + XT_LIBS="${x_libs} -lXmu -lXt -lSM -lICE -lXext -lX11"], + [XT_CFLAGS="${x_cflags}" + XT_LIBS="${x_libs} -lXt -lSM -lICE -lXext -lX11"], + [[-lXt -lSM -lICE -lXext -lX11 ${x_libs}]])], [ac_cv_my_have_xt=no], - [[-lSM -lICE -lXext -lX11 -L${x_libraries}]]) + [[-lSM -lICE -lXext -lX11 ${x_libs}]]) else ac_cv_my_have_xt=no fi @@ -519,8 +521,8 @@ AC_SUBST(XT_LIBS) if test "${cross_compiling}" = "no"; then AC_CHECK_LIB(Xaw, XawTextSearch, [ac_cv_my_have_xaw=yes - XAW_CFLAGS="-I${x_includes}" - XAW_LIBS="-L${x_libraries} -lXaw ${XT_LIBS}"], + XAW_CFLAGS="${x_cflags}" + XAW_LIBS="${x_libs} -lXaw ${XT_LIBS}"], [ac_cv_my_have_xaw=no], [[${XT_LIBS}]]) else @@ -533,8 +535,8 @@ AC_SUBST(XAW_LIBS) if test "${cross_compiling}" = "no"; then AC_CHECK_LIB(Xm, XmStringConcat, [ac_cv_my_have_motif=yes - MOTIF_CFLAGS="-I${x_includes} -I/usr/include/Xm" - MOTIF_LIBS="-L${x_libraries} -lXm ${XT_LIBS}"], + MOTIF_CFLAGS="${x_cflags} -I/usr/include/Xm" + MOTIF_LIBS="${x_libs} -lXm ${XT_LIBS}"], [ac_cv_my_have_motif=no], [[${XT_LIBS}]]) else @@ -571,7 +573,6 @@ dnl Finished! dnl AC_OUTPUT([ Makefile - debian/Makefile doc/Makefile doc/bitstring/Makefile doc/cprog/Makefile diff --git a/doc/bitstring/Makefile.am b/doc/bitstring/Makefile.am index b988572..9e723ce 100644 --- a/doc/bitstring/Makefile.am +++ b/doc/bitstring/Makefile.am @@ -2,8 +2,8 @@ EXTRA_DIST = bitstring.ms CLEANFILES = index.raw index.ms bitstring.ps bitstring.html if HAVE_GROFF -doc_DATA = bitstring.ps -docdir = $(datadir)/doc/@PACKAGE@/ps +docs_DATA = bitstring.ps +docsdir = $(datadir)/doc/@PACKAGE@/ps endif MANUAL = $(srcdir)/bitstring.ms diff --git a/doc/cprog/Makefile.am b/doc/cprog/Makefile.am index d40d435..94e45fc 100644 --- a/doc/cprog/Makefile.am +++ b/doc/cprog/Makefile.am @@ -2,8 +2,8 @@ EXTRA_DIST = cprog.ms CLEANFILES = side side.ref side.inx cprog.ps cprog.html if HAVE_GROFF -doc_DATA = cprog.ps -docdir = $(datadir)/doc/@PACKAGE@/ps +docs_DATA = cprog.ps +docsdir = $(datadir)/doc/@PACKAGE@/ps endif MANUAL = $(srcdir)/cprog.ms diff --git a/doc/kernel/Makefile.am b/doc/kernel/Makefile.am index bbcb516..09f8245 100644 --- a/doc/kernel/Makefile.am +++ b/doc/kernel/Makefile.am @@ -2,8 +2,8 @@ EXTRA_DIST = kernel.ms CLEANFILES = index.raw index.ms kernel.ps kernel.html if HAVE_GROFF -doc_DATA = kernel.ps -docdir = $(datadir)/doc/@PACKAGE@/ps +docs_DATA = kernel.ps +docsdir = $(datadir)/doc/@PACKAGE@/ps endif MANUAL = $(srcdir)/kernel.ms diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index d2d5619..57088c3 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -4,8 +4,8 @@ CLEANFILES = elk.ps elk.1.html man_MANS = elk.1 if HAVE_GROFF -doc_DATA = elk.ps -docdir = $(datadir)/doc/@PACKAGE@/ps +docs_DATA = elk.ps +docsdir = $(datadir)/doc/@PACKAGE@/ps endif TROFF= groff -man -t diff --git a/doc/oops/Makefile.am b/doc/oops/Makefile.am index 5d7e98d..3acedeb 100644 --- a/doc/oops/Makefile.am +++ b/doc/oops/Makefile.am @@ -2,8 +2,8 @@ EXTRA_DIST = oops.ms CLEANFILES = index.raw index.ms oops.ps oops.html if HAVE_GROFF -doc_DATA = oops.ps -docdir = $(datadir)/doc/@PACKAGE@/ps +docs_DATA = oops.ps +docsdir = $(datadir)/doc/@PACKAGE@/ps endif MANUAL = $(srcdir)/oops.ms diff --git a/doc/record/Makefile.am b/doc/record/Makefile.am index 3884171..2f25e96 100644 --- a/doc/record/Makefile.am +++ b/doc/record/Makefile.am @@ -2,8 +2,8 @@ EXTRA_DIST = record.ms CLEANFILES = index.raw index.ms record.ps record.html if HAVE_GROFF -doc_DATA = record.ps -docdir = $(datadir)/doc/@PACKAGE@/ps +docs_DATA = record.ps +docsdir = $(datadir)/doc/@PACKAGE@/ps endif MANUAL = $(srcdir)/record.ms diff --git a/doc/regexp/Makefile.am b/doc/regexp/Makefile.am index 51b3f47..6843453 100644 --- a/doc/regexp/Makefile.am +++ b/doc/regexp/Makefile.am @@ -2,8 +2,8 @@ EXTRA_DIST = regexp.ms CLEANFILES = index.raw index.ms regexp.ps regexp.html if HAVE_GROFF -doc_DATA = regexp.ps -docdir = $(datadir)/doc/@PACKAGE@/ps +docs_DATA = regexp.ps +docsdir = $(datadir)/doc/@PACKAGE@/ps endif MANUAL = $(srcdir)/regexp.ms diff --git a/doc/unix/Makefile.am b/doc/unix/Makefile.am index 017e1cb..1111014 100644 --- a/doc/unix/Makefile.am +++ b/doc/unix/Makefile.am @@ -2,8 +2,8 @@ EXTRA_DIST = unix.ms CLEANFILES = index.raw index.ms unix.ps unix.html if HAVE_GROFF -doc_DATA = unix.ps -docdir = $(datadir)/doc/@PACKAGE@/ps +docs_DATA = unix.ps +docsdir = $(datadir)/doc/@PACKAGE@/ps endif MANUAL = $(srcdir)/unix.ms diff --git a/doc/usenix/Makefile.am b/doc/usenix/Makefile.am index e1a767f..36161b5 100644 --- a/doc/usenix/Makefile.am +++ b/doc/usenix/Makefile.am @@ -2,8 +2,8 @@ EXTRA_DIST = usenix.ms CLEANFILES = tmp.ref usenix.ps if HAVE_GROFF -doc_DATA = usenix.ps -docdir = $(datadir)/doc/@PACKAGE@/ps +docs_DATA = usenix.ps +docsdir = $(datadir)/doc/@PACKAGE@/ps endif MANUAL = $(srcdir)/usenix.ms diff --git a/doc/xlib/Makefile.am b/doc/xlib/Makefile.am index ec7224f..04a2a08 100644 --- a/doc/xlib/Makefile.am +++ b/doc/xlib/Makefile.am @@ -2,8 +2,8 @@ EXTRA_DIST = xlib.ms CLEANFILES = index.raw index.ms xlib.ps xlib.html if HAVE_GROFF -doc_DATA = xlib.ps -docdir = $(datadir)/doc/@PACKAGE@/ps +docs_DATA = xlib.ps +docsdir = $(datadir)/doc/@PACKAGE@/ps endif MANUAL = $(srcdir)/xlib.ms diff --git a/doc/xt/Makefile.am b/doc/xt/Makefile.am index f705f6f..224d050 100644 --- a/doc/xt/Makefile.am +++ b/doc/xt/Makefile.am @@ -2,8 +2,8 @@ EXTRA_DIST = xt.ms CLEANFILES = index.raw index.ms xt.ps xt.html if HAVE_GROFF -doc_DATA = xt.ps -docdir = $(datadir)/doc/@PACKAGE@/ps +docs_DATA = xt.ps +docsdir = $(datadir)/doc/@PACKAGE@/ps endif MANUAL = $(srcdir)/xt.ms