conservatory
/
elk
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Fixed build with recent autotools. 

git-svn-id: svn://svn.zoy.org/elk/trunk@267 55e467fa-43c5-0310-a8a2-de718669efc6
This commit is contained in:
sam 2006-06-14 15:06:05 +00:00
parent 4846384ab6
commit 89b71eb165
12 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
configure.ac
View File

@ -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") AM_CONDITIONAL(HAVE_GDBM, test "${ac_cv_my_have_gdbm}" = "yes")
AC_PATH_X 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_CHECK_LIB(X11, XOpenDisplay,
[ac_cv_my_have_x11=yes [ac_cv_my_have_x11=yes
X_CFLAGS="-I${x_includes}" X_CFLAGS="${x_cflags}"
X_LIBS="-lX11 -L${x_libraries}"], X_LIBS="${x_libs} -lX11"],
[ac_cv_my_have_x11=no], [ac_cv_my_have_x11=no],
[[-L${x_libraries}]]) [[${x_libs}]])
AM_CONDITIONAL(HAVE_X11, test "${ac_cv_my_have_x11}" = "yes") AM_CONDITIONAL(HAVE_X11, test "${ac_cv_my_have_x11}" = "yes")
AC_SUBST(X_CFLAGS) AC_SUBST(X_CFLAGS)
AC_SUBST(X_LIBS) AC_SUBST(X_LIBS)
@ -502,13 +504,13 @@ if test "${cross_compiling}" = "no"; then
AC_CHECK_LIB(Xt, XtFree, AC_CHECK_LIB(Xt, XtFree,
[ac_cv_my_have_xt=yes [ac_cv_my_have_xt=yes
AC_CHECK_LIB(Xmu, XmuDrawLogo, AC_CHECK_LIB(Xmu, XmuDrawLogo,
[XT_CFLAGS="-I${x_includes}" [XT_CFLAGS="${x_cflags}"
XT_LIBS="-L${x_libraries} -lXmu -lXt -lSM -lICE -lXext -lX11"], XT_LIBS="${x_libs} -lXmu -lXt -lSM -lICE -lXext -lX11"],
[XT_CFLAGS="-I${x_includes}" [XT_CFLAGS="${x_cflags}"
XT_LIBS="-L${x_libraries} -lXt -lSM -lICE -lXext -lX11"], XT_LIBS="${x_libs} -lXt -lSM -lICE -lXext -lX11"],
[[-lXt -lSM -lICE -lXext -lX11 -L${x_libraries}]])], [[-lXt -lSM -lICE -lXext -lX11 ${x_libs}]])],
[ac_cv_my_have_xt=no], [ac_cv_my_have_xt=no],
[[-lSM -lICE -lXext -lX11 -L${x_libraries}]]) [[-lSM -lICE -lXext -lX11 ${x_libs}]])
else else
ac_cv_my_have_xt=no ac_cv_my_have_xt=no
fi fi
@ -519,8 +521,8 @@ AC_SUBST(XT_LIBS)
if test "${cross_compiling}" = "no"; then if test "${cross_compiling}" = "no"; then
AC_CHECK_LIB(Xaw, XawTextSearch, AC_CHECK_LIB(Xaw, XawTextSearch,
[ac_cv_my_have_xaw=yes [ac_cv_my_have_xaw=yes
XAW_CFLAGS="-I${x_includes}" XAW_CFLAGS="${x_cflags}"
XAW_LIBS="-L${x_libraries} -lXaw ${XT_LIBS}"], XAW_LIBS="${x_libs} -lXaw ${XT_LIBS}"],
[ac_cv_my_have_xaw=no], [ac_cv_my_have_xaw=no],
[[${XT_LIBS}]]) [[${XT_LIBS}]])
else else
@ -533,8 +535,8 @@ AC_SUBST(XAW_LIBS)
if test "${cross_compiling}" = "no"; then if test "${cross_compiling}" = "no"; then
AC_CHECK_LIB(Xm, XmStringConcat, AC_CHECK_LIB(Xm, XmStringConcat,
[ac_cv_my_have_motif=yes [ac_cv_my_have_motif=yes
MOTIF_CFLAGS="-I${x_includes} -I/usr/include/Xm" MOTIF_CFLAGS="${x_cflags} -I/usr/include/Xm"
MOTIF_LIBS="-L${x_libraries} -lXm ${XT_LIBS}"], MOTIF_LIBS="${x_libs} -lXm ${XT_LIBS}"],
[ac_cv_my_have_motif=no], [ac_cv_my_have_motif=no],
[[${XT_LIBS}]]) [[${XT_LIBS}]])
else else
@ -571,7 +573,6 @@ dnl Finished!
dnl dnl
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
debian/Makefile
doc/Makefile doc/Makefile
doc/bitstring/Makefile doc/bitstring/Makefile
doc/cprog/Makefile doc/cprog/Makefile

4
doc/bitstring/Makefile.am
View File

@ -2,8 +2,8 @@ EXTRA_DIST = bitstring.ms
CLEANFILES = index.raw index.ms bitstring.ps bitstring.html CLEANFILES = index.raw index.ms bitstring.ps bitstring.html
if HAVE_GROFF if HAVE_GROFF
doc_DATA = bitstring.ps docs_DATA = bitstring.ps
docdir = $(datadir)/doc/@PACKAGE@/ps docsdir = $(datadir)/doc/@PACKAGE@/ps
endif endif
MANUAL = $(srcdir)/bitstring.ms MANUAL = $(srcdir)/bitstring.ms

4
doc/cprog/Makefile.am
View File

@ -2,8 +2,8 @@ EXTRA_DIST = cprog.ms
CLEANFILES = side side.ref side.inx cprog.ps cprog.html CLEANFILES = side side.ref side.inx cprog.ps cprog.html
if HAVE_GROFF if HAVE_GROFF
doc_DATA = cprog.ps docs_DATA = cprog.ps
docdir = $(datadir)/doc/@PACKAGE@/ps docsdir = $(datadir)/doc/@PACKAGE@/ps
endif endif
MANUAL = $(srcdir)/cprog.ms MANUAL = $(srcdir)/cprog.ms

4
doc/kernel/Makefile.am
View File

@ -2,8 +2,8 @@ EXTRA_DIST = kernel.ms
CLEANFILES = index.raw index.ms kernel.ps kernel.html CLEANFILES = index.raw index.ms kernel.ps kernel.html
if HAVE_GROFF if HAVE_GROFF
doc_DATA = kernel.ps docs_DATA = kernel.ps
docdir = $(datadir)/doc/@PACKAGE@/ps docsdir = $(datadir)/doc/@PACKAGE@/ps
endif endif
MANUAL = $(srcdir)/kernel.ms MANUAL = $(srcdir)/kernel.ms

4
doc/man/Makefile.am
View File

@ -4,8 +4,8 @@ CLEANFILES = elk.ps elk.1.html
man_MANS = elk.1 man_MANS = elk.1
if HAVE_GROFF if HAVE_GROFF
doc_DATA = elk.ps docs_DATA = elk.ps
docdir = $(datadir)/doc/@PACKAGE@/ps docsdir = $(datadir)/doc/@PACKAGE@/ps
endif endif
TROFF= groff -man -t TROFF= groff -man -t

4
doc/oops/Makefile.am
View File

@ -2,8 +2,8 @@ EXTRA_DIST = oops.ms
CLEANFILES = index.raw index.ms oops.ps oops.html CLEANFILES = index.raw index.ms oops.ps oops.html
if HAVE_GROFF if HAVE_GROFF
doc_DATA = oops.ps docs_DATA = oops.ps
docdir = $(datadir)/doc/@PACKAGE@/ps docsdir = $(datadir)/doc/@PACKAGE@/ps
endif endif
MANUAL = $(srcdir)/oops.ms MANUAL = $(srcdir)/oops.ms

4
doc/record/Makefile.am
View File

@ -2,8 +2,8 @@ EXTRA_DIST = record.ms
CLEANFILES = index.raw index.ms record.ps record.html CLEANFILES = index.raw index.ms record.ps record.html
if HAVE_GROFF if HAVE_GROFF
doc_DATA = record.ps docs_DATA = record.ps
docdir = $(datadir)/doc/@PACKAGE@/ps docsdir = $(datadir)/doc/@PACKAGE@/ps
endif endif
MANUAL = $(srcdir)/record.ms MANUAL = $(srcdir)/record.ms

4
doc/regexp/Makefile.am
View File

@ -2,8 +2,8 @@ EXTRA_DIST = regexp.ms
CLEANFILES = index.raw index.ms regexp.ps regexp.html CLEANFILES = index.raw index.ms regexp.ps regexp.html
if HAVE_GROFF if HAVE_GROFF
doc_DATA = regexp.ps docs_DATA = regexp.ps
docdir = $(datadir)/doc/@PACKAGE@/ps docsdir = $(datadir)/doc/@PACKAGE@/ps
endif endif
MANUAL = $(srcdir)/regexp.ms MANUAL = $(srcdir)/regexp.ms

4
doc/unix/Makefile.am
View File

@ -2,8 +2,8 @@ EXTRA_DIST = unix.ms
CLEANFILES = index.raw index.ms unix.ps unix.html CLEANFILES = index.raw index.ms unix.ps unix.html
if HAVE_GROFF if HAVE_GROFF
doc_DATA = unix.ps docs_DATA = unix.ps
docdir = $(datadir)/doc/@PACKAGE@/ps docsdir = $(datadir)/doc/@PACKAGE@/ps
endif endif
MANUAL = $(srcdir)/unix.ms MANUAL = $(srcdir)/unix.ms

4
doc/usenix/Makefile.am
View File

@ -2,8 +2,8 @@ EXTRA_DIST = usenix.ms
CLEANFILES = tmp.ref usenix.ps CLEANFILES = tmp.ref usenix.ps
if HAVE_GROFF if HAVE_GROFF
doc_DATA = usenix.ps docs_DATA = usenix.ps
docdir = $(datadir)/doc/@PACKAGE@/ps docsdir = $(datadir)/doc/@PACKAGE@/ps
endif endif
MANUAL = $(srcdir)/usenix.ms MANUAL = $(srcdir)/usenix.ms

4
doc/xlib/Makefile.am
View File

@ -2,8 +2,8 @@ EXTRA_DIST = xlib.ms
CLEANFILES = index.raw index.ms xlib.ps xlib.html CLEANFILES = index.raw index.ms xlib.ps xlib.html
if HAVE_GROFF if HAVE_GROFF
doc_DATA = xlib.ps docs_DATA = xlib.ps
docdir = $(datadir)/doc/@PACKAGE@/ps docsdir = $(datadir)/doc/@PACKAGE@/ps
endif endif
MANUAL = $(srcdir)/xlib.ms MANUAL = $(srcdir)/xlib.ms

4
doc/xt/Makefile.am
View File

@ -2,8 +2,8 @@ EXTRA_DIST = xt.ms
CLEANFILES = index.raw index.ms xt.ps xt.html CLEANFILES = index.raw index.ms xt.ps xt.html
if HAVE_GROFF if HAVE_GROFF
doc_DATA = xt.ps docs_DATA = xt.ps
docdir = $(datadir)/doc/@PACKAGE@/ps docsdir = $(datadir)/doc/@PACKAGE@/ps
endif endif
MANUAL = $(srcdir)/xt.ms MANUAL = $(srcdir)/xt.ms