Index: Makefile
--- Makefile.orig	2006-08-21 16:21:26 +0200
+++ Makefile	2007-03-09 11:09:57 +0100
@@ -85,7 +85,7 @@
 ##############################################################
 # Link cint executable
 ##############################################################
-cint$(G__CFG_EXEEXT) : $(CINTLIB) main/G__setup$(G__CFG_OBJEXT) $(MAINO) $(G__CFG_READLINELIB) 
+cint$(G__CFG_EXEEXT) : $(CINTLIBSTATIC) main/G__setup$(G__CFG_OBJEXT) $(MAINO) $(G__CFG_READLINELIB) 
 	$(G__CFG_LD) $(G__CFG_LDFLAGS) $(G__CFG_LDOUT)cint$(G__CFG_EXEEXT) \
 	  $(shell $(G__CFG_MANGLEPATHS) $(MAINO)) \
 	  $(G__CFG_LIBP). $(G__CFG_LIBP)src $(subst @imp@,cint,$(G__CFG_LIBL)) \
Index: configure
--- configure.orig	2006-08-21 16:21:26 +0200
+++ configure	2007-03-09 11:29:32 +0100
@@ -9,18 +9,9 @@
 # This is a bash script, which works with any reasonable sh.
 # Solaris sh is not, so we have to start bash, and call ourselves again.
 
-[ "x$1" != "x__have_the_proper_shell@" ] && ( \
-uname -a | grep -i sunos > /dev/null \
-  && (bash $0 __have_the_proper_shell@ "$*") \
-  || (sh $0 __have_the_proper_shell@ "$*") \
-)
-
-[ "x$1" != "x__have_the_proper_shell@" ] && exit
-shift
-
 # configure settings to build CINT
 
-ARCHS=(linux linuxicc macgcc djgpp cygwin mingw mwerks hpux aix msvc7 msvc8 solaris solarisgcc)
+ARCHS=(generic freebsd linux linuxicc macgcc djgpp cygwin mingw mwerks hpux aix msvc7 msvc8 solaris solarisgcc)
 
 #############################################################
 ###
@@ -65,7 +56,7 @@
     CXXMACROS="$CXXMACROS $CMACROS"
 
     LD=g++
-    DEFAULTLIBS="-lm -ldl"
+    DEFAULTLIBS="-lm"
     LDOUT="-o "
     SOOUT="$LDOUT"
     LIBP=-L
@@ -93,13 +84,22 @@
 	STREAMDIR=stream
     fi
 
-    BUILDREADLINE=1
+    BUILDREADLINE=
     INPUTMODE=cint
     INPUTMODELOCK=off
 }
 
+function config_generic {
+    config_GCC_defaults
+}
+
+function config_freebsd {
+    config_GCC_defaults
+}
+
 function config_linux {
     config_GCC_defaults
+    DEFAULTLIBS="-lm -ldl"
 }
 
 function config_linuxicc {
@@ -361,9 +361,8 @@
     CINTEXLIBDIR=$1
 }
 
-function processflag_readlinelib {
-    READLINELIB=$1
-    BUILDREADLINE=
+function processflag_readline {
+    READLINE=$1
 }
 
 # process options
@@ -449,38 +448,11 @@
 	echo Setting cintex-incdir=$REFLEXLIBDIR
 fi
 
-if [ "$READLINELIB" = "" -a "$BUILDREADLINE" != "" ]; then
-    for d in /usr/local/lib /usr/lib /sw/lib; do 
-        if [ -f ${d}/libreadline$LIBEXT ]; then
-            READLINELIB=$d/libreadline$LIBEXT
-            BUILDREADLINE=
-            break
-        fi
-    done
-fi
 # want readline?
-if [ "$BUILDREADLINE" != "" ]; then
-    READLINELIB=readline/libreadline$LIBEXT
-fi    
-if [ "$READLINELIB" != "" -o "$BUILDREADLINE" != "" ]; then
-    CXXFLAGS="$CXXFLAGS -DG__GNUREADLINE"
-    echo "Using $READLINELIB"
-
-    # look for curses
-    if [ "$CURSESLIB" = "" ]; then
-        for d in /usr/local/lib /usr/lib /sw/lib; do 
-            if [ -f ${d}/libncurses$LIBEXT ]; then
-                CURSESLIB=$d/libncurses$LIBEXT
-                break
-            elif [ -f ${d}/libcurses$LIBEXT ]; then
-                CURSESLIB=$d/libcurses$LIBEXT
-                break
-            fi
-        done
-    fi
-    if [ "$CURSESLIB" != "" ]; then
-        echo "Using $CURSESLIB"
-    fi
+if [ "$READLINE" != "" ]; then
+    CXXFLAGS="$CXXFLAGS -DG__GNUREADLINE -I$PREFIX/include/ncurses -I$PREFIX/include"
+    READLINELIB="$PREFIX/lib/libreadline.a"
+    CURSESLIB="$PREFIX/lib/libncurses.a"
 fi
 
 
