diff options
| author | Bruce Momjian | 2001-12-21 05:29:46 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2001-12-21 05:29:46 +0000 |
| commit | 491545fff4f1a58f669e777d7c5e3ec932963a77 (patch) | |
| tree | 0200144d65817ff491bce359f3be74b0cc8666d7 | |
| parent | 5446b1ba729954a038a7d058662a58d1c130158d (diff) | |
Do not require iconv for dbase conversion.
| -rw-r--r-- | contrib/dbase/Makefile | 10 | ||||
| -rw-r--r-- | contrib/dbase/README.dbf2pg | 9 | ||||
| -rw-r--r-- | contrib/dbase/dbf2pg.c | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/contrib/dbase/Makefile b/contrib/dbase/Makefile index af1a11ea2aa..5089298c3f1 100644 --- a/contrib/dbase/Makefile +++ b/contrib/dbase/Makefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/contrib/dbase/Attic/Makefile,v 1.3 2001/12/21 04:13:12 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/dbase/Attic/Makefile,v 1.4 2001/12/21 05:29:46 momjian Exp $ subdir = contrib/dbase top_builddir = ../.. @@ -7,7 +7,13 @@ include $(top_builddir)/src/Makefile.global PROGRAM = dbf2pg OBJS = dbf.o dbf2pg.o endian.o PG_CPPFLAGS = -I$(libpq_srcdir) -PG_LIBS = $(libpq) -liconv +PG_LIBS = $(libpq) + +# Uncomment this to provide charset translation +#PG_CPPFLAGS += -DHAVE_ICONV_H +# You might need to uncomment this too, if libiconv is a separate +# library on your platform +#PG_LIBS += -liconv DOCS = README.dbf2pg MAN = dbf2pg.1 # XXX not implemented diff --git a/contrib/dbase/README.dbf2pg b/contrib/dbase/README.dbf2pg index 167055c8569..7203be4029b 100644 --- a/contrib/dbase/README.dbf2pg +++ b/contrib/dbase/README.dbf2pg @@ -97,17 +97,20 @@ dbf2sql(1L) dbf2sql(1L) fied charset. Example: -F IBM437 Consult your system documentation to see the con- - vertions available. + versions available. This requires iconv to be enabled + in the compile. -T charset_to Together with -F charset_from , it converts the data to the specified charset. Default is - "ISO-8859-1". + "ISO-8859-1". This requires iconv to be enabled + in the compile. ENVIRONMENT This program is affected by the environment-variables as used by "PostgresSQL." See the documentation of Post- - gresSQL for more info. This program requires libiconv. + gresSQL for more info. This program can optionally use iconv + character set conversion routines. BUGS Fields larger than 8192 characters are not supported and diff --git a/contrib/dbase/dbf2pg.c b/contrib/dbase/dbf2pg.c index 425f5afacaf..a635e09122c 100644 --- a/contrib/dbase/dbf2pg.c +++ b/contrib/dbase/dbf2pg.c @@ -7,8 +7,6 @@ */ #include "postgres_fe.h" -#define HAVE_ICONV_H /* should be somewhere else */ - #include <fcntl.h> #include <unistd.h> #include <ctype.h> |