Changeset 1867 for trunk/gui

Timestamp:

Aug 20, 2010 9:08:21 AM (14 years ago)

Author:

gah

Message:

 

Location:

trunk/gui

Files:

• configure (modified) (3 diffs)
• configure.in (modified) (1 diff)

trunk/gui/configure

@@ -1666 +1666 @@
 
 
-
-#------------------------------------------------------------------------
-# Handle the --prefix=... option
-#------------------------------------------------------------------------
-
-if test "${prefix}" = "NONE"; then
-    prefix=/usr/local
-fi
-if test "${exec_prefix}" = "NONE"; then
-    exec_prefix=$prefix
-fi
-
-if test "${libdir}" != "${prefix}/lib"; then
-    LIB_SEARCH_DIRS="-L${prefix}/lib -L${libdir}"
-else
-    LIB_SEARCH_DIRS="-L${libdir}"
-fi
-
-
-
 ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+for ac_dir in cf "$srcdir"/cf; do
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
@@ -1697 +1677 @@
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error "cannot find install-sh, install.sh, or shtool in cf \"$srcdir\"/cf" "$LINENO" 5
 fi
 
@@ -1707 +1687 @@
 ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+#------------------------------------------------------------------------
+# Handle the --prefix=... option
+#------------------------------------------------------------------------
+
+if test "${prefix}" = "NONE"; then
+    prefix=/usr/local
+fi
+if test "${exec_prefix}" = "NONE"; then
+    exec_prefix=$prefix
+fi
+
+if test "${libdir}" != "${prefix}/lib"; then
+    LIB_SEARCH_DIRS="-L${prefix}/lib -L${libdir}"
+else
+    LIB_SEARCH_DIRS="-L${libdir}"
+fi
+
 
 

trunk/gui/configure.in

@@ -1 +1 @@
 
 AC_INIT([RapptureGUI],[1.1],[rappture@nanohub.org])
-
+AC_CONFIG_AUX_DIR(cf)
 #------------------------------------------------------------------------
 # Handle the --prefix=... option