--- configure.ac.orig 2009-02-13 14:00:57.000000000 +0900 +++ configure.ac 2016-11-07 06:46:23.065992000 +0900 @@ -13,22 +13,6 @@ AC_PROG_CC AC_PROG_RANLIB AC_PROG_LN_S -AC_PATH_PROGS(PERL, perl perl5, no) -AC_SUBST(PERL) - -# this tries to find GNU graph only, not traditional berkeley/sysv graph, -# so we do the right thing on solaris, where an unusable one is in /usr/bin -# and the graph we want is usually in /usr/local/bin or some such. -AC_ARG_WITH(graph, [full pathname to GNU graph for postscript plotting]) -dnl AC_MSG_RESULT(with_graph is $with_graph) -if test "$with_graph" != no; then - if test "$with_graph" != yes && test ! -z "$with_graph" ; then - AC_DEFINE_UNQUOTED(PROG_GRAPH, "$with_graph", [If present, the pathname of graph, from GNU plotutils.]) - else - AC_PROG_GREPSTDOUT(GRAPH, graph --version, GNU, $ac_dir/$ac_word) - AC_DEFINE_UNQUOTED(PROG_GRAPH, "$GRAPH", [If present, the pathname of graph, from GNU plotutils.]) - fi -fi dnl do we need libtool? dnl even though we aren't building shared libraries, it seemed to help on HP-UX @@ -51,62 +35,8 @@ dnl check for gtk/glib features AC_CHECK_LIB(c, g_slice_set_config, AC_DEFINE(HAVE_G_SLICE_SET_CONFIG,1,[Define this if your version of glib2 has the slice allocator and g_slice_set_config]),,[$GTK_LIBS]) - -dnl check for readline library -AC_CHECK_LIB(termcap, tgoto, [ - AC_CHECK_LIB(readline, readline, [ - READLINE_LIB="-lreadline -ltermcap" - AC_DEFINE(HAVE_READLINE,1,[Define this if you have the readline library]) - AC_CHECK_LIB(readline, add_history, AC_DEFINE(HAVE_HISTORY,1,[Define this if your readline also has add_history]),,"-ltermcap" -) - ], READLINE_LIB="", "-ltermcap") -], AC_CHECK_LIB(ncurses, tgoto, [ - AC_CHECK_LIB(readline, readline, [ - READLINE_LIB="-lreadline -lncurses" - AC_DEFINE(HAVE_READLINE,1,[Define this if you have the readline library]) - AC_CHECK_LIB(readline, add_history, AC_DEFINE(HAVE_HISTORY,1,[Define this if your readline also has add_history]),,"-l -ncurses") - ], READLINE_LIB="", "-lncurses") -], READLINE_LIB="")) - -AC_SUBST(READLINE_LIB) - - -dnl check for guile -GUILE_FLAGS - -dnl checks for guile version-specific features, if any - - -dnl check for guile-gnome-platform - -GUILE_MODULE_REQUIRED(gnome-2) -dnl GUILE_MODULE_REQUIRED(gnome gtk) - -PKG_CHECK_MODULES(GUILE_GNOME, guile-gnome-gtk-2, ,AC_MSG_ERROR(Can not find Guile-gnome-platform)) - -dnl remind myself how to check for somthing I know exists -dnl GUILE_MODULE_EXPORTS(foo_widget_show, (gnome-0)(gnome gtk),gtk-widget-show) -dnl if test "$foo_widget_show" = yes; then -dnl AC_DEFINE(FOO_WIDGET_SHOW,1,"Defined if guile-gnome module (gnome gtk) already contains gtk-widget-show") -dnl fi - -GUILE_MODULE_EXPORTS(have_guile_gtk_menu_popup,(gnome-2)(gnome gtk),gtk-menu-popup) -if test "$have_guile_gtk_menu_popup" = yes; then - AC_DEFINE(HAVE_GUILE_GTK_MENU_POPUP,1,"Defined if guile-gnome module (gnome gtk) already contains gtk-menu-popup") -fi - - dnl doesn't work if prefix isn't specified. dnl AC_DEFINE_UNQUOTED(DATADIR,"${datadir}",Installation prefix for finding necessary guile code) AC_OUTPUT(Makefile \ -src/Makefile spicefile/Makefile scheme/Makefile \ -src/app/Makefile \ -remote/Makefile \ -utilities/Makefile \ -utilities/gwave-doc-snarf \ -utilities/doc-split \ -utilities/sweepsplit \ -gwave.spec \ -scheme/gwave-config.scm) +src/Makefile spicefile/Makefile)