Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5a303f8

Browse files
committed
Remove all traces of the ODBC driver, which is now on GBorg as the psqlodbcproject ...
1 parent03a7625 commit5a303f8

File tree

87 files changed

+11
-40007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+11
-40007
lines changed

‎GNUmakefile.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# PostgreSQL top level makefile
33
#
4-
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.25 2002/08/2200:15:04 scrappy Exp $
4+
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.26 2002/08/2222:43:08 scrappy Exp $
55
#
66

77
subdir =
@@ -72,7 +72,7 @@ $(distdir).tar: distdir
7272
opt_files := src/backend/utils/mb contrib/retep/build.xml \
7373
src/tools src/corba src/data src/tutorial \
7474
$(addprefix src/bin/, pgaccess pgtclsh pg_encoding) \
75-
$(addprefix src/interfaces/,odbclibpgtcl perl5 python jdbc) \
75+
$(addprefix src/interfaces/, libpgtcl perl5 python jdbc) \
7676
$(addprefix src/pl/, plperl tcl)
7777

7878
docs_files := doc/postgres.tar.gz doc/src doc/TODO.detail

‎INSTALL‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,6 @@ Installation Procedure
321321
the only good reason to select a non-default value is if you
322322
intend to run multiple PostgreSQL servers on the same machine.
323323

324-
--with-CXX
325-
326-
Build the C++ interface library.
327-
328324
--with-perl
329325

330326
Build the Perl interface module. The Perl interface will be
@@ -362,35 +358,6 @@ Installation Procedure
362358
use a different version of Tcl or Tk you can specify the directory
363359
in which to find them.
364360

365-
--enable-odbc
366-
367-
Build the ODBC driver. By default, the driver will be independent
368-
of a driver manager. To work better with a driver manager already
369-
installed on your system, use one of the following options in
370-
addition to this one. More information can be found in the
371-
Programmer's Guide.
372-
373-
--with-iodbc
374-
375-
Build the ODBC driver for use with iODBC.
376-
377-
--with-unixodbc
378-
379-
Build the ODBC driver for use with unixODBC.
380-
381-
--with-odbcinst=DIRECTORY
382-
383-
Specifies the directory where the ODBC driver will expect its
384-
"odbcinst.ini" configuration file. The default is
385-
"/usr/local/pgsql/etc" or whatever you specified as
386-
"--sysconfdir". It should be arranged that the driver reads the
387-
same file as the driver manager.
388-
389-
If either the option "--with-iodbc" or the option
390-
"--with-unixodbc" is used, this option will be ignored because in
391-
that case the driver manager handles the location of the
392-
configuration file.
393-
394361
--with-java
395362

396363
Build the JDBC driver and associated Java packages. This option

‎README‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ PostgreSQL is an advanced object-relational database management system
88
that supports an extended subset of the SQL standard, including
99
transactions, foreign keys, subqueries, triggers, user-defined types
1010
and functions. This distribution also contains several language
11-
bindings, including C, C++, Perl, Python, and Tcl, as well as drivers
12-
for JDBC and ODBC.
11+
bindings, including C, Perl, Python, and Tcl, as well as drivers
12+
for JDBC.
13+
14+
As of v7.3, the ODBC and C++ interfaces have been moved over to the
15+
PostgreSQL Projects WebSite @ http://gborg.postgresql.org.
1316

1417
See the file INSTALL for instructions on how to build and install
1518
PostgreSQL. That file also lists supported operating systems and

‎configure‎

Lines changed: 0 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,6 @@ Optional Features:
845845
--enable-debug build with debugging symbols (-g)
846846
--enable-depend turn on automatic dependency tracking
847847
--enable-cassert enable assertion checks (for debugging)
848-
--enable-odbc build the ODBC driver package
849848
--disable-largefile omit support for large files
850849
851850
Optional Packages:
@@ -871,9 +870,6 @@ Optional Packages:
871870
--with-openssl[=DIR] build with OpenSSL support [/usr/local/ssl]
872871
--without-readline do not use Readline
873872
--without-zlib do not use Zlib
874-
--with-unixodbc build ODBC driver for unixODBC
875-
--with-iodbc build ODBC driver for iODBC
876-
--with-odbcinst=DIR default directory for odbcinst.ini sysconfdir
877873
--with-gnu-ld assume the C compiler uses GNU ld default=no
878874
879875
Some influential environment variables:
@@ -3476,162 +3472,6 @@ fi;
34763472
34773473
34783474
3479-
#
3480-
# Optionally enable the building of the ODBC driver
3481-
#
3482-
3483-
# Old option name
3484-
iftest"${with_odbc+set}" =set&&test"${enable_odbc+set}"!=set;then
3485-
enable_odbc=$with_odbc
3486-
fi
3487-
3488-
echo"$as_me:$LINENO: checking whether to build the ODBC driver">&5
3489-
echo$ECHO_N"checking whether to build the ODBC driver...$ECHO_C">&6
3490-
3491-
3492-
# Check whether --enable-odbc or --disable-odbc was given.
3493-
iftest"${enable_odbc+set}" =set;then
3494-
enableval="$enable_odbc"
3495-
3496-
case$enablevalin
3497-
yes)
3498-
:
3499-
;;
3500-
no)
3501-
:
3502-
;;
3503-
*)
3504-
{ {echo"$as_me:$LINENO: error: no argument expected for --enable-odbc option">&5
3505-
echo"$as_me: error: no argument expected for --enable-odbc option">&2;}
3506-
{ (exit 1);exit 1; }; }
3507-
;;
3508-
esac
3509-
3510-
else
3511-
enable_odbc=no
3512-
3513-
fi;
3514-
3515-
3516-
3517-
3518-
# Check whether --with-unixodbc or --without-unixodbc was given.
3519-
iftest"${with_unixodbc+set}" =set;then
3520-
withval="$with_unixodbc"
3521-
3522-
case$withvalin
3523-
yes)
3524-
:
3525-
;;
3526-
no)
3527-
:
3528-
;;
3529-
*)
3530-
{ {echo"$as_me:$LINENO: error: no argument expected for --with-unixodbc option">&5
3531-
echo"$as_me: error: no argument expected for --with-unixodbc option">&2;}
3532-
{ (exit 1);exit 1; }; }
3533-
;;
3534-
esac
3535-
3536-
else
3537-
with_unixodbc=no
3538-
3539-
fi;
3540-
3541-
3542-
3543-
3544-
# Check whether --with-iodbc or --without-iodbc was given.
3545-
iftest"${with_iodbc+set}" =set;then
3546-
withval="$with_iodbc"
3547-
3548-
case$withvalin
3549-
yes)
3550-
:
3551-
;;
3552-
no)
3553-
:
3554-
;;
3555-
*)
3556-
{ {echo"$as_me:$LINENO: error: no argument expected for --with-iodbc option">&5
3557-
echo"$as_me: error: no argument expected for --with-iodbc option">&2;}
3558-
{ (exit 1);exit 1; }; }
3559-
;;
3560-
esac
3561-
3562-
else
3563-
with_iodbc=no
3564-
3565-
fi;
3566-
3567-
iftest"$with_unixodbc" = yes&&test"$with_iodbc" = yes;then
3568-
{ {echo"$as_me:$LINENO: error: ODBC driver cannot be built for both unixODBC and iODBC">&5
3569-
echo"$as_me: error: ODBC driver cannot be built for both unixODBC and iODBC">&2;}
3570-
{ (exit 1);exit 1; }; }
3571-
fi
3572-
iftest"$with_unixodbc" = yes||test"$with_iodbc" = yes;then
3573-
enable_odbc=yes
3574-
fi
3575-
case$enable_odbc:$with_unixodbc:$with_iodbcin
3576-
yes:no:no)echo"$as_me:$LINENO: result: yes (stand-alone)">&5
3577-
echo"${ECHO_T}yes (stand-alone)">&6;;
3578-
yes:yes:no)echo"$as_me:$LINENO: result: yes (unixODBC)">&5
3579-
echo"${ECHO_T}yes (unixODBC)">&6
3580-
3581-
cat>>confdefs.h<<\_ACEOF
3582-
#define WITH_UNIXODBC 1
3583-
_ACEOF
3584-
3585-
;;
3586-
yes:no:yes)echo"$as_me:$LINENO: result: yes (iODBC)">&5
3587-
echo"${ECHO_T}yes (iODBC)">&6
3588-
3589-
cat>>confdefs.h<<\_ACEOF
3590-
#define WITH_IODBC 1
3591-
_ACEOF
3592-
3593-
;;
3594-
no:*)echo"$as_me:$LINENO: result: no">&5
3595-
echo"${ECHO_T}no">&6;;
3596-
esac
3597-
3598-
3599-
3600-
3601-
3602-
# Allow for overriding the default location of the odbcinst.ini
3603-
# file which is normally ${sysconfdir} (i.e., ${prefix}/etc).
3604-
3605-
3606-
3607-
# Check whether --with-odbcinst or --without-odbcinst was given.
3608-
iftest"${with_odbcinst+set}" =set;then
3609-
withval="$with_odbcinst"
3610-
3611-
case$withvalin
3612-
yes)
3613-
{ {echo"$as_me:$LINENO: error: argument required for --with-odbcinst option">&5
3614-
echo"$as_me: error: argument required for --with-odbcinst option">&2;}
3615-
{ (exit 1);exit 1; }; }
3616-
;;
3617-
no)
3618-
{ {echo"$as_me:$LINENO: error: argument required for --with-odbcinst option">&5
3619-
echo"$as_me: error: argument required for --with-odbcinst option">&2;}
3620-
{ (exit 1);exit 1; }; }
3621-
;;
3622-
*)
3623-
odbcinst_ini_dir=$withval
3624-
;;
3625-
esac
3626-
3627-
else
3628-
odbcinst_ini_dir="\${sysconfdir}"
3629-
fi;
3630-
3631-
3632-
3633-
3634-
36353475
# Assume system is ELF if it predefines __ELF__ as 1,
36363476
# otherwise believe host_os based default.
36373477
case$host_osin
@@ -16459,10 +16299,6 @@ s,@with_krb5@,$with_krb5,;t t
1645916299
s,@krb_srvtab@,$krb_srvtab,;t t
1646016300
s,@with_pam@,$with_pam,;t t
1646116301
s,@with_openssl@,$with_openssl,;t t
16462-
s,@enable_odbc@,$enable_odbc,;t t
16463-
s,@with_unixodbc@,$with_unixodbc,;t t
16464-
s,@with_iodbc@,$with_iodbc,;t t
16465-
s,@odbcinst_ini_dir@,$odbcinst_ini_dir,;t t
1646616302
s,@ELF_SYS@,$ELF_SYS,;t t
1646716303
s,@AWK@,$AWK,;t t
1646816304
s,@FLEX@,$FLEX,;t t

‎configure.in‎

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.196 2002/08/2200:15:06 scrappy Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.197 2002/08/2222:43:08 scrappy Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -511,50 +511,6 @@ PGAC_ARG_BOOL(with, zlib, yes,
511511

512512

513513

514-
#
515-
# Optionally enable the building of the ODBC driver
516-
#
517-
518-
# Old option name
519-
if test "${with_odbc+set}" = set && test "${enable_odbc+set}" != set; then
520-
enable_odbc=$with_odbc
521-
fi
522-
523-
AC_MSG_CHECKING([whether to build the ODBC driver])
524-
PGAC_ARG_BOOL(enable, odbc, no, [ --enable-odbc build the ODBC driver package])
525-
PGAC_ARG_BOOL(with, unixodbc, no, [ --with-unixodbc build ODBC driver for unixODBC])
526-
PGAC_ARG_BOOL(with, iodbc, no, [ --with-iodbc build ODBC driver for iODBC])
527-
if test "$with_unixodbc" = yes && test "$with_iodbc" = yes; then
528-
AC_MSG_ERROR([ODBC driver cannot be built for both unixODBC and iODBC])
529-
fi
530-
if test "$with_unixodbc" = yes || test "$with_iodbc" = yes; then
531-
enable_odbc=yes
532-
fi
533-
case $enable_odbc:$with_unixodbc:$with_iodbc in
534-
yes:no:no) AC_MSG_RESULT([yes (stand-alone)]);;
535-
yes:yes:no) AC_MSG_RESULT([yes (unixODBC)])
536-
AC_DEFINE(WITH_UNIXODBC, 1, [Define to 1 to build with unixODBC support (--with-unixodbc)])
537-
;;
538-
yes:no:yes) AC_MSG_RESULT([yes (iODBC)])
539-
AC_DEFINE(WITH_IODBC, 1, [Define to 1 to build with iODBC support (--with-iodbc)])
540-
;;
541-
no:*) AC_MSG_RESULT(no);;
542-
esac
543-
AC_SUBST([enable_odbc])
544-
AC_SUBST([with_unixodbc])
545-
AC_SUBST([with_iodbc])
546-
547-
548-
# Allow for overriding the default location of the odbcinst.ini
549-
# file which is normally ${sysconfdir} (i.e., ${prefix}/etc).
550-
PGAC_ARG_REQ(with, odbcinst,
551-
[ --with-odbcinst=DIR default directory for odbcinst.ini [sysconfdir]],
552-
[odbcinst_ini_dir=$withval],
553-
[odbcinst_ini_dir="\${sysconfdir}"])
554-
AC_SUBST([odbcinst_ini_dir])
555-
556-
557-
558514
# Assume system is ELF if it predefines __ELF__ as 1,
559515
# otherwise believe host_os based default.
560516
case $host_os in

‎src/Makefile.global.in‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.152 2002/07/27 20:10:04 petere Exp $
2+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.153 2002/08/22 22:43:10 scrappy Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -111,8 +111,6 @@ override docdir := $(docdir)/postgresql
111111
endif
112112
endif
113113

114-
odbcinst_ini_dir = @odbcinst_ini_dir@
115-
116114
javadir :=$(DESTDIR)$(datadir)/java
117115
localedir := @localedir@
118116

@@ -129,9 +127,6 @@ with_perl= @with_perl@
129127
with_python= @with_python@
130128
with_tcl= @with_tcl@
131129
with_tk= @with_tk@
132-
enable_odbc= @enable_odbc@
133-
with_iodbc= @with_iodbc@
134-
with_unixodbc= @with_unixodbc@
135130
MULTIBYTE= @MULTIBYTE@
136131
enable_shared= @enable_shared@
137132
enable_rpath= @enable_rpath@

‎src/interfaces/Makefile‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.46 2002/08/2200:15:10 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.47 2002/08/2222:43:11 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -14,11 +14,7 @@ include $(top_builddir)/src/Makefile.global
1414

1515
DIRS := libpq ecpg libpgeasy
1616

17-
ALLDIRS :=$(DIRS) odbc libpgtcl perl5 python jdbc
18-
19-
ifeq ($(enable_odbc), yes)
20-
DIRS += odbc
21-
endif
17+
ALLDIRS :=$(DIRS) libpgtcl perl5 python jdbc
2218

2319
ifeq ($(with_tcl), yes)
2420
DIRS += libpgtcl

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp