Changeset 81252

Timestamp:

07/28/11 01:32:37 (4 years ago)

Author:

cal@…

Message:

rev-upgrade: src/machista1.0 needs SWIG, these changes locate it
However, Lion does no longer ship SWIG, so we have to expect users without it
Also, Swig 2.x available from MacPorts generates code that doesn't compile warnings-free, which is why this Makefile suggests using Swig 1.x

Location:

branches/gsoc11-rev-upgrade/base

Files:

• configure.ac (modified) (3 diffs)
• src/machista1.0/Makefile.in (copied) (copied from branches/gsoc11-rev-upgrade/base/src/machista1.0/Makefile) (3 diffs)
• src/port1.0/port_autoconf.tcl.in (modified) (1 diff)

branches/gsoc11-rev-upgrade/base/configure.ac

@@ -125 +125 @@
 AC_PATH_PROG(XAR, [xar], [])
 AC_PATH_PROG(OPEN, [open], [])
+AC_PATH_PROG(SWIG, [swig], [$PATH:/usr/local/bin])
 
 # Define some precious variables allowing user to override PATH for some programs
@@ -141 +142 @@
 AC_ARG_VAR(XAR, [path to xar command])
 AC_ARG_VAR(OPEN, [path to open command])
+AC_ARG_VAR(SWIG, [path to swig command])
 
 MP_SED_EXTENDED_REGEXP
@@ -363 +365 @@
         portmgr/freebsd/Makefile
         src/Makefile
+        src/machista1.0/Makefile
         src/macports1.0/macports_autoconf.tcl
         src/port1.0/port_autoconf.tcl

branches/gsoc11-rev-upgrade/base/src/machista1.0/Makefile.in

@@ -3 +3 @@
 INSTALLDIR=     ${DESTDIR}${datadir}/macports/Tcl/machista1.0
 
-# TODO: Find SWIG via configure
-SWIG         = /usr/bin/swig
-SWIG_FLAGS   = -tcl -pkgversion 1.0 -namespace
+SWIG         = @SWIG@
+SWIG_FLAGS   = -tcl8 -pkgversion 1.0 -namespace
 SWIG_LDFLAGS = -ltcl
 
@@ -17 +16 @@
 include ../../Mk/macports.tea.mk
 
-CFLAGS+= -fPIC -std=c99 -pedantic -Werror
+CFLAGS+= -fPIC -std=c99 -pedantic
 
 ${SWIG_SRCS}:: ${SWIG_IFACE}
+ifdef SWIG
         ${SWIG} ${SWIG_FLAGS} $<
+else
+        @echo "Building ${SWIG_SRCS} requires swig, which you apparently did not have installed when configuring MacPorts." >&2
+        @echo "Please install swig and re-run configure" >&2
+        @echo "I recommend installing SWIG 1.x in /usr/local, because as of this writing SWIG 2.x-generated code does not compile warning-free" >&2
+        @echo "If you checked out from svn you can also run svn revert in base/src/machista1.0 to get rid of this error" >&2
+        @exit 1
+endif
 
 ${SWIG_OBJS}:: ${SWIG_SRCS}
@@ -28 +35 @@
 
 clean::
-        rm -f ${SWIG_SRCS} ${SWIG_OBJS} ${PKG_INDEX}
+        rm -f ${SWIG_OBJS} ${PKG_INDEX}
+ifdef SWIG
+        rm -f ${SWIG_SRCS}
+else
+        @echo "Not cleaning SWIG-generated sources, because you have configured MacPorts without SWIG." >&2
+endif
         rm -f ${TESTS}
         rm -rf ${TESTS:%=%.dSYM}

branches/gsoc11-rev-upgrade/base/src/port1.0/port_autoconf.tcl.in

@@ -67 +67 @@
         variable tar_q "@TAR_Q@"
         variable hdiutil_path "@HDIUTIL@"
+        variable swig_path "@SIWG@"
         variable have_launchd "@HAVE_LAUNCHD@"
         variable launchctl_path "@LAUNCHCTL@"