diff configure @ 1234:dfccdda074e5

OPTFLAGS vs. INCLUDES cleanup
author arpi
date Tue, 26 Jun 2001 23:15:58 +0000
parents 7d30b57b6187
children c823cb3a2608
line wrap: on
line diff
--- a/configure	Tue Jun 26 21:34:03 2001 +0000
+++ b/configure	Tue Jun 26 23:15:58 2001 +0000
@@ -1095,6 +1095,7 @@
 echo "Checking for mtrr support ... $_mtrr"
 echo "Screen size ... ${_x}x${_y}"
 echo "Checking for X11 libs ... $_x11libdir"
+echo "Checking for X11 headers ... $_x11incdir"
 echo "Checking mga_vid device ... $_mga"
 echo "Checking for xmga ... $_xmga" 
 echo "Checking for SDL ... $_sdl"
@@ -1115,6 +1116,8 @@
 echo "Checking for PNG support ... $_png"
 echo "Checking for DirectShow ... $_dshow"
 echo "Checking for fastmemcpy ... $_fastmemcpy"
+echo "Extra libs : $_extralibdir"
+echo "Extra headers : $_extraincdir"
 # write conf files.
 
 _streamingdef='#undef STREAMING'
@@ -1287,26 +1290,28 @@
 
 # -------- Generated by ./configure -----------
 
+prefix = $_prefix
 AR=ar
 CC=$_cc
+# OPTFLAGS=-O4 $_profile $_debug -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
+OPTFLAGS=$CFLAGS
+EXTRA_INC=$_extraincdir
+WIN32_PATH=-DWIN32_PATH=\"$_win32libdir\"
+
+X11_INC=$_x11incdir
 X11DIR=$_x11libdir
-# OPTFLAGS=-O4 $_profile $_debug -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
-OPTFLAGS=$CFLAGS $_x11incdir $_extraincdir
-# LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_ggilib $_dgalib $_x11lib $_xvlib
-X_LIBS=$_x11libdir $_extralibdir $_gllib $_sdllib $_ggilib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng $_socklib
+X_LIBS=$_x11libdir $_extralibdir $_gllib $_ggilib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng $_socklib
+
 TERMCAP_LIB=$_libtermcap
 XMM_LIBS = $_xmmplibs
 LIRC_LIBS = $_lirclibs
 CSS_LIB = $_csslib
 CSS_INC = $_cssinc
-SDL_LIB = $_sdllib
 SDL_INC = $_sdlcflags
-WIN32_PATH=-DWIN32_PATH=\"$_win32libdir\"
 DS_DEP = $_dshowdep
 DS_LIB = $_dshowlib
 ALSA_LIB = $_alsalib
 ESD_LIB = $_esdlib
-prefix = $_prefix
 ARCH_LIBS = $_archlibs
 STREAM_SRCS = $_streamingsrcs