Changes to incorporate common/accommon.m4.

Remove x11/thread directory form source distribution.
This commit is contained in:
Mark Hessling
2001-11-24 11:47:10 +00:00
parent df4e72e7a8
commit 94c4d7bcd3
6 changed files with 714 additions and 248 deletions

View File

@@ -17,6 +17,7 @@ includedir =$(exec_prefix)/include
pdcursesdir=./pdcurses
paneldir=./panel
demosdir=./demos
commondir=./common
INSTALL =$(srcdir)/install-sh
RANLIB =@RANLIB@
@@ -44,7 +45,7 @@ install:
$(INSTALL) -m 644 ./xpanel.h $(includedir)/xpanel.h
$(INSTALL) -c -m 644 $(pdcursesdir)/libXCurses.a $(libdir)/libXCurses.a
-$(RANLIB) $(libdir)/libXCurses.a
$(INSTALL) -c -m 555 $(pdcursesdir)/$(SHLPRE)$(SHLFILE)$(SHLPST) $(libdir)/$(RXLIBPRE)$(SHLFILE)$(RXLIBPST)
$(INSTALL) -c -m 555 $(pdcursesdir)/$(SHLPRE)$(SHLFILE)$(SHLPST) $(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST)
$(INSTALL) -c -m 644 $(paneldir)/libpanel.a $(libdir)/libpanel.a
-$(RANLIB) $(libdir)/libpanel.a
@@ -63,19 +64,21 @@ zip:
configure.in config.guess config.sub install-sh aclocal.m4 pdc64.gif \
curses.h xcurses.h curspriv.h panel.h maintain.er readme.* makezip.cmd \
pdcurses/README pdcurses/*.c demos/*.c demos/*.h \
common/accommon.m4 \
panel/README panel/*.c \
saa/README saa/Makefile.in \
dos/README dos/*.c dos/*.ini dos/*.rsp dos/*.lnk dos/*.mak dos/*.lrf \
os2/README os2/*.c os2/*.ini os2/*.rsp os2/*.lnk os2/*.mak os2/*.lrf os2/*.def \
x11/README x11/*.c x11/*.xbm x11/*.def x11/*.h x11/process/*.c x11/*.exp \
x11/process/*.c x11/process/*.h x11/thread/*.c x11/thread/*.h \
x11/process/*.c x11/process/*.h \
win32/README win32/*.c win32/*.rsp win32/*.lnk win32/*.ini win32/*.mak win32/*.lrf win32/*.def win32/*.ico win32/*.rc \
flexos/README flexos/*.c doc/*.man tools/manext.c \
pdcurses/Makefile.in pdcurses/Makefile.aix.in demos/Makefile.in panel/Makefile.in tools/Makefile.in
# x11/thread/*.c x11/thread/*.h \
dist:
(cd ..; tar cvf - $(PDC_DIR)/README $(PDC_DIR)/INSTALL $(PDC_DIR)/TODO $(PDC_DIR)/Makefile.in \
$(PDC_DIR)/config.h.in $(PDC_DIR)/configure $(PDC_DIR)/config.guess $(PDC_DIR)/aclocal.m4 \
$(PDC_DIR)/config.h.in $(PDC_DIR)/configure $(PDC_DIR)/config.guess $(PDC_DIR)/aclocal.m4 $(PDC_DIR)/common/accommon.m4 \
$(PDC_DIR)/config.sub $(PDC_DIR)/configure.in $(PDC_DIR)/install-sh $(PDC_DIR)/curses.h $(PDC_DIR)/xcurses.h \
$(PDC_DIR)/curspriv.h $(PDC_DIR)/panel.h $(PDC_DIR)/pdc64.gif \
$(PDC_DIR)/maintain.er $(PDC_DIR)/readme.* $(PDC_DIR)/makezip.cmd \
@@ -85,15 +88,16 @@ dist:
$(PDC_DIR)/dos/README $(PDC_DIR)/dos/*.c $(PDC_DIR)/dos/*.rsp $(PDC_DIR)/dos/*.lnk $(PDC_DIR)/dos/*.ini $(PDC_DIR)/dos/*.mak $(PDC_DIR)/dos/*.lrf \
$(PDC_DIR)/os2/README $(PDC_DIR)/os2/*.c $(PDC_DIR)/os2/*.rsp $(PDC_DIR)/os2/*.lnk $(PDC_DIR)/os2/*.ini $(PDC_DIR)/os2/*.mak $(PDC_DIR)/os2/*.lrf $(PDC_DIR)/os2/*.def \
$(PDC_DIR)/x11/README $(PDC_DIR)/x11/*.c $(PDC_DIR)/x11/*.xbm $(PDC_DIR)/x11/*.def $(PDC_DIR)/x11/*.h $(PDC_DIR)/x11/*.exp \
$(PDC_DIR)/x11/process/*.c $(PDC_DIR)/x11/process/*.h $(PDC_DIR)/x11/thread/*.c $(PDC_DIR)/x11/thread/*.h \
$(PDC_DIR)/x11/process/*.c $(PDC_DIR)/x11/process/*.h \
$(PDC_DIR)/win32/README $(PDC_DIR)/win32/*.c $(PDC_DIR)/win32/*.rsp $(PDC_DIR)/win32/*.lnk $(PDC_DIR)/win32/*.ini $(PDC_DIR)/win32/*.mak $(PDC_DIR)/win32/*.lrf $(PDC_DIR)/win32/*.def $(PDC_DIR)/win32/*.ico $(PDC_DIR)/win32/*.rc \
$(PDC_DIR)/flexos/README $(PDC_DIR)/flexos/*.c $(PDC_DIR)/tools/manext.c \
$(PDC_DIR)/pdcurses/Makefile.in $(PDC_DIR)/pdcurses/Makefile.aix.in $(PDC_DIR)/demos/Makefile.in $(PDC_DIR)/tools/Makefile.in \
$(PDC_DIR)/panel/Makefile.in | gzip > PDCurses-$(VER_DOT).tar.gz)
# $(PDC_DIR)/x11/thread/*.c $(PDC_DIR)/x11/thread/*.h \
tar:
(cd ..; tar cvf - $(PDC_DIR)/README $(PDC_DIR)/INSTALL $(PDC_DIR)/TODO $(PDC_DIR)/Makefile.in \
$(PDC_DIR)/config.h.in $(PDC_DIR)/configure $(PDC_DIR)/config.guess $(PDC_DIR)/aclocal.m4 \
$(PDC_DIR)/config.h.in $(PDC_DIR)/configure $(PDC_DIR)/config.guess $(PDC_DIR)/aclocal.m4 $(PDC_DIR)/common/accommon.m4 \
$(PDC_DIR)/config.sub $(PDC_DIR)/configure.in $(PDC_DIR)/install-sh $(PDC_DIR)/curses.h $(PDC_DIR)/xcurses.h \
$(PDC_DIR)/curspriv.h $(PDC_DIR)/panel.h $(PDC_DIR)/pdc64.gif \
$(PDC_DIR)/maintain.er $(PDC_DIR)/readme.* $(PDC_DIR)/makezip.cmd \
@@ -103,8 +107,9 @@ tar:
$(PDC_DIR)/dos/README $(PDC_DIR)/dos/*.c $(PDC_DIR)/dos/*.rsp $(PDC_DIR)/dos/*.lnk $(PDC_DIR)/dos/*.ini $(PDC_DIR)/dos/*.mak $(PDC_DIR)/dos/*.lrf \
$(PDC_DIR)/os2/README $(PDC_DIR)/os2/*.c $(PDC_DIR)/os2/*.rsp $(PDC_DIR)/os2/*.lnk $(PDC_DIR)/os2/*.ini $(PDC_DIR)/os2/*.mak $(PDC_DIR)/os2/*.lrf $(PDC_DIR)/os2/*.def \
$(PDC_DIR)/x11/README $(PDC_DIR)/x11/*.c $(PDC_DIR)/x11/*.xbm $(PDC_DIR)/x11/*.def $(PDC_DIR)/x11/*.h $(PDC_DIR)/x11/*.exp \
$(PDC_DIR)/x11/process/*.c $(PDC_DIR)/x11/process/*.h $(PDC_DIR)/x11/thread/*.c $(PDC_DIR)/x11/thread/*.h \
$(PDC_DIR)/x11/process/*.c $(PDC_DIR)/x11/process/*.h \
$(PDC_DIR)/win32/README $(PDC_DIR)/win32/*.c $(PDC_DIR)/win32/*.rsp $(PDC_DIR)/win32/*.lnk $(PDC_DIR)/win32/*.ini $(PDC_DIR)/win32/*.mak $(PDC_DIR)/win32/*.lrf $(PDC_DIR)/win32/*.def $(PDC_DIR)/win32/*.ico $(PDC_DIR)/win32/*.rc \
$(PDC_DIR)/flexos/README $(PDC_DIR)/flexos/*.c $(PDC_DIR)/tools/manext.c \
$(PDC_DIR)/pdcurses/Makefile.in $(PDC_DIR)/pdcurses/Makefile.aix.in $(PDC_DIR)/demos/Makefile.in $(PDC_DIR)/tools/Makefile.in \
$(PDC_DIR)/panel/Makefile.in | compress > PDCurses-$(VER_DOT).tar.Z)
# $(PDC_DIR)/x11/thread/*.c $(PDC_DIR)/x11/thread/*.h \

View File

@@ -300,7 +300,19 @@ done
if test "x$mh_x11_dir" != "x" ; then
mh_x11_dir_no_x11=`echo $mh_x11_dir | sed 's/\/X11$//'`
if test "$mh_x11_dir_no_x11" != "$mh_x11_dir" ; then
dnl
dnl Test to see if $mh_x11_dir_no_x11 is /usr/include and we are using gcc
dnl under Solaris. If so, ignore it.
AC_REQUIRE([AC_CANONICAL_SYSTEM])
mh_solaris_gcc_usr_include="no"
case "$target" in
*solaris*)
if test "$ac_cv_prog_CC" = "gcc" -a "$mh_x11_dir_no_x11" = "/usr/include" ; then
mh_solaris_gcc_usr_include="yes"
fi
;;
esac
if test "$mh_x11_dir_no_x11" != "$mh_x11_dir" -a "$mh_solaris_gcc_usr_include" = "no" ; then
MH_XINC_DIR="-I$mh_x11_dir -I$mh_x11_dir_no_x11"
else
MH_XINC_DIR="-I$mh_x11_dir"

919
configure vendored

File diff suppressed because it is too large Load Diff

View File

@@ -196,6 +196,8 @@ if test "$with_xaw3d" = yes; then
AC_DEFINE(USE_XAW3D)
fi
dnl --------------- Check how to make shared libraries -------------------
dnl Force the ability of shared library usage
with_rexx="rexxtrans"
MH_SHARED_LIBRARY(XCurses)
AC_OUTPUT(Makefile pdcurses/$mymakefile demos/Makefile panel/Makefile tools/Makefile saa/Makefile)

View File

@@ -31,8 +31,8 @@ INSTALL_DATA = @INSTALL_DATA@
SHL_TARGETS = @SHL_TARGETS@
DYN_COMP = @DYN_COMP@
RXLIBPRE = @RXLIBPRE@
RXLIBPST = @RXLIBPST@
SHLPRE = @SHLPRE@
SHLPST = @SHLPST@
LD_RXLIB1 = @LD_RXLIB1@
LD_RXLIB2 = # @MH_XLIBS@ @MH_EXTRA_LIBS@ -lc
MH_XLIBS = @MH_XLIBS@

View File

@@ -31,8 +31,8 @@ INSTALL_DATA = @INSTALL_DATA@
SHL_TARGETS = @SHL_TARGETS@
DYN_COMP = @DYN_COMP@
RXLIBPRE = @RXLIBPRE@
RXLIBPST = @RXLIBPST@
SHLPRE = @SHLPRE@
SHLPST = @SHLPST@
LD_RXLIB1 = @LD_RXLIB1@
LD_RXLIB2 = # @MH_XLIBS@ @MH_EXTRA_LIBS@ -lc
O2SAVE = @O2SAVE@
@@ -200,7 +200,7 @@ libXCurses.a : $(LIBOBJS) $(PDCOBJS) $(X11OBJS)
ar rv $@ $?
$(RANLIB) $@
$(RXLIBPRE)$(SHLFILE)$(RXLIBPST) : $(SHOFILES)
$(SHLPRE)$(SHLFILE)$(SHLPST) : $(SHOFILES)
$(LD_RXLIB1) $(RXPACKEXPORTS) -o $@ $(SHOFILES) $(LD_RXLIB2)
addch.o: $(srcdir)/addch.c $(PDCURSES_HEADERS)