rpms/cernlib/devel cernlib.m4,1.2,1.3 cernlib.spec,1.17,1.18

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10049

Modified Files:
	cernlib.m4 cernlib.spec 
Log Message:
newer cernlib.m4



Index: cernlib.m4
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib.m4	14 Dec 2005 16:52:26 -0000	1.2
+++ cernlib.m4	25 Jan 2006 12:51:47 -0000	1.3
@@ -16,7 +16,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-dnl A basic axample of the macro usage:
+dnl A basic example of the macro usage:
 dnl 
 dnl AC_LIB_CERNLIB(kernlib,CLTOU,
 dnl [
@@ -33,15 +33,15 @@
 dnl - if the binary program 'cernlib-static' or 'cernlib' is in the path it is 
 dnl   assumed that a static linking using the information reported by that 
 dnl   script is wanted.
-dnl - otherwise if the environment variable CERNLIB exists it is assumed to be the
-dnl   location of the static library.
+dnl - otherwise if the environment variable CERNLIB exists it is assumed to 
+dnl   be the location of the static library.
 dnl - otherwise if the environment variable CERN_ROOT exists it is assumed 
 dnl   that CERN_ROOT/lib is the location of the static library.
 dnl - otherwise a simple linking is performed.
 dnl 
 dnl If a dynamic linking is selected:
-dnl - if the binary program 'cernlib' is in the path it is assumed that it is the 
-dnl   debian script and it is called with -dy.
+dnl - if the binary program 'cernlib' is in the path it is assumed that it 
+dnl   is the debian script and it is called with -dy.
 dnl - otherwise a simple linking is performed.
 dnl
 dnl AC_LIB_CERNLIB ([LIBRARY = kernlib], [FUNCTION = CLTOU], [ACTION-IF-FOUND],
@@ -57,7 +57,9 @@
 # AC_CERNLIB check for cernlib location and whether it should be 
 # statically linked or not.
 AC_DEFUN([AC_CERNLIB], [
+CERNLIB_PATH=
 CERNLIB_LIB_PATH=
+CERNLIB_BIN_PATH=
 CERNLIB_STATIC=yes
 AC_ARG_WITH(static_cernlib,
 [  --with-static-cernlib             link statically with the cernlib],
@@ -65,16 +67,25 @@
 
 AC_ARG_WITH(cernlib,
 [  --with-cernlib           cernlib location],
-[  CERNLIB_LIB_PATH=$withval    ])
+[  CERNLIB_PATH=$withval    
+   CERNLIB_LIB_PATH=$CERNLIB_PATH/lib
+   CERNLIB_BIN_PATH=$CERNLIB_PATH/bin
+])
 
+CERNLIB_BIN=
 
 if test "z$CERNLIB_STATIC" != "zno"; then    
     CERNLIB_STATIC=yes
-    if test "z$CERNLIB_LIB_PATH" = z; then
+    if test "z$CERNLIB_PATH" = z; then
         AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no)
         if test $CERNLIB_BIN = no; then
             AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
         fi
+    else
+        AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no, [$CERNLIB_BIN_PATH:$PATH])
+        if test $CERNLIB_BIN = no; then
+            AC_PATH_PROG(CERNLIB_BIN, cernlib, no, [$CERNLIB_BIN_PATH:$PATH])
+        fi
         if test $CERNLIB_BIN = no; then
             if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
                CERNLIB_LIB_PATH=$CERNLIB
@@ -86,8 +97,10 @@
         fi
     fi
 else
-    AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
-    if test "z$CERNLIB_LIB_PATH" != z; then
+    if test "z$CERNLIB_PATH" = z; then
+         AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
+    else
+         AC_PATH_PROG(CERNLIB_BIN, cernlib, no, [$CERNLIB_BIN_PATH:$PATH])
          LDFLAGS="$LDFLAGS -L$CERNLIB_LIB_PATH"
     fi
 fi


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cernlib.spec	17 Jan 2006 22:34:44 -0000	1.17
+++ cernlib.spec	25 Jan 2006 12:51:47 -0000	1.18
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       12%{?dist}
+Release:       12%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -712,7 +712,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Jan 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-12
+* Tue Jan 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-12.1
 - attempt a rebuild against newer openmotif
 
 * Tue Dec 20 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-11.4