Changeset dc32d42 in git for libfac

Timestamp:

May 21, 1997, 3:05:36 PM (27 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '1170388a280084e303867145f98985f03b2af06d')

Children:

2b3f238c740deb3d586dc1d5b379ddadb848cbaa

Parents:

670667a17a4a8423dbd6c8e3749cc652102fb28a

Message:

Merged fixes from 1-0 branch


git-svn-id: file:///usr/local/Singular/svn/trunk@311 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

libfac

Files:

• ChangeLog (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• configure (modified) (6 diffs)
• configure.in (modified) (1 diff)

libfac/ChangeLog

@@ +1 @@
+Tue May 13 11:32:11 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
+
+        * Makefile.in (uninstall): took out template installation
+        (all): added OPTOBJ target so that the dir is created, if necessary
+
+Tue May 13 20:09:03 1997  Olaf Bachmann  <obachman@schlupp.mathematik.uni-kl.de (Olaf Bachmann)>
+
+        * configure.in: Exit with error if factory.h was not found and
+          --enable-factory option was not explicitely given
+
 Tue May 13 11:32:11 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
 

libfac/Makefile.in

@@ -1 @@
-# $Id: Makefile.in,v 1.5 1997-05-13 10:09:17 obachman Exp $
+# $Id: Makefile.in,v 1.6 1997-05-21 13:05:34 obachman Exp $
 #################################################
 SHELL           = /bin/sh
@@ -84 +84 @@
 ##
 
+
+all: OPTOBJ ${TARGETNAME} 
+
+OPTOBJ:
+        ${MKINSTALLDIRS} OPTOBJ
+
 .SUFFIXES:      .cc .h .o
-
-all: ${TARGETNAME}
 
 OPTOBJ/%.o: %.cc 

libfac/configure

@@ -794 +794 @@
 fi
 
-ac_safe=`echo "factory.h" | tr './\055' '___'`
-echo $ac_n "checking for factory.h""... $ac_c" 1>&6
+for ac_hdr in factory.h
+do
+ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 803 "configure"
+#line 805 "configure"
 #include "confdefs.h"
-#include <factory.h>
+#include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -819 +821 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  :
+    ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
 else
   echo "$ac_t""no" 1>&6
-echo "configure: warning: factory.h not found!" 1>&2
-fi
-
+fi
+done
+
+
+if test "$ac_cv_header_factory_h" != yes; then
+  if test "$enable_factory" != yes; then
+    { echo "configure: error: Need factory.h to built libfac" 1>&2; exit 1; }
+  else
+    echo "configure: warning: Make sure to _install_ factory.h befor building libfac" 1>&2
+  fi
+fi
 
 
@@ -833 +847 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 836 "configure"
+#line 850 "configure"
 #include "confdefs.h"
 
@@ -883 +897 @@
 ; return 0; }
 EOF
-if { (eval echo configure:886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -909 +923 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 912 "configure"
+#line 926 "configure"
 #include "confdefs.h"
 
@@ -917 +931 @@
 ; return 0; }
 EOF
-if { (eval echo configure:920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break

libfac/configure.in

@@ -89 +89 @@
 dnl Checks for header files.
 dnl
-AC_CHECK_HEADER(factory.h,,AC_MSG_WARN(factory.h not found!))
+AC_CHECK_HEADERS(factory.h)
+
+if test "$ac_cv_header_factory_h" != yes; then
+  if test "$enable_factory" != yes; then
+    AC_MSG_ERROR(Need factory.h to built libfac)
+  else
+    AC_MSG_WARN(Make sure to _install_ factory.h befor building libfac)
+  fi
+fi
 
 dnl