Changeset 4584


Ignore:
Timestamp:
Aug 1, 2014 6:32:33 PM (7 years ago)
Author:
ldelgass
Message:

add configure for nanoscale

Location:
nanoscale/trunk
Files:
1 added
1 deleted
1 edited
4 copied

Legend:

Unmodified
Added
Removed
  • nanoscale/trunk/Makefile.in

    r4364 r4584  
    4949        $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS)
    5050
    51 install: nanoscale renderservers.tcl
     51install: nanoscale renderservers.tcl start_nanoscale.sh
    5252        $(INSTALL_PROGRAM) -D nanoscale $(bindir)/nanoscale
     53        $(INSTALL_PROGRAM) start_nanoscale.sh $(bindir)/start_nanoscale.sh
    5354        $(INSTALL_SCRIPT) renderservers.tcl $(libdir)
    5455
     
    6263
    6364distclean: clean
    64         $(RM) Makefile config.h renderservers.tcl
     65        $(RM) -r autom4te.cache
     66        $(RM) Makefile config.cache config.log config.status config.h renderservers.tcl start_nanoscale.sh
    6567
  • nanoscale/trunk/aclocal.m4

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/1.3/packages/vizservers/aclocal.m44525
      /branches/nanovis2/packages/vizservers/aclocal.m43001-3361
    r4583 r4584  
    11builtin(include,./cf/tcl.m4)
    2 builtin(include,./cf/rpLangPython.m4)
  • nanoscale/trunk/cf

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/1.3/packages/vizservers/cf4525
      /branches/nanovis2/packages/vizservers/cf3001-3361
  • nanoscale/trunk/configure.in

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/1.3/packages/vizservers/configure.in4525
      /branches/nanovis2/packages/vizservers/configure.in3001-3361
    r4583 r4584  
    11AC_PREREQ([2.60])
    2 AC_INIT([vizservers], [0.1], [rappture@nanohub.org])
     2AC_INIT([nanoscale], [0.1], [rappture@nanohub.org])
    33AC_CONFIG_AUX_DIR(cf)
    4 AC_CONFIG_HEADERS([nanoscale/config.h])
     4AC_CONFIG_HEADERS([config.h])
    55
    66AC_ARG_WITH(
     
    2424    [LOGDIR=$withval],
    2525    [LOGDIR="/tmp"])
    26 
    27 RP_LANG_PYTHON
    2826
    2927#------------------------------------------------------------------------
     
    104102fi
    105103
    106 AC_CHECK_HEADER([GL/glew.h])
    107 
    108104AC_CHECK_HEADERS([stdio.h unistd.h stdlib.h string.h sys/types.h])
    109105AC_CHECK_HEADERS([sys/socket.h sys/time.h netinet/in.h arpa/inet.h netdb.h])
     
    112108AC_CHECK_FUNCS([mkstemps])
    113109
    114 SUBDIRS="nanoscale pymolproxy"
    115 
    116110AC_SUBST(LD_RPATH)
    117111AC_SUBST(LOGDIR)
    118112AC_SUBST(STATSDIR)
    119113AC_SUBST(SUBDIRS)
    120 AC_SUBST(PYTHON)
    121114AC_SUBST(TCL_INC_SPEC)
    122115AC_SUBST(TCL_LIB_SPEC)
     
    125118AC_OUTPUT([
    126119   Makefile \
    127    nanoscale/Makefile \
    128    nanoscale/renderservers.tcl \
    129    pymolproxy/Makefile \
     120   renderservers.tcl \
    130121   start_nanoscale.sh])
  • nanoscale/trunk/start_nanoscale.sh.in

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/1.3/packages/vizservers/start_nanoscale.sh.in4525
      /branches/nanovis2/packages/vizservers/start_nanoscale.sh.in3001-3361
Note: See TracChangeset for help on using the changeset viewer.