Final version of configure for this release. I think.

1 files changed, 69 insertions, 51 deletions

diff --git a/configure.dynamic b/configure.dynamic
index 9743116e..44faefe3 100755
--- a/configure.dynamic
+++ b/configure.dynamic
@@ -463,7 +463,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os HOST EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL FINAL_TARGET O_EXTENSION FF_EXTRA_FILES PYTHON_LIB_NAME X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_11LIB STATIC_LIBS WFLAGS VERSION PYINCLUDE PYDEFINES PYLIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os HOST EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL FF_EXTRA_FILES PYTHON_LIB_NAME FINAL_TARGET O_EXTENSION X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_11LIB STATIC_LIBS WFLAGS VERSION PYINCLUDE PYDEFINES PYLIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1029,8 +1029,9 @@ Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-pyextension    disable/enable building shared fontforge library
-                          (python plugin)
+  --enable-libff          disable/enable building shared fontforge library
+  --enable-pyextension    disable/enable installing libfontforge as a python
+                          extension plugin
   --enable-multilayer   Control whether we build with support for type3/svg fonts containing multilayered drawing with strokes, fills, images, etc.
   --enable-devicetables   Control whether we build with support for device
                           tables which allow fine control of kerning (etc.) at
@@ -3485,7 +3486,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3488 "configure"' > conftest.$ac_ext
+  echo '#line 3489 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4975,7 +4976,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:4978:" \
+echo "$as_me:4979:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6042,11 +6043,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6045: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6046: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6049: \$? = $ac_status" >&5
+   echo "$as_me:6050: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6314,11 +6315,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6317: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6318: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6321: \$? = $ac_status" >&5
+   echo "$as_me:6322: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6418,11 +6419,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6421: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6422: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6425: \$? = $ac_status" >&5
+   echo "$as_me:6426: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8763,7 +8764,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8766 "configure"
+#line 8767 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8863,7 +8864,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8866 "configure"
+#line 8867 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11209,11 +11210,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11212: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11213: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11216: \$? = $ac_status" >&5
+   echo "$as_me:11217: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11313,11 +11314,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11316: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11317: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11320: \$? = $ac_status" >&5
+   echo "$as_me:11321: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12887,11 +12888,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12890: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12891: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12894: \$? = $ac_status" >&5
+   echo "$as_me:12895: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12991,11 +12992,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12994: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12995: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12998: \$? = $ac_status" >&5
+   echo "$as_me:12999: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15198,11 +15199,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15201: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15202: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15205: \$? = $ac_status" >&5
+   echo "$as_me:15206: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15470,11 +15471,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15473: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15474: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15477: \$? = $ac_status" >&5
+   echo "$as_me:15478: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15574,11 +15575,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15577: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15578: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15581: \$? = $ac_status" >&5
+   echo "$as_me:15582: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18243,25 +18244,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
-
-FINAL_TARGET=fontforge
-O_EXTENSION=o
-gww_dopy=no
-# Check whether --enable-pyextension or --disable-pyextension was given.
-if test "${enable_pyextension+set}" = set; then
-  enableval="$enable_pyextension"
-
-  case $enableval in
-  yes)
-    FINAL_TARGET=../libfontforge.la
-    O_EXTENSION=lo
-    gww_dopy=yes
-    ;;
-  esac
-
-fi;
-
-
 # Check whether --with-capslock-for-alt or --without-capslock-for-alt was given.
 if test "${with_capslock_for_alt+set}" = set; then
   withval="$with_capslock_for_alt"
@@ -18864,15 +18846,51 @@ fi
   echo $python
 fi
 
+gww_dopy=no
+gww_fflib=yes
+# Check whether --enable-libff or --disable-libff was given.
+if test "${enable_libff+set}" = set; then
+  enableval="$enable_libff"
+
+  case $enableval in
+   no)
+    gww_fflib=no
+   ;;
+  esac
+
+fi;
 if test "$python" = "no" ; then
   cat >>confdefs.h <<\_ACEOF
 #define _NO_PYTHON 1
 _ACEOF
 
-  gww_dopy=no
 else
 
   PYTHON_LIB_NAME="python$PyVersion"
+
+  if test "$gww_fflib" = "yes" ; then
+    # Check whether --enable-pyextension or --disable-pyextension was given.
+if test "${enable_pyextension+set}" = set; then
+  enableval="$enable_pyextension"
+
+      case $enableval in
+       yes)
+	gww_dopy=yes
+       ;;
+      esac
+
+fi;
+  fi
+fi
+
+
+
+if test "$gww_fflib" = "no" ; then
+  FINAL_TARGET=fontforge
+  O_EXTENSION=o
+else
+  FINAL_TARGET=../libfontforge.la
+  O_EXTENSION=lo
 fi
 
 ffscript="yes"
@@ -25377,10 +25395,10 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
-s,@FINAL_TARGET@,$FINAL_TARGET,;t t
-s,@O_EXTENSION@,$O_EXTENSION,;t t
 s,@FF_EXTRA_FILES@,$FF_EXTRA_FILES,;t t
 s,@PYTHON_LIB_NAME@,$PYTHON_LIB_NAME,;t t
+s,@FINAL_TARGET@,$FINAL_TARGET,;t t
+s,@O_EXTENSION@,$O_EXTENSION,;t t
 s,@X_CFLAGS@,$X_CFLAGS,;t t
 s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
 s,@X_LIBS@,$X_LIBS,;t t
@@ -26346,10 +26364,10 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
-s,@FINAL_TARGET@,$FINAL_TARGET,;t t
-s,@O_EXTENSION@,$O_EXTENSION,;t t
 s,@FF_EXTRA_FILES@,$FF_EXTRA_FILES,;t t
 s,@PYTHON_LIB_NAME@,$PYTHON_LIB_NAME,;t t
+s,@FINAL_TARGET@,$FINAL_TARGET,;t t
+s,@O_EXTENSION@,$O_EXTENSION,;t t
 s,@X_CFLAGS@,$X_CFLAGS,;t t
 s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
 s,@X_LIBS@,$X_LIBS,;t t