Changeset 264 for trunk/libjdkmidi/trunk

Timestamp:

01/20/07 13:59:53 (22 months ago)

Author:

jeffk@…

Message:

configure script is now compatible with plain old /bin/sh, as seen on freebsd. awk script fixed so that you can pass values with equal signs in them, such as '../configure --defines=VERSION=8.

Location:

trunk/libjdkmidi/trunk

Files:

• Makefile (modified) (1 diff)
• configure (modified) (4 diffs)

trunk/libjdkmidi/trunk/Makefile

@@ -23 +23 @@
    -mkdir $(BUILDDIR)
 
+.PHONY : $(BUILDDIR)/Makefile
+
 $(BUILDDIR)/Makefile : $(BUILDDIR)
    (cd $(BUILDDIR) && ../configure $(CONFIGURE_FLAGS) )

trunk/libjdkmidi/trunk/configure

@@ -1 @@
-#! /bin/bash
+#! /bin/sh
 
 ##############################################################################################
@@ -19 +19 @@
 # load project specific bash definitions
 
-source "${relative_dir}/project.sh"
+
+. "${relative_dir}/project.sh"
 
 # if we are called with --help or the script is called from the same directory that it is in,
 # then we must just print our usage information and exit
 
-if [ "$1" = "--help" -o "${relative_dir}" = "." ]; then
+if [ x"$1" = x"--help" -o x"${relative_dir}" = x"." ]; then
     echo "configure script based on J.D. Koftinoff Software's MagicMake system."
     echo "See https://clicker.jdkoftinoff.com/projects/trac/jdks/wiki/MagicMakefileV3 for more information"
@@ -94 +95 @@
 # with out needing ugly getopt bash extensions for parsing command lines.
 
-params=$((
+params=`(
   for i in "$@"
   do 
     echo $i
   done
-) | awk -F= '{ gsub("-","_",$1); sub("__","",$1); print "magic_" toupper($1) "=" "\"" $2 "\""; }'; )
+) | awk '{ gsub("-","_",$1); sub("__","",$1); line=$0; i = index($0,"="); var = substr(line,0,i-1); val = substr(line,i+1); print "magic_" toupper(var) "=" "\"" val "\""; }'; `
 
 eval $params
@@ -207 +208 @@
 magic_NATIVE_DLLWRAP="${magic_NATIVE_DLLWRAP:-${magic_NATIVE_COMPILER_PREFIX}dllwrap}"
 magic_NATIVE_LDFLAGS="${magic_NATIVE_LDFLAGS}"
-MAGIC_NATIVE_CXXFLAGS="${magic_NATIVE_CXXFLAGS}"
+magic_NATIVE_CXXFLAGS="${magic_NATIVE_CXXFLAGS}"
 magic_NATIVE_MFLAGS="${magic_NATIVE_MFLAGS}"
-MAGIC_NATIVE_MMFLAGS="${magic_NATIVE_MMFLAGS}"
+magic_NATIVE_MMFLAGS="${magic_NATIVE_MMFLAGS}"
 magic_NATIVE_CFLAGS="${magic_NATIVE_CFLAGS}"
-MAGIC_NATIVE_LDLIBS="${magic_NATIVE_LDLIBS}"
+magic_NATIVE_LDLIBS="${magic_NATIVE_LDLIBS}"
 magic_NATIVE_DEBUG="${magic_NATIVE_DEBUG}"
-MAGIC_NATIVE_PROFILE="${magic_NATIVE_PROFILE}"
+magic_NATIVE_PROFILE="${magic_NATIVE_PROFILE}"
 
 
 # extract all environment vars with the "magic_" prefix and save them in vars.sh and Makefile in the appropriate form:
-set | grep '^magic_' | sed "s/'//g" | awk -F= '{ sub("magic_","",$1); print $1 "=\"" $2 "\"" }' >vars.sh
+set | grep '^magic_' | sed "s/'//g" | awk '{ i = index($0,"="); print substr($0,7,i-7) "=\"" substr($0,i+1) "\"" }' >vars.sh
 echo ". \"${magic_PROJECT_TOP_DIR}/project.sh\"" >>vars.sh
-set | grep '^magic_' | sed "s/'//g" | awk -F= '{ sub("magic_","",$1); print $1 "=" $2 }' >Makefile
+set | grep '^magic_' | sed "s/'//g" | awk '{ i = index($0,"="); print substr($0,7,i-7) "=" substr($0,i+1) "" }' >Makefile
 
 echo 'include $(CONFIGURE_DIR)/project.mak' >>Makefile