$NetBSD: patch-ad,v 1.6 2006/07/24 22:00:47 minskim Exp $

--- config/cf/linux.cf.in.orig	2005-10-21 19:10:27.000000000 +0000
+++ config/cf/linux.cf.in
@@ -94,6 +94,9 @@ XCOMM operating system:  OSName (OSMajor
 XCOMM libc:	(LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
 XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 
+#define ForceNormalLib		YES
+#define SharedLibFont		YES
+
 #if LinuxDistribution == LinuxDebian
 # if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
 #  define SystemManDirectory	/usr/share/man
@@ -116,7 +119,6 @@ InstallNamedTargetNoClobber(install,file
 # define SharedLibXdmGreet	NO
 # define LinkGLToUsrInclude	NO
 # define LinkGLToUsrLib		NO
-# define SharedLibFont		NO
 # define SharedLibGlu		YES
 # define NormalLibGlu		YES
 # define FSUseSyslog		YES
@@ -609,10 +611,10 @@ InstallNamedTargetNoClobber(install,file
 #  if defined (i386Architecture) && ((GccMajorVersion >3) \
    || ((GccMajorVersion == 3) &&  (GccMinorVersion >= 1)))
 #   ifndef CcCmd
-#    define CcCmd		gcc -m32
+#    define CcCmd		@@PKGSRC_CC@@
 #   endif
 #   ifndef CplusplusCmd
-#    define CplusplusCmd	c++ -m32
+#    define CplusplusCmd	@@PKGSRC_CXX@@
 #   endif
 #  endif
 #  if defined (Ppc64Architecture)
@@ -624,8 +626,8 @@ InstallNamedTargetNoClobber(install,file
 #   endif
 #  endif
 #  ifndef CcCmd
-#   define CcCmd		gcc
-#   define CplusplusCmd		c++
+#   define CcCmd		@@PKGSRC_CC@@
+#   define CplusplusCmd		@@PKGSRC_CXX@@
 #  endif
 #  ifndef AsCmd
 #   define AsCmd		CcCmd -c -x assembler
@@ -779,7 +781,6 @@ InstallNamedTargetNoClobber(install,file
 #define YaccCmd			bison -y
 #define LexCmd			flex -l
 #define HasFlex			YES
-#define LexLib			-lfl
 #define PreProcessCmd		CcCmd -E
 #define PostIncDir		DefaultGccIncludeDir
 #define LdCombineFlags		-r
@@ -853,7 +854,7 @@ InstallNamedTargetNoClobber(install,file
 
 #ifdef i386Architecture
 # ifndef OptimizedCDebugFlags
-#  define OptimizedCDebugFlags	DefaultGcc2i386Opt
+#  define OptimizedCDebugFlags	@@PKGSRC_CFLAGS@@
 # endif
 # define LinuxMachineDefines	-D__i386__
 # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
@@ -1053,9 +1054,6 @@ InstallNamedTargetNoClobber(install,file
 #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 
 #if HaveLib64
-# ifndef LibDirName
-#  define LibDirName		lib64
-# endif
 # ifndef SystemUsrLibDir
 #  define SystemUsrLibDir	/usr/lib64
 # endif