Changeset 2202 for trunk

Timestamp:

Apr 13, 2011 7:39:36 AM (13 years ago)

Author:

gah

Message:

fixes for gui build on Mac

Location:

trunk

Files:

• configure (modified) (22 diffs)
• configure.in (modified) (18 diffs)
• gui/src/Makefile.in (modified) (2 diffs)

trunk/configure

@@ -606 +606 @@
 LIBOBJS
 subdirs
-HAVE_FFMPEG_LIBS
-LDFLAGS_DEFAULT
-CFLAGS_DEFAULT
+VTKDIR
+TK_XLIBSW
+TK_LIB_SPEC
+TK_VERSION
+TCL_VERSION
+TCL_LIB_SPEC
+TCL_INC_SPEC
 SIZEOF_VOID_P
 SIZEOF_LONG_LONG
 SIZEOF_LONG
 SIZEOF_INT
-TK_VERSION
 SHLIB_LDFLAGS
+RUBY_VERSION_RV
+RUBY_PLATFORM
 RP_BASE
+PYTHON_VERSION
+PYTHON_SITE_PACKAGES
+PYTHON_SITE_DIR
+PYTHON_LIBDIR
+PYTHON_LIB
+PYTHON_LDFLAGS
+PYTHON_INCLUDES
+PYTHON_INCDIR
+PYTHON_DISTUTILS
+PYTHON_CFLAGS
+PERL_VERSION_RV
+PERL_VERSION
+PERL_VENDORLIB
+PERL_PRIVLIB
+PERL_LIBSPEC
+PERL_INSTALLARCHLIB
+PERL_INCLUDES
+PERL_CPPFLAGS
+PERL_CCFLAGS
+PERL_ARCHLIBEXP
+PERL_ARCHLIB
+OCTAVE_VERSION_MAJOR
+OCTAVE_VERSION
+MKOCTFILE3
+MKOCTFILE2
+MEX_ARCH
+MAKE
+LIB_SEARCH_DIRS
 JAVA_INC_SPEC
 JAVA_INC_DIR
 JAVA_HOME
+INSTALL_PREFIX
+HAVE_RUBY_DEVEL
+HAVE_INTTYPES_H
+HAVE_FFMPEG_LIBS
+ENABLE_GUI
+LDFLAGS_DEFAULT
+CFLAGS_DEFAULT
 JAVAH
 JAVAC
 JAVA
-RUBY_PLATFORM
-RUBY_VERSION_RV
-HAVE_RUBY_DEVEL
 RUBY_EXTRA_LIBS
 RUBY_SITE_PKG
@@ -633 +670 @@
 SED
 RUBY
-PYTHON_DISTUTILS
-PYTHON_SITE_PACKAGES
-PYTHON_LIBDIR
-PYTHON_SITE_DIR
-PYTHON_LIB
-PYTHON_LDFLAGS
-PYTHON_INCDIR
-PYTHON_CFLAGS
-PYTHON_INCLUDES
-PYTHON_VERSION
 PYTHON
-PERL_LIBSPEC
-PERL_VERSION_RV
-PERL_INSTALLARCHLIB
-PERL_PRIVLIB
-PERL_VENDORLIB
-PERL_CPPFLAGS
-PERL_CCFLAGS
-PERL_VERSION
-PERL_ARCHLIBEXP
-PERL_ARCHLIB
-PERL_INCLUDES
 PERL
-MKOCTFILE3
-MKOCTFILE2
-OCTAVE_VERSION_MAJOR
-OCTAVE_VERSION
 mkoctfile2
 mkoctfile3
 MKOCTFILE
 OCTAVE
-MEX_ARCH
 MCC
 MEXEXT
 MEX
 MATLAB
-VTKDIR
-TCL_LIB_SPEC
-TCL_INC_SPEC
-TCL_VERSION
 TCLSH
-ENABLE_GUI
-MAKE
 INSTALL_STUB_LIB
 INSTALL_LIB
@@ -699 +704 @@
 DL_LIBS
 AR
-HAVE_INTTYPES_H
 CXXCPP
 EGREP
@@ -724 +728 @@
 INSTALL_SCRIPT
 INSTALL_PROGRAM
-LIB_SEARCH_DIRS
-INSTALL_PREFIX
 target_alias
 host_alias
@@ -2752 +2754 @@
 
 
-
 if test "${libdir}" != "${prefix}/lib"; then
     LIB_SEARCH_DIRS="-L${prefix}/lib -L${libdir}"
@@ -2758 +2759 @@
     LIB_SEARCH_DIRS="-L${libdir}"
 fi
-
 
 
@@ -5381 +5381 @@
   HAVE_INTTYPES_H=0
 fi
-
 
 
@@ -7209 +7208 @@
   as_fn_error $? "Requires GNU make. You can specify a version with \$MAKE" "$LINENO" 5
 fi
-MAKE=${make_command}
-
 
 # Check whether --enable-gui was given.
@@ -7224 +7221 @@
     ENABLE_GUI="yes"
 fi
-
 
 TCL_VERSION="8.4"
@@ -7341 +7337 @@
 
 
-
 TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
-
-
-
 
 
@@ -7380 +7372 @@
   fi
 fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VTKDIR" >&5
 $as_echo "$VTKDIR" >&6; }
@@ -7627 +7618 @@
 $as_echo_n "checking for mcc extension... " >&6; }
 fi
-
-
-
-
-
 
 
@@ -7916 +7902 @@
 
 
-
-
-
-
 # Check whether --with-perl was given.
 if test "${with_perl+set}" = set; then :
@@ -8040 +8022 @@
   fi
 fi
-
-
-
-
-
-
-
-
-
-
-
-
 
 PYTHON=""
@@ -8225 +8195 @@
 
 
-
-
-
-
-
-
-
-
-
-
-
 rp_with_ruby="yes"
 
@@ -8334 +8293 @@
   fi
 fi
-
 
 RUBY_VERSION_RV=
@@ -8652 +8610 @@
 fi
 
-
-
-
 JAVA=""
 JAVAH=""
@@ -8940 +8895 @@
 
 
-
-
-
-
-
-
 RP_BASE=`pwd`
-
 
 
@@ -8987 +8935 @@
 
 
-
-
-
-
-
-
-
 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then
   . ${exec_prefix}/lib/tclConfig.sh
@@ -9000 +8941 @@
   . ${exec_prefix}/lib/tkConfig.sh
 fi
-
-
 
 # -----------------------------------------------------------------------
@@ -9373 +9312 @@
 
 
-
-
-
-
 #--------------------------------------------------------------------
 # Set the default compiler switches based on the --enable-symbols
@@ -9621 +9556 @@
 fi
 done
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+MAKE=${make_command}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 

trunk/configure.in

@@ -40 +40 @@
     INSTALL_PREFIX=$prefix
 fi
-AC_SUBST(INSTALL_PREFIX)
 
 
@@ -49 +48 @@
 fi
 
-AC_SUBST(LIB_SEARCH_DIRS)
 
 AC_PROG_INSTALL
@@ -112 +110 @@
   HAVE_INTTYPES_H=0
 fi
-AC_SUBST(HAVE_INTTYPES_H)
 
 
@@ -128 +125 @@
   AC_MSG_ERROR([Requires GNU make. You can specify a version with \$MAKE])
 fi
-AC_SUBST(MAKE, ${make_command})
 
 AC_ARG_ENABLE(
@@ -140 +136 @@
     ENABLE_GUI="yes"
 fi
-AC_SUBST(ENABLE_GUI)
 
 TCL_VERSION="8.4"
@@ -173 +168 @@
   fi
 fi
-AC_SUBST(TCLSH)
 
   
 TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
 
-AC_SUBST(TCL_VERSION)
-AC_SUBST(TCL_INC_SPEC)
-AC_SUBST(TCL_LIB_SPEC)
 
 AC_ARG_WITH(
@@ -210 +201 @@
   fi
 fi
-AC_SUBST(VTKDIR)
 AC_MSG_RESULT([$VTKDIR])
 
@@ -256 +246 @@
 fi
 
-AC_SUBST(MCC)
-AC_SUBST(MEX)
-AC_SUBST(MATLAB)
-AC_SUBST(MEX_ARCH)
-AC_SUBST(MEXEXT)
 
 #
@@ -380 +365 @@
 echo "OCTAVE_VERSION = $OCTAVE_VERSION"
 
-AC_SUBST(OCTAVE_VERSION)
-AC_SUBST(OCTAVE_VERSION_MAJOR)
-AC_SUBST(MKOCTFILE2)
-AC_SUBST(MKOCTFILE3)
 
 AC_ARG_WITH(
@@ -424 +405 @@
   fi
 fi
-AC_SUBST(PERL)
-AC_SUBST(PERL_INCLUDES)
-AC_SUBST(PERL_ARCHLIB)
-AC_SUBST(PERL_ARCHLIBEXP)
-AC_SUBST(PERL_VERSION)
-AC_SUBST(PERL_CCFLAGS)
-AC_SUBST(PERL_CPPFLAGS)
-AC_SUBST(PERL_VENDORLIB)
-AC_SUBST(PERL_PRIVLIB)
-AC_SUBST(PERL_INSTALLARCHLIB)
-AC_SUBST(PERL_VERSION_RV)
-AC_SUBST(PERL_LIBSPEC)
 
 PYTHON=""
@@ -506 +475 @@
 fi
 
-AC_SUBST(PYTHON)
-AC_SUBST(PYTHON_VERSION)
-AC_SUBST(PYTHON_INCLUDES)
-AC_SUBST(PYTHON_CFLAGS)
-AC_SUBST(PYTHON_INCDIR)
-AC_SUBST(PYTHON_LDFLAGS)
-AC_SUBST(PYTHON_LIB)
-AC_SUBST(PYTHON_SITE_DIR)
-AC_SUBST(PYTHON_LIBDIR)
-AC_SUBST(PYTHON_SITE_PACKAGES)
-AC_SUBST(PYTHON_DISTUTILS)
 
 rp_with_ruby="yes"
@@ -535 +493 @@
   fi
 fi
-AC_SUBST(RUBY)
 
 RUBY_VERSION_RV=
@@ -549 +506 @@
   fi
 fi
-AC_SUBST(HAVE_RUBY_DEVEL)
-AC_SUBST(RUBY_VERSION_RV)
-AC_SUBST(RUBY_PLATFORM)
 
 JAVA=""
@@ -598 +552 @@
 fi
 
-AC_SUBST(JAVA)
-AC_SUBST(JAVAC)
-AC_SUBST(JAVAH)
-AC_SUBST(JAVA_HOME)
-AC_SUBST(JAVA_INC_DIR)
-AC_SUBST(JAVA_INC_SPEC)
 
 RP_BASE=`pwd`
-AC_SUBST(RP_BASE)
 
 SC_ENABLE_SHARED
@@ -616 +563 @@
 #--------------------------------------------------------------------
 
-AC_SUBST(CFLAGS_DEBUG)
-AC_SUBST(CFLAGS_OPTIMIZE)
-AC_SUBST(STLIB_LD)
-AC_SUBST(SHLIB_LD)
-AC_SUBST(SHLIB_CFLAGS)
-AC_SUBST(SHLIB_LDFLAGS)
-AC_SUBST(SHLIB_SUFFIX)
 
 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then
@@ -630 +570 @@
   . ${exec_prefix}/lib/tkConfig.sh
 fi
-AC_SUBST(TCL_VERSION)
-AC_SUBST(TK_VERSION)
 
 # -----------------------------------------------------------------------
@@ -650 +588 @@
 SIZEOF_VOID_P="${ac_cv_sizeof_void_p}"
 SIZEOF_INT="${ac_cv_sizeof_int}"
-AC_SUBST(SIZEOF_INT)
-AC_SUBST(SIZEOF_LONG)
-AC_SUBST(SIZEOF_LONG_LONG)
-AC_SUBST(SIZEOF_VOID_P)
 
 
@@ -741 +675 @@
 AC_CHECK_FUNCS(img_convert)
 AC_CHECK_FUNCS(sws_scale)
+
+AC_SUBST(CFLAGS_DEBUG)
+AC_SUBST(CFLAGS_OPTIMIZE)
+AC_SUBST(ENABLE_GUI)
 AC_SUBST(HAVE_FFMPEG_LIBS)
+AC_SUBST(HAVE_INTTYPES_H)
+AC_SUBST(HAVE_RUBY_DEVEL)
+AC_SUBST(INSTALL_PREFIX)
+AC_SUBST(JAVA)
+AC_SUBST(JAVAC)
+AC_SUBST(JAVAH)
+AC_SUBST(JAVA_HOME)
+AC_SUBST(JAVA_INC_DIR)
+AC_SUBST(JAVA_INC_SPEC)
+AC_SUBST(LIB_SEARCH_DIRS)
+AC_SUBST(MAKE, ${make_command})
+AC_SUBST(MATLAB)
+AC_SUBST(MCC)
+AC_SUBST(MEX)
+AC_SUBST(MEXEXT)
+AC_SUBST(MEX_ARCH)
+AC_SUBST(MKOCTFILE2)
+AC_SUBST(MKOCTFILE3)
+AC_SUBST(OCTAVE_VERSION)
+AC_SUBST(OCTAVE_VERSION_MAJOR)
+AC_SUBST(PERL)
+AC_SUBST(PERL_ARCHLIB)
+AC_SUBST(PERL_ARCHLIBEXP)
+AC_SUBST(PERL_CCFLAGS)
+AC_SUBST(PERL_CPPFLAGS)
+AC_SUBST(PERL_INCLUDES)
+AC_SUBST(PERL_INSTALLARCHLIB)
+AC_SUBST(PERL_LIBSPEC)
+AC_SUBST(PERL_PRIVLIB)
+AC_SUBST(PERL_VENDORLIB)
+AC_SUBST(PERL_VERSION)
+AC_SUBST(PERL_VERSION_RV)
+AC_SUBST(PYTHON)
+AC_SUBST(PYTHON_CFLAGS)
+AC_SUBST(PYTHON_DISTUTILS)
+AC_SUBST(PYTHON_INCDIR)
+AC_SUBST(PYTHON_INCLUDES)
+AC_SUBST(PYTHON_LDFLAGS)
+AC_SUBST(PYTHON_LIB)
+AC_SUBST(PYTHON_LIBDIR)
+AC_SUBST(PYTHON_SITE_DIR)
+AC_SUBST(PYTHON_SITE_PACKAGES)
+AC_SUBST(PYTHON_VERSION)
+AC_SUBST(RP_BASE)
+AC_SUBST(RUBY)
+AC_SUBST(RUBY_PLATFORM)
+AC_SUBST(RUBY_VERSION_RV)
+AC_SUBST(SHLIB_CFLAGS)
+AC_SUBST(SHLIB_LD)
+AC_SUBST(SHLIB_LDFLAGS)
+AC_SUBST(SHLIB_SUFFIX)
+AC_SUBST(SIZEOF_INT)
+AC_SUBST(SIZEOF_LONG)
+AC_SUBST(SIZEOF_LONG_LONG)
+AC_SUBST(SIZEOF_VOID_P)
+AC_SUBST(STLIB_LD)
+AC_SUBST(TCLSH)
+AC_SUBST(TCL_INC_SPEC)
+AC_SUBST(TCL_LIB_SPEC)
+AC_SUBST(TCL_VERSION)
+AC_SUBST(TCL_VERSION)
+AC_SUBST(TK_VERSION)
+AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TK_XLIBSW)
+AC_SUBST(VTKDIR)
 
 ac_configure_args="--disable-threads --enable-shared"

trunk/gui/src/Makefile.in

@@ -28 +28 @@
 TCL_VERSION     = @TCL_VERSION@
 TCL_LIB_SPEC    = @TCL_LIB_SPEC@
+TK_LIB_SPEC     = @TK_LIB_SPEC@
+TK_XLIBSW       = @TK_XLIBSW@
 
 CC_SWITCHES     = $(SHLIB_CFLAGS) $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
@@ -46 +48 @@
 LIBS            = \
                 -L../../src/core -lrappture \
-                -L$(libdir) -ltcl8.4 -ltk8.4 -lm
+                -L$(libdir) $(TCL_LIB_SPEC) $(TK_LIB_SPEC) $(TK_XLIBSW) -lm
 
 OBJS            = \