Changeset 4584 for nanoscale

Timestamp:

Aug 1, 2014, 6:32:33 PM (10 years ago)

Author:

ldelgass

Message:

add configure for nanoscale

Location:

nanoscale/trunk

Files:

• Makefile.in (modified) (2 diffs)
• aclocal.m4 (copied) (copied from trunk/packages/vizservers/aclocal.m4) (1 diff, 1 prop)
• cf (copied) (copied from trunk/packages/vizservers/cf) (1 prop)
• cf/rpLangPython.m4 (deleted)
• configure (added)
• configure.in (copied) (copied from trunk/packages/vizservers/configure.in) (5 diffs, 1 prop)
• start_nanoscale.sh.in (copied) (copied from trunk/packages/vizservers/start_nanoscale.sh.in) (1 prop)

nanoscale/trunk/Makefile.in

@@ -49 +49 @@
         $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS)
 
-install: nanoscale renderservers.tcl
+install: nanoscale renderservers.tcl start_nanoscale.sh
         $(INSTALL_PROGRAM) -D nanoscale $(bindir)/nanoscale
+        $(INSTALL_PROGRAM) start_nanoscale.sh $(bindir)/start_nanoscale.sh
         $(INSTALL_SCRIPT) renderservers.tcl $(libdir)
 
@@ -62 +63 @@
 
 distclean: clean
-        $(RM) Makefile config.h renderservers.tcl
+        $(RM) -r autom4te.cache
+        $(RM) Makefile config.cache config.log config.status config.h renderservers.tcl start_nanoscale.sh
 

nanoscale/trunk/aclocal.m4

@@ -1 +1 @@
 builtin(include,./cf/tcl.m4)
-builtin(include,./cf/rpLangPython.m4)

nanoscale/trunk/configure.in

@@ -1 +1 @@
 AC_PREREQ([2.60])
-AC_INIT([vizservers], [0.1], [rappture@nanohub.org])
+AC_INIT([nanoscale], [0.1], [rappture@nanohub.org])
 AC_CONFIG_AUX_DIR(cf)
-AC_CONFIG_HEADERS([nanoscale/config.h])
+AC_CONFIG_HEADERS([config.h])
 
 AC_ARG_WITH(
@@ -24 +24 @@
     [LOGDIR=$withval],
     [LOGDIR="/tmp"])
-
-RP_LANG_PYTHON
 
 #------------------------------------------------------------------------
@@ -104 +102 @@
 fi
 
-AC_CHECK_HEADER([GL/glew.h])
-
 AC_CHECK_HEADERS([stdio.h unistd.h stdlib.h string.h sys/types.h])
 AC_CHECK_HEADERS([sys/socket.h sys/time.h netinet/in.h arpa/inet.h netdb.h])
@@ -112 +108 @@
 AC_CHECK_FUNCS([mkstemps])
 
-SUBDIRS="nanoscale pymolproxy"
-
 AC_SUBST(LD_RPATH)
 AC_SUBST(LOGDIR)
 AC_SUBST(STATSDIR)
 AC_SUBST(SUBDIRS)
-AC_SUBST(PYTHON)
 AC_SUBST(TCL_INC_SPEC)
 AC_SUBST(TCL_LIB_SPEC)
@@ -125 +118 @@
 AC_OUTPUT([
    Makefile \
-   nanoscale/Makefile \
-   nanoscale/renderservers.tcl \
-   pymolproxy/Makefile \
+   renderservers.tcl \
    start_nanoscale.sh])