--- Makefile.PL.orig	Fri Jun 23 11:31:50 2000
+++ Makefile.PL	Thu Nov  9 13:38:26 2000
@@ -3,38 +3,17 @@
 warn "NOTICE: This module requires libgd 1.8.3 or higher (shared library version 4.X).\n";
 
 # =====> PATHS: CHECK AND ADJUST <=====
-my @INC     = qw(-I/usr/local/include -I/usr/local/include/gd); 
-my @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib );
-my @LIBS    = qw(-lgd -lpng -lz);
-
-# FEATURE FLAGS
-warn "\nPlease choose the features that match how libgd was built:\n";
-
-my $JPEG    = lc prompt('Build JPEG support?','y') eq 'y';
-my $TTF     = lc prompt('Build FreeType support?','y') eq 'y';
-my $XPM     = $^O !~ /^freebsd|MSWin32$/ && lc prompt('Build XPM support?','y') eq 'y';
+my @INC     = qw(-I/usr/local/include -I/usr/local/include/gd -I/usr/local/include/freetype -I/usr/X11R6/include -I/usr/X11R6/include/X11); 
+my @LIBPATH = qw(-L/usr/X11R6/lib -L/usr/local/lib );
+my @LIBS    = qw(-lttf -ljpeg -lgd -lpng -lz);
 
 my $FCGI    = 0;   # set to 1 to build compatability with fastCGI
 
-warn "\nIf you experience compile problems, please check the \@INC, \@LIBPATH and \@LIBS\n",
-     "arrays defined in Makefile.PL and manually adjust, if necessary.\n\n";
-
-#### no user-serviceable parts below #####
-
-push @LIBS,'-lttf' if $TTF;
-push @LIBS,'-ljpeg' if $JPEG;
-push @LIBS, '-lm' unless $^O eq 'MSWin32';
-
-# FreeBSD 3.3 with libgd built from ports croaks if -lXpm is specified 
-if ($^O ne 'freebsd' && $^O ne 'MSWin32') { 
-  push @LIBS,'-lX11','-lXpm' if $XPM; 
-} 
+push @LIBS,'-lX11','-lXpm' unless $^O eq 'MSWin32';
 
 my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE';
-my $DEFINES = '';
-$DEFINES    .= ' -DHAVE_JPEG' if $JPEG;
-$DEFINES    .= ' -DHAVE_TTF'  if $TTF;
-$DEFINES    .= ' -DHAVE_XPM'  if $XPM;
+my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
+$DEFINES    .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
 $DEFINES    .= ' -DFCGI'      if $FCGI;
 
 WriteMakefile(
