--- Makefile.orig	Sat Jul  1 15:31:35 2000
+++ Makefile	Sat Jul  1 15:36:07 2000
@@ -11,8 +11,8 @@
 
 # defaults:
 PGM = lame
-CC = gcc
-CC_OPTS =  -O
+CC ?= gcc
+CC_OPTS = ${CFLAGS}
 GTK = 
 GTKLIBS = 
 SNDLIB = -DLAMESNDFILE
@@ -136,8 +136,10 @@
 ##########################################################################
 ifeq ($(UNAME),FreeBSD)
 #  remove if you do not have GTK or do not want the GTK frame analyzer
-   GTK = -DHAVEGTK `gtk12-config --cflags`
-   GTKLIBS = `gtk12-config --libs` 
+ifndef WITHOUT_X11
+   GTK = -DHAVEGTK `$(GTK_CONFIG) --cflags`
+   GTKLIBS = `$(GTK_CONFIG) --libs` 
+endif
 # Comment out next 2 lines if you want to remove VBR histogram capability
    BRHIST_SWITCH = -DBRHIST
    LIBTERMCAP = -lncurses