Do not require iconv for dbase conversion.
This commit is contained in:
parent
5446b1ba72
commit
491545fff4
|
@ -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
|
subdir = contrib/dbase
|
||||||
top_builddir = ../..
|
top_builddir = ../..
|
||||||
|
@ -7,7 +7,13 @@ include $(top_builddir)/src/Makefile.global
|
||||||
PROGRAM = dbf2pg
|
PROGRAM = dbf2pg
|
||||||
OBJS = dbf.o dbf2pg.o endian.o
|
OBJS = dbf.o dbf2pg.o endian.o
|
||||||
PG_CPPFLAGS = -I$(libpq_srcdir)
|
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
|
DOCS = README.dbf2pg
|
||||||
MAN = dbf2pg.1 # XXX not implemented
|
MAN = dbf2pg.1 # XXX not implemented
|
||||||
|
|
|
@ -97,17 +97,20 @@ dbf2sql(1L) dbf2sql(1L)
|
||||||
fied charset. Example:
|
fied charset. Example:
|
||||||
-F IBM437
|
-F IBM437
|
||||||
Consult your system documentation to see the con-
|
Consult your system documentation to see the con-
|
||||||
vertions available.
|
versions available. This requires iconv to be enabled
|
||||||
|
in the compile.
|
||||||
|
|
||||||
-T charset_to
|
-T charset_to
|
||||||
Together with -F charset_from , it converts the
|
Together with -F charset_from , it converts the
|
||||||
data to the specified charset. Default is
|
data to the specified charset. Default is
|
||||||
"ISO-8859-1".
|
"ISO-8859-1". This requires iconv to be enabled
|
||||||
|
in the compile.
|
||||||
|
|
||||||
ENVIRONMENT
|
ENVIRONMENT
|
||||||
This program is affected by the environment-variables as
|
This program is affected by the environment-variables as
|
||||||
used by "PostgresSQL." See the documentation of Post-
|
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
|
BUGS
|
||||||
Fields larger than 8192 characters are not supported and
|
Fields larger than 8192 characters are not supported and
|
||||||
|
|
|
@ -7,8 +7,6 @@
|
||||||
*/
|
*/
|
||||||
#include "postgres_fe.h"
|
#include "postgres_fe.h"
|
||||||
|
|
||||||
#define HAVE_ICONV_H /* should be somewhere else */
|
|
||||||
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
Loading…
Reference in New Issue