Some work on autoconf.
# (c) Index Data 1995
# See the file LICENSE for details.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.2 1995-06-21 15:16:43 adam Exp $
+# $Id: Makefile.in,v 1.3 1995-06-22 07:15:57 adam Exp $
SHELL=/bin/sh
+# IrTcl Version
+VERSION=1.0
+
+# Directory prefix with machine independent files (scripts, setup files, etc.)
prefix = @prefix@
+
+# Directory prefix with machine dependent files (executables, libraries)
exec_prefix = @exec_prefix@
BINDIR=$(exec_prefix)/bin
LIBDIR=$(exec_prefix)/lib
MANDIR=$(prefix)/man
-IRTCLDIR=$(LIBDIR)/irtcl
+IRTCLDIR=$(prefix)/lib/irtcl
YAZDIR=@YAZDIR@
MOSIDIR=@MOSIDIR@
LIBS=@LIBS@ -lm
+
+# X11 libraries and include file paths
XLIB=@XLIB@ -lX11
XINCLUDE=@XINCLUDE@
-# Enable MOSI by setting MOSI=1 and set MOSILIB to
-# $(YAZDIR)/lib/librfc.a $(MOSIDIR)/libmosi.a
+# Tcl/Tk libraries
+TCLLIB=@TCLLIB@
+TKLIB=@TKLIB@
+
+# MOSI directory with libmosi.a and source
MOSILIB=@MOSILIB@
+
+# All YAZ libraries - including MOSI libraries.
YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB) $(YAZDIR)/lib/libutil.a
+# All include paths
INCLUDE=-I$(YAZDIR)/include $(XINCLUDE) -I$(MOSIDIR) -I/usr/local/include
-DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=@MOSI@ -DIRTCLDIR=\"$(IRTCLDIR)\" $(INCLUDE)
-TCLLIB=@TCLLIB@
-TKLIB=-@TKLIB@
+# All command line options except CFLAGS
+DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=@MOSI@ -DIRTCLDIR=\"$(IRTCLDIR)\" \
+ $(INCLUDE) -DIR_TCL_VERSION=\"$(VERSION)\"
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
RANLIB = @RANLIB@
O=ir-tcl.o marc.o
-P1=ir-tk
-P2=ir-tcl
-all: $(P1) $(P2)
+all: ir-tk ir-tcl
-$(P1): $(O) tkmain.o
- $(CC) $(CFLAGS) $(DEFS) $(O) tkmain.o -o $(P1) $(YAZLIB) $(TKLIB) $(TCLLIB) $(XLIB) $(LIBS)
+ir-tk: $(O) tkmain.o
+ $(CC) $(CFLAGS) $(O) tkmain.o -o ir-tk $(YAZLIB) $(TKLIB) \
+ $(TCLLIB) $(XLIB) $(LIBS)
-$(P2): $(O) tclmain.o
- $(CC) $(CFLAGS) $(DEFS) $(O) tclmain.o -o $(P2) $(YAZLIB) $(TCLLIB) $(LIBS)
+ir-tcl: $(O) tclmain.o
+ $(CC) $(CFLAGS) $(O) tclmain.o -o ir-tcl $(YAZLIB) $(TCLLIB) $(LIBS)
-install-tcl:
- -mkdir $(IRTCLDIR)
+install-tcl: ir-tcl
+ for d in $(IRTCLDIR) $(IRTCLDIR)/formats $(IRTCLDIR)/bitmaps; do \
+ if [ ! -d $$d ]; then \
+ echo Making $$d; \
+ mkdir $$d; \
+ chmod 755 $$d; \
+ fi; \
+ done;
$(INSTALL_PROGRAM) ir-tcl $(BINDIR)
-install-tk:
- -mkdir $(IRTCLDIR)
- -mkdir $(IRTCLDIR)/formats
- -mkdir $(IRTCLDIR)/bitmaps
+install-tk: ir-tk
+ for d in $(IRTCLDIR) $(IRTCLDIR)/formats $(IRTCLDIR)/bitmaps; do \
+ if [ ! -d $$d ]; then \
+ echo Making $$d; \
+ mkdir $$d; \
+ chmod 755 $$d; \
+ fi; \
+ done;
sed "s,^set libdir LIBDIR,set libdir $(IRTCLDIR)," <client.tcl >client.bak
$(INSTALL_PROGRAM) ir-tk $(BINDIR)
$(INSTALL_DATA) client.bak $(IRTCLDIR)/client.tcl
$(INSTALL_DATA) bitmaps/book? $(IRTCLDIR)/bitmaps
clean:
- rm -f *.[oa] $(P1) $(P2) core gmon.out mon.out *.bak
+ rm -f *.[oa] ir-tk ir-tcl core gmon.out mon.out *.bak config.cache
+
+autoconf:
+ -rm config.cache
+ autoconf
+ configure
.c.o:
$(CC) -c $(CFLAGS) $(DEFS) $<
dnl IR toolkit for tcl/tk
dnl (c) Index Data 1995
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.2 1995-06-21 15:16:43 adam Exp $
+dnl $Id: configure.in,v 1.3 1995-06-22 07:15:59 adam Exp $
AC_INIT(README)
AC_PROG_CC
AC_PROG_RANLIB
if test "$checkBoth" = 1; then
tk_oldLibs=$LIBS
LIBS="$LIBS -lsocket -lnsl"
- AC_CHECK_FUNC(accept, tk_checkNsl=0, [LIBS=$tk_oldLibs])
+ AC_CHECK_FUNC(accept, , [LIBS=$tk_oldLibs])
fi
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
AC_STDC_HEADERS
AC_SUBST(TCLLIB)
-AC_CHECK_LIB(m, sin)
-tclFound=0
-AC_CHECK_LIB(tcl, Tcl_Eval, tclFound=1)
+AC_CHECK_LIB(tcl, Tcl_Eval, tclFound=1, tclFound=0, -lm)
if test "$tclFound" = 1; then
TCLLIB=-ltcl
else
TCLLIB=/usr/local/lib/libtcl.a
fi
-AC_SUBST(TKLIB)
-tkFound=0
-AC_CHECK_LIB(tk, Tk_MainLoop, tkFound=1,, -ltcl)
-if test "$tkFound" = 1; then
- TKLIB=-ltk
-else
- TKLIB=/usr/local/lib/libtk.a
-fi
AC_SUBST(YAZDIR)
AC_SUBST(MOSI)
AC_SUBST(MOSILIB)
AC_SUBST(MOSIDIR)
-AC_MSG_CHECKING(for Yaz directory)
+AC_MSG_CHECKING(for YAZ directory)
AC_ARG_WITH(yazdir,[ --with-yazdir Yaz directory], [YAZDIR=$withval])
if test "$YAZDIR" = "yes"; then
- YAZDIR="../yaz"
+ YAZDIR="../yaz-1.0b"
elif test "$YAZDIR" = ""; then
- YAZDIR="../yaz"
- if test -d "../yaz-1.0b"; then
- YAZDIR="../yaz-1.0b"
+ YAZDIR="../yaz-1.0b"
+ if test -d "../yaz"; then
+ YAZDIR="../yaz"
fi
fi
AC_MSG_RESULT($YAZDIR)
if test ! -d $YAZDIR; then
- AC_MSG_WARN(Yaz directory doesnt exist)
+ AC_MSG_WARN(YAZ directory doesnt exist)
fi
AC_MSG_CHECKING(for MOSI)
AC_ARG_WITH(mosidir, [ --with-mosidir MOSI directory], [MOSIDIR=$withval])
else
XLIB=""
fi
+AC_SUBST(TKLIB)
+AC_CHECK_LIB(tk, Tk_MainLoop, tkFound=1, tkFound=0, $TCLLIB $XLIB -lX11 -lm)
+if test "$tkFound" = 1; then
+ TKLIB=-ltk
+else
+ TKLIB=/usr/local/lib/libtk.a
+fi
AC_OUTPUT(Makefile)
* OF THIS SOFTWARE.
*
* $Log: ir-tcl.h,v $
- * Revision 1.9 1995-06-19 13:54:21 adam
+ * Revision 1.10 1995-06-22 07:15:59 adam
+ * Version number moved to Makefile.in
+ * Some work on autoconf.
+ *
+ * Revision 1.9 1995/06/19 13:54:21 adam
* New version.
*
* Revision 1.8 1995/06/19 13:06:08 adam
#ifndef IR_TCL_H
#define IR_TCL_H
-#define IR_TCL_VERSION "1.0beta"
-
int ir_tcl_init (Tcl_Interp *interp);
void ir_select_add (int fd, void *obj);