#! /bin/sh
-# From configure.in Revision: 1.15 .
+# From configure.in Revision: 1.16 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20100530.
#
NCURSES_MAJOR="$NCURSES_MAJOR"
NCURSES_MINOR="$NCURSES_MINOR"
NCURSES_PATCH="$NCURSES_PATCH"
+USE_OLD_MAKERULES="$USE_OLD_MAKERULES"
cf_cv_abi_version="$cf_cv_abi_version"
cf_cv_rel_version="$cf_cv_rel_version"
cf_cv_rm_so_locs="$cf_cv_rm_so_locs"
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
- *) { { echo "$as_me:11483: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:11484: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:11793: creating $ac_file" >&5
+ { echo "$as_me:11794: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:11811: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:11812: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:11824: error: cannot find input file: $f" >&5
+ { { echo "$as_me:11825: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:11890: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:11891: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:11901: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:11902: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:11914: error: cannot find input file: $f" >&5
+ { { echo "$as_me:11915: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:11972: $ac_file is unchanged" >&5
+ { echo "$as_me:11973: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
case $ac_dest in
default )
-$AWK -f $srcdir/mk-1st.awk <$srcdir/src/modules >>src/Makefile
+if test -z "$USE_OLD_MAKERULES" ; then
+ $AWK -f $srcdir/mk-1st.awk <$srcdir/src/modules >>src/Makefile
+fi
;;
esac
done
dnl
dnl Author: Thomas E. Dickey
dnl
-dnl $Id: configure.in,v 1.15 2010/06/26 21:27:05 tom Exp $
+dnl $Id: configure.in,v 1.16 2010/07/03 21:18:11 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.13.20020210)
-AC_REVISION($Revision: 1.15 $)
+AC_REVISION($Revision: 1.16 $)
AC_INIT(gen/gen.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
AC_OUTPUT( \
$SUB_MAKEFILES \
Makefile,[
-$AWK -f $srcdir/mk-1st.awk <$srcdir/src/modules >>src/Makefile
+if test -z "$USE_OLD_MAKERULES" ; then
+ $AWK -f $srcdir/mk-1st.awk <$srcdir/src/modules >>src/Makefile
+fi
],[
### Special initialization commands, used to pass information from the
### configuration-run into config.status
NCURSES_MAJOR="$NCURSES_MAJOR"
NCURSES_MINOR="$NCURSES_MINOR"
NCURSES_PATCH="$NCURSES_PATCH"
+USE_OLD_MAKERULES="$USE_OLD_MAKERULES"
cf_cv_abi_version="$cf_cv_abi_version"
cf_cv_rel_version="$cf_cv_rel_version"
cf_cv_rm_so_locs="$cf_cv_rm_so_locs"
#
# Author: Juergen Pfeifer, 1996
#
-# $Id: Makefile.in,v 1.46 2010/06/26 21:28:56 tom Exp $
+# $Id: Makefile.in,v 1.51 2010/07/03 22:59:03 tom Exp $
#
.SUFFIXES:
exec_prefix = @exec_prefix@
libdir = ${exec_prefix}/lib
+LIBDIR = $(DESTDIR)$(libdir)
ADA_INCLUDE = $(DESTDIR)@ADA_INCLUDE@
ADA_OBJECTS = $(DESTDIR)@ADA_OBJECTS@
CARGS = -cargs $(ADAFLAGS)
LARGS =
-MY_STATIC_LIB = $(BUILD_DIR_LIB)/lib$(LIB_NAME).a
-MY_SHARED_LIB = $(BUILD_DIR_LIB)/$(SONAME)
+STATIC_LIBNAME = lib$(LIB_NAME).a
+SHARED_LIBNAME = $(SONAME)
+SHARED_SYMLINK = lib$(LIB_NAME).so
ALIB = @cf_ada_package@
ABASE = $(ALIB)-curses
$(ABASE)-text_io-modular_io.o \
$(ABASE)-text_io-complex_io.o
-all :: $(MY_STATIC_LIB)
+all :: $(BUILD_DIR_LIB)/$(STATIC_LIBNAME)
@echo done
+$(ADA_INCLUDE) \
+$(ADA_OBJECTS) \
+$(LIBDIR) \
$(BUILD_DIR_LIB) :
mkdir -p $@
-$(MY_STATIC_LIB) :: $(BUILD_DIR_LIB) $(LIBOBJS) @cf_generic_objects@
- $(AR) $(ARFLAGS) $@ $(LIBOBJS) @cf_generic_objects@
-
sources :
@echo made $@
libs \
install \
-install.libs :: $(MY_STATIC_LIB)
- @echo made $(MY_STATIC_LIB)
+install.libs :: \
+ $(BUILD_DIR_LIB)/$(STATIC_LIBNAME)
+ @echo made $(STATIC_LIBNAME)
install \
-install.libs :: $(MY_STATIC_LIB)
- @$(INSTALL_LIB) $(MY_STATIC_LIB) $(ADA_OBJECTS)
- @echo made $@
+install.libs :: \
+ $(BUILD_DIR_LIB)/$(STATIC_LIBNAME) \
+ $(ADA_OBJECTS)
+ @$(INSTALL_LIB) \
+ $(BUILD_DIR_LIB)/$(STATIC_LIBNAME) \
+ $(ADA_OBJECTS)
uninstall \
uninstall.libs ::
- @echo made $@
+ @rm -f $(ADA_OBJECTS)/$(STATIC_LIBNAME)
mostlyclean ::
rm -f *.o *.ali b_t*.* *.s $(PROGS) a.out core b_*_test.c *.xr[bs] *.a
$(ADAPREP) -DADA_TRACE=@ADA_TRACE@ -DPRAGMA_UNREF=@PRAGMA_UNREF@ $(srcdir)/$(ABASE)-trace.adb_p $@
###############################################################################
-# in-progress rewrite to use gnatmake library project files
+
+@USE_OLD_MAKERULES@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \
+@USE_OLD_MAKERULES@ $(BUILD_DIR_LIB) \
+@USE_OLD_MAKERULES@ $(LIBOBJS) @cf_generic_objects@
+@USE_OLD_MAKERULES@ $(AR) $(ARFLAGS) $@ $(LIBOBJS) @cf_generic_objects@
$(BUILD_DIR)/static-ali : ; mkdir -p $@
$(BUILD_DIR)/static-obj : ; mkdir -p $@
$(BUILD_DIR)/static-ali \
$(BUILD_DIR)/static-obj
-test_make :: $(ABASE)-trace.adb $(STATIC_DIRS)
- $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
+@USE_GNAT_PROJECTS@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \
+@USE_GNAT_PROJECTS@ $(ABASE)-trace.adb \
+@USE_GNAT_PROJECTS@ $(STATIC_DIRS)
+@USE_GNAT_PROJECTS@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
+@USE_GNAT_PROJECTS@
+@USE_GNAT_PROJECTS@install \
+@USE_GNAT_PROJECTS@install.libs :: \
+@USE_GNAT_PROJECTS@ $(ADA_OBJECTS)
+@USE_GNAT_PROJECTS@ $(INSTALL_LIB) \
+@USE_GNAT_PROJECTS@ $(BUILD_DIR)/static-ali/*.ali \
+@USE_GNAT_PROJECTS@ $(ADA_OBJECTS)
+
+uninstall \
+uninstall.libs ::
+ @rm -f $(ADA_OBJECTS)/$(STATIC_LIBNAME)
+
+@USE_GNAT_PROJECTS@uninstall \
+@USE_GNAT_PROJECTS@uninstall.libs ::
+@USE_GNAT_PROJECTS@ @$(SHELL) -c 'for name in $(BUILD_DIR)/static-ali/*.ali ; do rm -f $(ADA_OBJECTS)/`basename $$name`; done'
$(BUILD_DIR)/dynamic-ali : ; mkdir -p $@
$(BUILD_DIR)/dynamic-obj : ; mkdir -p $@
$(BUILD_DIR)/dynamic-ali \
$(BUILD_DIR)/dynamic-obj
-@MAKE_ADA_SHAREDLIB@test_make :: $(ABASE)-trace.adb $(SHARED_DIRS)
+@MAKE_ADA_SHAREDLIB@all \
+@MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: $(ABASE)-trace.adb $(SHARED_DIRS)
@MAKE_ADA_SHAREDLIB@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic
-test_install ::
- install --directory $(ADA_INCLUDE)
+install \
+install.libs :: $(ADA_INCLUDE)
$(INSTALL_LIB) \
$(SOURCE_DIR_SRC)/*.ad[sb] \
- $(GENERATED_SOURCES) \
$(ADA_INCLUDE)
- install --directory $(ADA_OBJECTS)
+
+install \
+install.libs :: $(ADA_INCLUDE)
$(INSTALL_LIB) \
- $(MY_STATIC_LIB) \
- $(DESTDIR)/usr/lib
+ $(GENERATED_SOURCES) \
+ $(ADA_INCLUDE)
+
+uninstall \
+uninstall.libs ::
+ $(SHELL) -c 'for name in $(SOURCE_DIR_SRC)/*.ad[sb] $(GENERATED_SOURCES); do rm -f $(ADA_INCLUDE)/`basename $$name`; done'
-@MAKE_ADA_SHAREDLIB@test_install ::
+@MAKE_ADA_SHAREDLIB@install \
+@MAKE_ADA_SHAREDLIB@install.libs :: $(ADA_OBJECTS)
@MAKE_ADA_SHAREDLIB@ $(INSTALL_LIB) \
@MAKE_ADA_SHAREDLIB@ $(BUILD_DIR)/dynamic-ali/* \
@MAKE_ADA_SHAREDLIB@ $(ADA_OBJECTS)
@MAKE_ADA_SHAREDLIB@ $(INSTALL_LIB) \
-@MAKE_ADA_SHAREDLIB@ $(BUILD_DIR_LIB)/$(SONAME) \
-@MAKE_ADA_SHAREDLIB@ $(DESTDIR)/usr/lib
-@MAKE_ADA_SHAREDLIB@ cd $(DESTDIR)/usr/lib && ln -s $(SONAME) lib$(LIB_NAME).so
-
-test_uninstall ::
- rm -rf \
- $(ADA_INCLUDE) \
- $(ADA_OBJECTS) \
- rm -f \
- $(DESTDIR)/usr/lib/lib$(LIB_NAME).a
-
-@MAKE_ADA_SHAREDLIB@test_uninstall ::
-@MAKE_ADA_SHAREDLIB@ rm -f \
-@MAKE_ADA_SHAREDLIB@ $(DESTDIR)/usr/lib/$(SONAME) \
-@MAKE_ADA_SHAREDLIB@ $(DESTDIR)/usr/lib/lib$(LIB_NAME).so
-
-test_clean:
+@MAKE_ADA_SHAREDLIB@ $(BUILD_DIR_LIB)/$(SHARED_LIBNAME) \
+@MAKE_ADA_SHAREDLIB@ $(LIBDIR)
+@MAKE_ADA_SHAREDLIB@ cd $(LIBDIR) && ln -s $(SHARED_LIBNAME) $(SHARED_SYMLINK)
+@MAKE_ADA_SHAREDLIB@
+@MAKE_ADA_SHAREDLIB@uninstall \
+@MAKE_ADA_SHAREDLIB@uninstall.libs ::
+@MAKE_ADA_SHAREDLIB@ $(SHELL) -c 'for name in $(BUILD_DIR)/dynamic-ali/* ; do rm -f $(ADA_OBJECTS)/`basename $$name`; done'
+@MAKE_ADA_SHAREDLIB@
+@MAKE_ADA_SHAREDLIB@uninstall \
+@MAKE_ADA_SHAREDLIB@uninstall.libs ::
+@MAKE_ADA_SHAREDLIB@ rm -f $(LIBDIR)/$(SHARED_SYMLINK)
+@MAKE_ADA_SHAREDLIB@ rm -f $(LIBDIR)/$(SHARED_LIBNAME)
+
+clean ::
rm -rf $(BUILD_DIR)/*-ali
rm -rf $(BUILD_DIR)/*-obj
rm -rf $(BUILD_DIR_LIB)
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.145 2010/06/05 20:08:29 tom Exp $
+-- $Id: INSTALL,v 1.146 2010/07/03 22:50:50 tom Exp $
---------------------------------------------------------------------
How to install Ncurses/Terminfo on your system
---------------------------------------------------------------------
--with-ada-objects=DIR
Tell where to install the Ada objects (default: PREFIX/lib/ada/adalib)
+ --with-ada-sharedlib
+ Build a shared library for Ada95 binding, if the compiler permits.
+
--with-bool=TYPE
If --without-cxx is specified, override the type used for the "bool"
declared in curses.h (normally the type is automatically chosen to
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1562 2010/06/26 21:17:17 tom Exp $
+-- $Id: NEWS,v 1.1564 2010/07/03 22:20:55 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20100703
+ + continue integrating changes to use gnatmake project files in Ada95
+ + add/use configure check to turn on project rules for Ada95/src.
+ + revert the vfork change from 20100130, since it does not work.
+
20100626
+ continue integrating changes to use gnatmake project files in Ada95
+ old gnatmake (3.15) does not produce libraries using project-file;
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.536 2010/06/26 21:38:51 tom Exp $
+dnl $Id: aclocal.m4,v 1.537 2010/07/03 21:15:56 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
cf_cv_prog_gnat_correct=no
;;
esac
+
case $cf_gnat_version in
3.[[1-9]]*|[[4-9]].*)
cf_compile_generics=generics
;;
esac
+case $cf_gnat_version in
+ 3.[[0-9]]*)
+ USE_OLD_MAKERULES=""
+ USE_GNAT_PROJECTS="#"
+ ;;
+ *)
+ USE_OLD_MAKERULES="#"
+ USE_GNAT_PROJECTS=""
+ ;;
+esac
+
AC_SUBST(cf_compile_generics)
AC_SUBST(cf_generic_objects)
+
+AC_SUBST(USE_OLD_MAKERULES)
+AC_SUBST(USE_GNAT_PROJECTS)
])
dnl ---------------------------------------------------------------------------
dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07
#! /bin/sh
-# From configure.in Revision: 1.499 .
+# From configure.in Revision: 1.500 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20100530.
#
cf_cv_prog_gnat_correct=no
;;
esac
+
case $cf_gnat_version in
3.[1-9]*|[4-9].*)
cf_compile_generics=generics
;;
esac
+case $cf_gnat_version in
+ 3.[0-9]*)
+ USE_OLD_MAKERULES=""
+ USE_GNAT_PROJECTS="#"
+ ;;
+ *)
+ USE_OLD_MAKERULES="#"
+ USE_GNAT_PROJECTS=""
+ ;;
+esac
+
# Extract the first word of "m4", so it can be a program name with args.
set dummy m4; ac_word=$2
-echo "$as_me:17889: checking for $ac_word" >&5
+echo "$as_me:17901: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_M4_exists+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_M4_exists="yes"
-echo "$as_me:17904: found $ac_dir/$ac_word" >&5
+echo "$as_me:17916: found $ac_dir/$ac_word" >&5
break
done
fi
M4_exists=$ac_cv_prog_M4_exists
if test -n "$M4_exists"; then
- echo "$as_me:17913: result: $M4_exists" >&5
+ echo "$as_me:17925: result: $M4_exists" >&5
echo "${ECHO_T}$M4_exists" >&6
else
- echo "$as_me:17916: result: no" >&5
+ echo "$as_me:17928: result: no" >&5
echo "${ECHO_T}no" >&6
fi
echo Ada95 binding required program m4 not found. Ada95 binding disabled.
fi
if test "$cf_cv_prog_gnat_correct" = yes; then
- echo "$as_me:17925: checking if GNAT works" >&5
+ echo "$as_me:17937: checking if GNAT works" >&5
echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
rm -f conftest*
fi
rm -f conftest*
- echo "$as_me:17953: result: $cf_cv_prog_gnat_correct" >&5
+ echo "$as_me:17965: result: $cf_cv_prog_gnat_correct" >&5
echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
fi
fi
ADAFLAGS="$ADAFLAGS -O3 -gnatpn"
-echo "$as_me:17962: checking if GNAT pragma Unreferenced works" >&5
+echo "$as_me:17974: checking if GNAT pragma Unreferenced works" >&5
echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
if test "${cf_cv_pragma_unreferenced+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
rm -f conftest*
fi
-echo "$as_me:17993: result: $cf_cv_pragma_unreferenced" >&5
+echo "$as_me:18005: result: $cf_cv_pragma_unreferenced" >&5
echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
# if the pragma is supported, use it (needed in the Trace code).
PRAGMA_UNREF=FALSE
fi
-echo "$as_me:18003: checking for ada-compiler" >&5
+echo "$as_me:18015: checking for ada-compiler" >&5
echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
# Check whether --with-ada-compiler or --without-ada-compiler was given.
cf_ada_compiler=gnatmake
fi;
-echo "$as_me:18014: result: $cf_ada_compiler" >&5
+echo "$as_me:18026: result: $cf_ada_compiler" >&5
echo "${ECHO_T}$cf_ada_compiler" >&6
cf_ada_package=terminal_interface
-echo "$as_me:18019: checking for ada-include" >&5
+echo "$as_me:18031: checking for ada-include" >&5
echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
# Check whether --with-ada-include or --without-ada-include was given.
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:18055: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:18067: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
fi
ADA_INCLUDE="$withval"
-echo "$as_me:18064: result: $ADA_INCLUDE" >&5
+echo "$as_me:18076: result: $ADA_INCLUDE" >&5
echo "${ECHO_T}$ADA_INCLUDE" >&6
-echo "$as_me:18067: checking for ada-objects" >&5
+echo "$as_me:18079: checking for ada-objects" >&5
echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
# Check whether --with-ada-objects or --without-ada-objects was given.
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:18103: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:18115: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
fi
ADA_OBJECTS="$withval"
-echo "$as_me:18112: result: $ADA_OBJECTS" >&5
+echo "$as_me:18124: result: $ADA_OBJECTS" >&5
echo "${ECHO_T}$ADA_OBJECTS" >&6
-echo "$as_me:18115: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:18127: checking if an Ada95 shared-library should be built" >&5
echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
# Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
else
with_ada_sharedlib=no
fi;
-echo "$as_me:18125: result: $with_ada_sharedlib" >&5
+echo "$as_me:18137: result: $with_ada_sharedlib" >&5
echo "${ECHO_T}$with_ada_sharedlib" >&6
ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
### chooses to split module lists into libraries.
###
### (see CF_LIB_RULES).
-echo "$as_me:18156: checking for library subsets" >&5
+echo "$as_me:18168: checking for library subsets" >&5
echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
LIB_SUBSETS=
test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
-echo "$as_me:18197: result: $LIB_SUBSETS" >&5
+echo "$as_me:18209: result: $LIB_SUBSETS" >&5
echo "${ECHO_T}$LIB_SUBSETS" >&6
### Construct the list of include-directories to be generated
fi
### Build up pieces for makefile rules
-echo "$as_me:18235: checking default library suffix" >&5
+echo "$as_me:18247: checking default library suffix" >&5
echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
case $DFT_LWR_MODEL in
shared) DFT_ARG_SUFFIX='' ;;
esac
test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18246: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18258: result: $DFT_ARG_SUFFIX" >&5
echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
-echo "$as_me:18249: checking default library-dependency suffix" >&5
+echo "$as_me:18261: checking default library-dependency suffix" >&5
echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
case $DFT_LWR_MODEL in #(vi
esac
test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
-echo "$as_me:18302: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18314: result: $DFT_DEP_SUFFIX" >&5
echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
-echo "$as_me:18305: checking default object directory" >&5
+echo "$as_me:18317: checking default object directory" >&5
echo $ECHO_N "checking default object directory... $ECHO_C" >&6
case $DFT_LWR_MODEL in
DFT_OBJ_SUBDIR='obj_s' ;;
esac
esac
-echo "$as_me:18321: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18333: result: $DFT_OBJ_SUBDIR" >&5
echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
# libtool thinks it can make c++ shared libraries (perhaps only g++)
if test "$cf_with_cxx" = yes ; then
-echo "$as_me:18326: checking c++ library-dependency suffix" >&5
+echo "$as_me:18338: checking c++ library-dependency suffix" >&5
echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
if test "$with_libtool" != "no"; then
CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
fi
-echo "$as_me:18383: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:18395: result: $CXX_LIB_SUFFIX" >&5
echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
fi
;;
esac
-echo "$as_me:18538: checking where we will install curses.h" >&5
+echo "$as_me:18550: checking where we will install curses.h" >&5
echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
test "$with_overwrite" = no && \
test "x$includedir" = 'x${prefix}/include' && \
includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
-echo "$as_me:18543: result: $includedir" >&5
+echo "$as_me:18555: result: $includedir" >&5
echo "${ECHO_T}$includedir" >&6
### Resolve a conflict between normal and wide-curses by forcing applications
if test "$with_overwrite" != no ; then
if test "$NCURSES_LIBUTF8" = 1 ; then
NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
- { echo "$as_me:18551: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+ { echo "$as_me:18563: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
fi
fi
### Construct the list of subdirectories for which we'll customize makefiles
### with the appropriate compile-rules.
-echo "$as_me:18568: checking for src modules" >&5
+echo "$as_me:18580: checking for src modules" >&5
echo $ECHO_N "checking for src modules... $ECHO_C" >&6
# dependencies and linker-arguments for test-programs
fi
fi
done
-echo "$as_me:18631: result: $cf_cv_src_modules" >&5
+echo "$as_me:18643: result: $cf_cv_src_modules" >&5
echo "${ECHO_T}$cf_cv_src_modules" >&6
TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18913: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18925: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:19089: error: ambiguous option: $1
+ { { echo "$as_me:19101: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:19108: error: unrecognized option: $1
+ -*) { { echo "$as_me:19120: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
TINFO_NAME="$TINFO_NAME"
TINFO_SUFFIX="$TINFO_SUFFIX"
+USE_OLD_MAKERULES="$USE_OLD_MAKERULES"
WITH_CURSES_H="$with_curses_h"
WITH_ECHO="$with_echo"
WITH_OVERWRITE="$with_overwrite"
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
- *) { { echo "$as_me:19209: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:19222: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
s,@gnat_exists@,$gnat_exists,;t t
s,@cf_compile_generics@,$cf_compile_generics,;t t
s,@cf_generic_objects@,$cf_generic_objects,;t t
+s,@USE_OLD_MAKERULES@,$USE_OLD_MAKERULES,;t t
+s,@USE_GNAT_PROJECTS@,$USE_GNAT_PROJECTS,;t t
s,@M4_exists@,$M4_exists,;t t
s,@cf_ada_make@,$cf_ada_make,;t t
s,@PRAGMA_UNREF@,$PRAGMA_UNREF,;t t
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:19612: creating $ac_file" >&5
+ { echo "$as_me:19627: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:19630: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:19645: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:19643: error: cannot find input file: $f" >&5
+ { { echo "$as_me:19658: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:19709: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:19724: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:19720: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:19735: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:19733: error: cannot find input file: $f" >&5
+ { { echo "$as_me:19748: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:19791: $ac_file is unchanged" >&5
+ { echo "$as_me:19806: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
done
if test "x$cf_with_ada" != xno ; then
+if test -z "$USE_OLD_MAKERULES" ; then
$AWK -f $srcdir/Ada95/mk-1st.awk <$srcdir/Ada95/src/modules >>Ada95/src/Makefile
+fi
fi
;;
esac
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: configure.in,v 1.499 2010/06/26 21:33:51 tom Exp $
+dnl $Id: configure.in,v 1.500 2010/07/03 21:17:32 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.13.20020210)
-AC_REVISION($Revision: 1.499 $)
+AC_REVISION($Revision: 1.500 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
CF_LIB_RULES($SRC_SUBDIRS)
if test "x$cf_with_ada" != xno ; then
+if test -z "$USE_OLD_MAKERULES" ; then
$AWK -f $srcdir/Ada95/mk-1st.awk <$srcdir/Ada95/src/modules >>Ada95/src/Makefile
fi
+fi
],[
### Special initialization commands, used to pass information from the
### configuration-run into config.status
TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
TINFO_NAME="$TINFO_NAME"
TINFO_SUFFIX="$TINFO_SUFFIX"
+USE_OLD_MAKERULES="$USE_OLD_MAKERULES"
WITH_CURSES_H="$with_curses_h"
WITH_ECHO="$with_echo"
WITH_OVERWRITE="$with_overwrite"
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.764 2010/06/26 12:25:29 tom Exp $
+# $Id: dist.mk,v 1.765 2010/07/03 16:52:23 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
NCURSES_MINOR = 7
-NCURSES_PATCH = 20100626
+NCURSES_PATCH = 20100703
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
/*
* Author: Thomas E. Dickey (1998-on)
*
- * $Id: ditto.c,v 1.38 2010/05/01 22:08:03 tom Exp $
+ * $Id: ditto.c,v 1.39 2010/07/03 19:41:04 tom Exp $
*
* The program illustrates how to set up multiple screens from a single
* program.
#include USE_OPENPTY_HEADER
#endif
-#ifdef HAVE_VFORK_H
-#include <vfork.h>
-#endif
-
#define MAX_FIFO 256
#define THIS_FIFO(n) ((n) % MAX_FIFO)
failed(slave_name);
}
sprintf(s_option, "-S%s/%d", slave_name, aslave);
- if (vfork()) {
+ if (fork()) {
execlp("xterm", "xterm", s_option, "-title", path, (char *) 0);
_exit(0);
}