[libcvd-members] gvars3 Makefile.in configure configure.ac

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    gvars3
Changes by:     Edward Rosten <edrosten>        07/10/18 16:07:55

Modified files:
        .              : Makefile.in configure configure.ac 

Log message:
        Optional readline?

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gvars3/Makefile.in?cvsroot=libcvd&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gvars3/configure?cvsroot=libcvd&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gvars3/configure.ac?cvsroot=libcvd&r1=1.9&r2=1.10

Patches:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/libcvd/gvars3/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- Makefile.in 30 Apr 2007 21:27:59 -0000      1.15
+++ Makefile.in 18 Oct 2007 16:07:55 -0000      1.16
@@ -91,7 +91,12 @@
        src/gvars2.o                    \
        src/serialize.o                 \
        src/inst.o                              \
-       src/GUI_readline.o              \
+
+ifeq(@have_readline@,yes)
+       OBJS+=src/GUI_readline.o 
+else
+       OBJS+=src/inst_headless.o
+endif
 
 ifeq (@have_fltk@,yes)
        OBJS+=src/GUI_Fltk.o

Index: configure
===================================================================
RCS file: /cvsroot/libcvd/gvars3/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- configure   18 Sep 2007 04:15:02 -0000      1.9
+++ configure   18 Oct 2007 16:07:55 -0000      1.10
@@ -612,6 +612,9 @@
 # include <unistd.h>
 #endif"
 
+<<<<<<< configure
+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 AWK CXX 
CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP EGREP build build_cpu 
build_vendor build_os host host_cpu host_vendor host_os osx_hacks have_toon 
have_readline use_gvars2_compat have_fltk have_motif a have_fltk2 make_headless 
major minor HLIBS LIBOBJS LTLIBOBJS'
+=======
 ac_subst_vars='SHELL
 PATH_SEPARATOR
 PACKAGE_NAME
@@ -682,6 +685,7 @@
 HLIBS
 LIBOBJS
 LTLIBOBJS'
+>>>>>>> 1.9
 ac_subst_files=''
       ac_precious_vars='build_alias
 host_alias
@@ -3645,19 +3649,13 @@
        if test x$ac_cv_lib_readline_rl_done == xyes
        then
                break
+               have_readline=yes
+
        else
                unset ac_cv_lib_readline_rl_done
        fi
 done
 
-
-if test x$ac_cv_lib_readline_rl_done != xyes
-then
-       { { echo "$as_me:$LINENO: error: Readline is not optional. It should 
be. Sorry." >&5
-echo "$as_me: error: Readline is not optional. It should be. Sorry." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
 echo ------------------------------------------------
 echo "Extra GVars2 Compat:"
 echo " (adds GVars2.h, GUI.h, GUI_Motif.h GStringUtil.h wrappers,"
@@ -5100,6 +5098,114 @@
 
 # No need to generate the scripts if there are no CONFIG_FILES.
 # This happens for instance when ./config.status config.h
+<<<<<<< configure
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@LIBS@,$LIBS,;t t
+s,@AWK@,$AWK,;t t
+s,@CXX@,$CXX,;t t
+s,@CXXFLAGS@,$CXXFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@CXXCPP@,$CXXCPP,;t t
+s,@EGREP@,$EGREP,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@osx_hacks@,$osx_hacks,;t t
+s,@have_toon@,$have_toon,;t t
+s,@have_readline@,$have_readline,;t t
+s,@use_gvars2_compat@,$use_gvars2_compat,;t t
+s,@have_fltk@,$have_fltk,;t t
+s,@have_motif@,$have_motif,;t t
+s,@a@,$a,;t t
+s,@have_fltk2@,$have_fltk2,;t t
+s,@make_headless@,$make_headless,;t t
+s,@major@,$major,;t t
+s,@minor@,$minor,;t t
+s,@HLIBS@,$HLIBS,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+CEOF
+
+_ACEOF
+
+  cat >>$CONFIG_STATUS <<\_ACEOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) 
>$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+       ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+       ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+=======
 if test -n "$CONFIG_FILES"; then
 
 _ACEOF
@@ -5189,6 +5295,7 @@
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+>>>>>>> 1.9
   fi
 done
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/libcvd/gvars3/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- configure.ac        18 Sep 2007 04:15:02 -0000      1.9
+++ configure.ac        18 Oct 2007 16:07:55 -0000      1.10
@@ -134,17 +134,12 @@
        if test x$ac_cv_lib_readline_rl_done == xyes
        then
                break
+               AC_SUBST(have_readline,yes)
        else
                unset ac_cv_lib_readline_rl_done
        fi
 done
 
-
-if test x$ac_cv_lib_readline_rl_done != xyes
-then
-       AC_MSG_ERROR(Readline is not optional. It should be. Sorry.)
-fi
-
 echo ------------------------------------------------
 echo "Extra GVars2 Compat:"
 echo " (adds GVars2.h, GUI.h, GUI_Motif.h GStringUtil.h wrappers,"