[Emc-commit] emc2 configure,1.43,1.44 configure.in,1.3,1.4

[Alex J. <ale...@us...>]

Update of /cvsroot/emc/emc2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1190

Modified Files:
	configure configure.in 
Log Message:
fixed GTK-CFLAGS for GTK2.0 & GTK2.2

Index: configure
===================================================================
RCS file: /cvsroot/emc/emc2/configure,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** configure	28 Nov 2004 01:04:03 -0000	1.43
--- configure	28 Nov 2004 13:59:08 -0000	1.44
***************
*** 3066,3072 ****
  echo "$as_me:$LINENO: result: $GTK_VER" >&5
  echo "${ECHO_T}$GTK_VER" >&6
! if (! test "none" = "$GTK_VER") ; then
    GTK_CFLAGS=`gtk-config --cflags`
    GTK_LIBS=`gtk-config --libs`
  else
    GTK_CFLAGS=""
--- 3066,3075 ----
  echo "$as_me:$LINENO: result: $GTK_VER" >&5
  echo "${ECHO_T}$GTK_VER" >&6
! if (test "1.2" = "$GTK_VER") ; then
    GTK_CFLAGS=`gtk-config --cflags`
    GTK_LIBS=`gtk-config --libs`
+ elif ( (test "2.0" = "$GTK_VER") || (test "2.2" = "$GTK_VER") ) ; then
+   GTK_CFLAGS=`pkg-config gtk+-$GTK_VER --cflags`
+   GTK_LIBS=`pkg-config gtk+-$GTK_VER --libs`
  else
    GTK_CFLAGS=""

Index: configure.in
===================================================================
RCS file: /cvsroot/emc/emc2/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure.in	28 Nov 2004 01:03:20 -0000	1.3
--- configure.in	28 Nov 2004 13:59:08 -0000	1.4
***************
*** 470,476 ****
  fi
  AC_MSG_RESULT([$GTK_VER])
! if (! test "none" = "$GTK_VER") ; then
    GTK_CFLAGS=`gtk-config --cflags`
    GTK_LIBS=`gtk-config --libs`
  else
    GTK_CFLAGS=""
--- 470,479 ----
  fi
  AC_MSG_RESULT([$GTK_VER])
! if (test "1.2" = "$GTK_VER") ; then
    GTK_CFLAGS=`gtk-config --cflags`
    GTK_LIBS=`gtk-config --libs`
+ elif ( (test "2.0" = "$GTK_VER") || (test "2.2" = "$GTK_VER") ) ; then
+   GTK_CFLAGS=`pkg-config gtk+-$GTK_VER --cflags`
+   GTK_LIBS=`pkg-config gtk+-$GTK_VER --libs`
  else
    GTK_CFLAGS=""