Index: contrib/dbase/dbf2pg.c
===================================================================
RCS file: /cvsroot/pgsql/contrib/dbase/dbf2pg.c,v
retrieving revision 1.4
diff -c -r1.4 dbf2pg.c
*** contrib/dbase/dbf2pg.c	2001/10/25 05:49:19	1.4
--- contrib/dbase/dbf2pg.c	2001/12/21 04:27:48
***************
*** 742,753 ****
--- 742,755 ----
  			case 'U':
  				username = (char *) strdup(optarg);
  				break;
+ #ifdef HAVE_ICONV_H
  			case 'F':
  				charset_from = (char *) strdup(optarg);
  				break;
  			case 'T':
  				charset_to = (char *) strdup(optarg);
  				break;
+ #endif
  			case ':':
  				usage();
  				printf("missing argument!\n");
***************
*** 806,813 ****
--- 808,817 ----
  			free(username);
  		if (password)
  			free(password);
+ #ifdef HAVE_ICONV_H
  		if (charset_from)
  			iconv_close(iconv_d);
+ #endif
  		exit(1);
  	}
  
***************
*** 846,853 ****
--- 850,859 ----
  			free(username);
  		if (password)
  			free(password);
+ #ifdef HAVE_ICONV_H
  		if (charset_from)
  			iconv_close(iconv_d);
+ #endif
  		exit(1);
  	}
  
***************
*** 864,871 ****
--- 870,879 ----
  				free(username);
  			if (password)
  				free(password);
+ #ifdef HAVE_ICONV_H
  			if (charset_from)
  				iconv_close(iconv_d);
+ #endif
  			exit(1);
  		}
  		if (del)
***************
*** 880,887 ****
--- 888,897 ----
  					free(username);
  				if (password)
  					free(password);
+ #ifdef HAVE_ICONV_H
  				if (charset_from)
  					iconv_close(iconv_d);
+ #endif
  				exit(1);
  			}
  			if (verbose > 1)
***************
*** 903,910 ****
--- 913,922 ----
  				free(username);
  			if (password)
  				free(password);
+ #ifdef HAVE_ICONV_H
  			if (charset_from)
  				iconv_close(iconv_d);
+ #endif
  			exit(1);
  		}
  		if (verbose > 1)
***************
*** 933,939 ****
--- 945,953 ----
  		free(username);
  	if (password)
  		free(password);
+ #ifdef HAVE_ICONV_H
  	if (charset_from)
  		iconv_close(iconv_d);
+ #endif
  	exit(0);
  }