+++ /dev/null
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-# Makefile for bin/psql
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.19 1997/01/25 23:53:59 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SRCDIR= ../..
-include ../../Makefile.global
-
-INCLUDE_OPT:= \
- -I$(LIBPQDIR) \
- -I../../include
-
-CFLAGS+= $(INCLUDE_OPT)
-
-#USE_READLINE is set in Makefile.global
-#
-ifeq ($(USE_READLINE), true)
- CFLAGS+= $(READLINE_INC)
-
- LD_ADD+= $(READLINE_LIB) $(CURSES_LIB)
-
- ifeq ($(PORTNAME), ultrix4)
- LD_ADD+= -ltermcap
- else
- ifeq ($(PORTNAME), sparc)
- LD_ADD+= -ltermcap
- else
- ifeq ($(PORTNAME), linux)
- LD_ADD+= -ltermcap
- else
- ifeq ($(PORTNAME), next)
- LD_ADD+= -ltermcap
- else
- ifeq ($(PORTNAME), bsdi)
- LD_ADD+= -ltermcap
- else
- ifeq ($(PORTNAME), BSD44_derived)
- LD_ADD+= -ltermcap
- endif
- endif
- endif
- endif
- endif
- endif
-endif
-
-OBJS= psql.o stringutils.o
-
-ifeq ($(PORTNAME), ultrix4)
-OBJS+= ../../utils/strdup.o
-endif
-
-all: submake psql
-
-psql: $(OBJS) $(LIBPQDIR)/libpq.a
- $(CC) $(LDFLAGS) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD)
-
-../../utils/strdup.o:
- $(MAKE) -C ../../utils strdup.o
-
-.PHONY: submake
-submake:
- $(MAKE) -C $(LIBPQDIR) libpq.a
-
-install: psql
- $(INSTALL) $(INSTL_EXE_OPTS) psql $(DESTDIR)$(BINDIR)/psql
-
-depend dep:
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
-
-clean:
- rm -f psql $(OBJS)
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
-
-
--- /dev/null
+#-------------------------------------------------------------------------
+#
+# Makefile.inc--
+# Makefile for bin/psql
+#
+# Copyright (c) 1994, Regents of the University of California
+#
+#
+# IDENTIFICATION
+# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.3 1997/02/09 03:23:52 scrappy Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR= ../..
+include ../../Makefile.global
+
+INCLUDE_OPT:= -I$(LIBPQDIR) \
+ -I../../include
+
+CFLAGS+= $(INCLUDE_OPT)
+
+OBJS= psql.o stringutils.o @STRDUP@
+
+all: submake psql
+
+psql: $(OBJS) $(LIBPQDIR)/libpq.a
+ $(CC) $(LDFLAGS) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD)
+
+../../utils/strdup.o:
+ $(MAKE) -C ../../utils strdup.o
+
+.PHONY: submake
+submake:
+ $(MAKE) -C $(LIBPQDIR) libpq.a
+
+install: psql
+ $(INSTALL) $(INSTL_EXE_OPTS) psql $(DESTDIR)$(BINDIR)/psql
+
+depend dep:
+ $(CC) -MM $(INCLUDE_OPT) *.c >depend
+
+clean:
+ rm -f psql $(OBJS)
+
+ifeq (depend,$(wildcard depend))
+include depend
+endif
+
+
+
INET_ATON='inet_aton.o'
fi
+echo $ac_n "checking for strdup""... $ac_c" 1>&6
+echo "configure:3007: checking for strdup" >&5
+if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 3012 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char strdup(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char strdup();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_strdup) || defined (__stub___strdup)
+choke me
+#else
+strdup();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ rm -rf conftest*
+ eval "ac_cv_func_strdup=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_strdup=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'strdup`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ STRDUP='../../utils/strdup.o'
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
echo $ac_n "checking for cbrt""... $ac_c" 1>&6
-echo "configure:3008: checking for cbrt" >&5
+echo "configure:3057: checking for cbrt" >&5
if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3013 "configure"
+#line 3062 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cbrt(); below. */
; return 0; }
EOF
-if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_cbrt=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6
-echo "configure:3057: checking for cbrt in -lm" >&5
+echo "configure:3106: checking for cbrt in -lm" >&5
ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3065 "configure"
+#line 3114 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
cbrt()
; return 0; }
EOF
-if { (eval echo configure:3076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
echo $ac_n "checking for rint""... $ac_c" 1>&6
-echo "configure:3102: checking for rint" >&5
+echo "configure:3151: checking for rint" >&5
if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3107 "configure"
+#line 3156 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char rint(); below. */
; return 0; }
EOF
-if { (eval echo configure:3130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_rint=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6
-echo "configure:3151: checking for rint in -lm" >&5
+echo "configure:3200: checking for rint in -lm" >&5
ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3159 "configure"
+#line 3208 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
rint()
; return 0; }
EOF
-if { (eval echo configure:3170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
ac_given_srcdir=$srcdir
-trap 'rm -fr `echo "GNUmakefile Makefile.global backend/port/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "GNUmakefile Makefile.global backend/port/Makefile bin/psql/Makefile bin/pg_dump/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
s%@ipcrm@%$ipcrm%g
s%@LIBOBJS@%$LIBOBJS%g
s%@INET_ATON@%$INET_ATON%g
+s%@STRDUP@%$STRDUP%g
CEOF
EOF
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile Makefile.global backend/port/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile Makefile.global backend/port/Makefile bin/psql/Makefile bin/pg_dump/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then