[PD-cvs] pd/src configure.in,1.2,1.3

Wed Nov 12 19:39:16 CET 2003

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7103/pd/src

Modified Files:
	configure.in 
Log Message:
Updated configure for improved support for FreeBSD

Thanks!

Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.in	10 Nov 2003 16:13:11 -0000	1.2
--- configure.in	12 Nov 2003 18:39:13 -0000	1.3
***************
*** 83,86 ****
--- 83,88 ----
  #AC_CHECK_HEADER(tcl.h,, echo "no tcl/tk header found" || exit 1)

+ #	FreeBSD has lots of libs there ...
+ LIBS="$LIBS -L/usr/local/lib"

  foundit=no
***************
*** 98,102 ****
  then
      AC_CHECK_HEADER(/usr/local/include/tcl8.7/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.7 -I/usr/local/include/tk8.7";LIBS="$LIBS -ltcl87 -ltk87";foundit=yes,)
  fi
  if test $foundit == "no";
--- 100,104 ----
  then
      AC_CHECK_HEADER(/usr/local/include/tcl8.7/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.7 -I/usr/local/include/tk8.7";foundit=yes,)
  fi
  if test $foundit == "no";
***************
*** 108,112 ****
  then
      AC_CHECK_HEADER(/usr/local/include/tcl8.6/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.6 -I/usr/local/include/tk8.6";LIBS="$LIBS -ltcl86 -ltk86";foundit=yes,)
  fi

--- 110,114 ----
  then
      AC_CHECK_HEADER(/usr/local/include/tcl8.6/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.6 -I/usr/local/include/tk8.6";foundit=yes,)
  fi

***************
*** 119,123 ****
  then
      AC_CHECK_HEADER(/usr/local/include/tcl8.5/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.5 -I/usr/local/include/tk8.5";LIBS="$LIBS -ltcl85 -ltk85";foundit=yes,)
  fi

--- 121,125 ----
  then
      AC_CHECK_HEADER(/usr/local/include/tcl8.5/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.5 -I/usr/local/include/tk8.5";foundit=yes,)
  fi

***************
*** 130,134 ****
  then
      AC_CHECK_HEADER(/usr/local/include/tcl8.4/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4";LIBS="$LIBS -ltcl84 -ltk84";foundit=yes,)
  fi

--- 132,136 ----
  then
      AC_CHECK_HEADER(/usr/local/include/tcl8.4/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4";foundit=yes,)
  fi

***************
*** 141,145 ****
  then
      AC_CHECK_HEADER(/usr/local/include/tcl8.3/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3";LIBS="$LIBS -ltcl83 -ltk83";foundit=yes,)
  fi

--- 143,147 ----
  then
      AC_CHECK_HEADER(/usr/local/include/tcl8.3/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3";foundit=yes,)
  fi

***************
*** 152,156 ****
  then
      AC_CHECK_HEADER(/usr/local/include/tcl8.2/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.2 -I/usr/local/include/tk8.2";LIBS="$LIBS -ltcl82 -ltk82";foundit=yes,)
  fi

--- 154,158 ----
  then
      AC_CHECK_HEADER(/usr/local/include/tcl8.2/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.2 -I/usr/local/include/tk8.2";foundit=yes,)
  fi

***************
*** 164,181 ****

  AC_CHECK_LIB(tcl8.7, main,,
      AC_CHECK_LIB(tcl8.6, main,,
! 	AC_CHECK_LIB(tcl8.5, main,,
! 	    AC_CHECK_LIB(tcl8.4, main,,
! 		AC_CHECK_LIB(tcl8.3, main,,
! 		    AC_CHECK_LIB(tcl8.2, main,,
!         		AC_CHECK_LIB(tcl8.0, main)))))))

  AC_CHECK_LIB(tk8.7, main,,
      AC_CHECK_LIB(tk8.6, main,,
! 	AC_CHECK_LIB(tk8.5, main,,
! 	    AC_CHECK_LIB(tk8.4, main,,
! 		AC_CHECK_LIB(tk8.3, main,,
! 		    AC_CHECK_LIB(tk8.2, main,,
!         		AC_CHECK_LIB(tk8.0, main)))))))

  dnl Checking for tk.h or tkstep.h - not used at the moment
--- 166,203 ----

  AC_CHECK_LIB(tcl8.7, main,,
+ AC_CHECK_LIB(tcl87, main,LIBS="$LIBS -ltcl87",
      AC_CHECK_LIB(tcl8.6, main,,
! 	AC_CHECK_LIB(tcl86, main,LIBS="$LIBS -ltcl86",
! 		AC_CHECK_LIB(tcl8.5, main,,
! 		AC_CHECK_LIB(tcl85, main,LIBS="$LIBS -ltcl85",
! 		    AC_CHECK_LIB(tcl8.4, main,,
! 			AC_CHECK_LIB(tcl84, main,LIBS="$LIBS -ltcl84",
! 				AC_CHECK_LIB(tcl8.3, main,,
! 				AC_CHECK_LIB(tcl83, main,LIBS="$LIBS -ltcl83",
! 				    AC_CHECK_LIB(tcl8.2, main,,
! 					AC_CHECK_LIB(tcl82, main,LIBS="$LIBS -ltcl82",
! 	  					AC_CHECK_LIB(tcl81, main,,
! 						AC_CHECK_LIB(tcl81, main,LIBS="$LIBS -ltcl81",
! 							AC_CHECK_LIB(tcl80, main,LIBS="$LIBS -ltcl80",
! 					 		AC_CHECK_LIB(tcl8.0, main))))))))))))))))
! 

  AC_CHECK_LIB(tk8.7, main,,
+ AC_CHECK_LIB(tk87, main,LIBS="$LIBS -ltk87",
      AC_CHECK_LIB(tk8.6, main,,
! 	AC_CHECK_LIB(tk86, main,LIBS="$LIBS -ltk86",
! 		AC_CHECK_LIB(tk8.5, main,,
! 		AC_CHECK_LIB(tk85, main,LIBS="$LIBS -ltk85",
! 		    AC_CHECK_LIB(tk8.4, main,,
! 			AC_CHECK_LIB(tk84, main,LIBS="$LIBS -ltk84",
! 				AC_CHECK_LIB(tk8.3, main,,
! 				AC_CHECK_LIB(tk83, main,LIBS="$LIBS -ltk83",
! 				    AC_CHECK_LIB(tk8.2, main,,
! 					AC_CHECK_LIB(tk82, main,LIBS="$LIBS -ltk82",
! 	  					AC_CHECK_LIB(tk81, main,,
! 						AC_CHECK_LIB(tk81, main,LIBS="$LIBS -ltk81",
! 							AC_CHECK_LIB(tk80, main,LIBS="$LIBS -ltk80",
! 					 		AC_CHECK_LIB(tk8.0, main))))))))))))))))
! 

  dnl Checking for tk.h or tkstep.h - not used at the moment
***************
*** 220,225 ****
  if test `uname -s` = FreeBSD;
  then
!     LDFLAGS="-Wl,-export-dynamic -L/usr/local/lib -L/usr/local/lib/pth -lpthread"
! 	LIBS="$LIBS -L/usr/local/lib"
      EXT=pd_linux
      MORECFLAGS="-DDL_OPEN  -DUSEAPI_OSS"
--- 242,246 ----
  if test `uname -s` = FreeBSD;
  then
!     LDFLAGS="-Wl,-export-dynamic -L/usr/local/lib/pth -lpthread"
      EXT=pd_linux
      MORECFLAGS="-DDL_OPEN  -DUSEAPI_OSS"