Commit491545f

committed

Do not require iconv for dbase conversion.

1 parent5446b1b commit491545fCopy full SHA for 491545f

File tree

+14

-7

lines changed

+14

-7

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $Header: /cvsroot/pgsql/contrib/dbase/Attic/Makefile,v 1.3 2001/12/2104:13:12 momjian Exp $`
	`1`	`+# $Header: /cvsroot/pgsql/contrib/dbase/Attic/Makefile,v 1.4 2001/12/2105:29:46 momjian Exp $`
`2`	`2`
`3`	`3`	`subdir = contrib/dbase`
`4`	`4`	`top_builddir = ../..`
`@@ -7,7 +7,13 @@ include $(top_builddir)/src/Makefile.global`
`7`	`7`	`PROGRAM = dbf2pg`
`8`	`8`	`OBJS= dbf.o dbf2pg.o endian.o`
`9`	`9`	`PG_CPPFLAGS = -I$(libpq_srcdir)`
`10`		`-PG_LIBS =$(libpq) -liconv`
	`10`	`+PG_LIBS =$(libpq)`
	`11`	`+`
	`12`	`+# Uncomment this to provide charset translation`
	`13`	`+#PG_CPPFLAGS += -DHAVE_ICONV_H`
	`14`	`+# You might need to uncomment this too, if libiconv is a separate`
	`15`	`+# library on your platform`
	`16`	`+#PG_LIBS += -liconv`
`11`	`17`
`12`	`18`	`DOCS = README.dbf2pg`
`13`	`19`	`MAN = dbf2pg.1# XXX not implemented`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,17 +97,20 @@ dbf2sql(1L) dbf2sql(1L)`
`97`	`97`	`fied charset. Example:`
`98`	`98`	`-F IBM437`
`99`	`99`	`Consult your system documentation to see the con-`
`100`		`- vertions available.`
	`100`	`+ versions available. This requires iconv to be enabled`
	`101`	`+ in the compile.`
`101`	`102`
`102`	`103`	`-T charset_to`
`103`	`104`	`Together with -F charset_from ,it converts the`
`104`	`105`	`data to thespecified charset. Default is`
`105`		`- "ISO-8859-1".`
	`106`	`+ "ISO-8859-1". This requires iconv to be enabled`
	`107`	`+ in the compile.`
`106`	`108`
`107`	`109`	`ENVIRONMENT`
`108`	`110`	`This program is affected by theenvironment-variables as`
`109`	`111`	`used by "PostgresSQL." See the documentation of Post-`
`110`		`- gresSQL for more info. This program requires libiconv.`
	`112`	`+ gresSQL for more info. This program can optionally use iconv`
	`113`	`+ character set conversion routines.`
`111`	`114`
`112`	`115`	`BUGS`
`113`	`116`	`Fields larger than 8192 characters are not supported and`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`
`10`		`-#defineHAVE_ICONV_H/* should be somewhere else */`
`11`		`-`
`12`	`10`	`#include<fcntl.h>`
`13`	`11`	`#include<unistd.h>`
`14`	`12`	`#include<ctype.h>`

Comments

(0)