[htoolkit-cvs] port configure,1.10,1.11

[<kr_...@us...>]

Update of /cvsroot/htoolkit/port
In directory sc8-pr-cvs1:/tmp/cvs-serv17136

Modified Files:
	configure 
Log Message:
Add gnome and gnomeui libraries to port


Index: configure
===================================================================
RCS file: /cvsroot/htoolkit/port/configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** configure	2 Apr 2003 17:43:35 -0000	1.10
--- configure	28 Apr 2003 11:22:51 -0000	1.11
***************
*** 291,296 ****
    GTK*)	  if sh ./config.search pkg-config; then
  	    echo "pkg-config found"
! 	    clibs=`pkg-config pango gtk+-2.0 --libs`
! 	    cincflags=`pkg-config pango gtk+-2.0 --cflags`
  	  else
  	    echo "error:"
--- 291,296 ----
    GTK*)	  if sh ./config.search pkg-config; then
  	    echo "pkg-config found"
! 	    clibs=`pkg-config pango gtk+-2.0 libgnome-2.0 libgnomeui-2.0 --libs`
! 	    cincflags=`pkg-config pango gtk+-2.0 libgnome-2.0 libgnomeui-2.0 --cflags`
  	  else
  	    echo "error:"
***************
*** 298,302 ****
  	    echo " please check your GTK documentation"
  	    exit 2
! 	  fi;;	
    *)  echo "warning:"
        echo " unknown gui-library specified: $target"
--- 298,302 ----
  	    echo " please check your GTK documentation"
  	    exit 2
! 	  fi;;
    *)  echo "warning:"
        echo " unknown gui-library specified: $target"
***************
*** 312,315 ****
--- 312,316 ----
  extralibs=""
  extralibdirs=""
+ clibopts=""
  for lib in $clibs; do
    case $lib in
***************
*** 318,327 ****
  	 else
             extralibs="$extralibs\" `echo $lib | sed -e 's|-l|,\"|'`"
! 	 fi;;
      -L*) if test -z "$extralibdirs"; then
             extralibdirs="`echo $lib | sed -e 's|-L|, \"|'`"
  	 else
  	   extralibdirs="$extralibdirs\" `echo $lib | sed -e 's|-L|,\"|'`"
! 	 fi;;
    esac
  done
--- 319,332 ----
  	 else
             extralibs="$extralibs\" `echo $lib | sed -e 's|-l|,\"|'`"
! 	 fi
! 	 clibopts="$clibopts $lib"
! 	 ;;
      -L*) if test -z "$extralibdirs"; then
             extralibdirs="`echo $lib | sed -e 's|-L|, \"|'`"
  	 else
  	   extralibdirs="$extralibdirs\" `echo $lib | sed -e 's|-L|,\"|'`"
! 	 fi
! 	 clibopts="$clibopts $lib"
! 	 ;;
    esac
  done
***************
*** 342,348 ****
--- 347,355 ----
  # expects $cincflags to be in the form: -Idir1 -Idir2 ...
  incdirs=\"$curdir/src/include\"
+ incopts=""
  for flag in $cincflags; do
    case $flag in
      -I*) incdirs="$incdirs`echo $flag | sed -e 's|-I|, \"|'`\""
+          incopts="$incopts $flag"
    esac
  done
***************
*** 372,376 ****
  echo "# generated by configure" > config/config.mk
  echo "CC=$cc $ccoptions" >> config/config.mk
! echo "CINCFLAGS=$cincflags" >> config/config.mk
  echo "HC=$hc"            >> config/config.mk
  
--- 379,383 ----
  echo "# generated by configure" > config/config.mk
  echo "CC=$cc $ccoptions" >> config/config.mk
! echo "CINCFLAGS=$incopts" >> config/config.mk
  echo "HC=$hc"            >> config/config.mk
  
***************
*** 383,387 ****
  echo "FFIDIR=$ffidir"    >> config/config.mk
  echo "GUILIB=$target"    >> config/config.mk
! echo "CLIBS=$clibs"      >> config/config.mk
  echo ""			 >> config/config.mk
  echo "HDOC=$hdoc"        >> config/config.mk
--- 390,394 ----
  echo "FFIDIR=$ffidir"    >> config/config.mk
  echo "GUILIB=$target"    >> config/config.mk
! echo "CLIBS=$clibopts"   >> config/config.mk
  echo ""			 >> config/config.mk
  echo "HDOC=$hdoc"        >> config/config.mk