[Lsb-messages] /var/www/bzr/lsb/devel/appbat r966: Need to know about lib vs lib64 for configure

Stew Benedict stewb at linux-foundation.org
Sun Jun 10 14:45:50 UTC 2012


------------------------------------------------------------
revno: 966
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: appbat
timestamp: Sun 2012-06-10 10:45:50 -0400
message:
  Need to know about lib vs lib64 for configure
modified:
  configure
  configure.in
-------------- next part --------------
=== modified file 'configure'
--- a/configure	2012-06-08 20:20:19 +0000
+++ b/configure	2012-06-10 14:45:50 +0000
@@ -643,9 +643,6 @@
 EGREP
 GREP
 CPP
-XMKMF
-YFLAGS
-YACC
 SET_MAKE
 ac_ct_CXX
 CXXFLAGS
@@ -657,6 +654,9 @@
 LDFLAGS
 CFLAGS
 CC
+XMKMF
+YFLAGS
+YACC
 APPBATVERSION
 PACKAGEDIR
 BUILDDIR
@@ -716,6 +716,8 @@
       ac_precious_vars='build_alias
 host_alias
 target_alias
+YACC
+YFLAGS
 CC
 CFLAGS
 LDFLAGS
@@ -724,8 +726,6 @@
 CXX
 CXXFLAGS
 CCC
-YACC
-YFLAGS
 CPP'
 
 
@@ -1348,6 +1348,11 @@
   cat <<\_ACEOF
 
 Some influential environment variables:
+  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+              the first program found out of: `bison -y', `byacc', `yacc'.
+  YFLAGS      The list of arguments that will be passed by default to $YACC.
+              This script will default YFLAGS to the empty string to avoid a
+              default value of `-d' given by some make applications.
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1357,11 +1362,6 @@
               you have headers in a nonstandard directory <include dir>
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
-  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
-              the first program found out of: `bison -y', `byacc', `yacc'.
-  YFLAGS      The list of arguments that will be passed by default to $YACC.
-              This script will default YFLAGS to the empty string to avoid a
-              default value of `-d' given by some make applications.
   CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
@@ -1977,8 +1977,162 @@
 fi
 
 
-CC="lsbcc -L /opt/lsb/libbat/$APPBATVERSION/lib -I /opt/lsb/libbat/$APPBATVERSION/include"
-CXX="lsbc++ -L /opt/lsb/libbat/$APPBATVERSION/lib -I /opt/lsb/libbat/$APPBATVERSION/include"
+for ac_prog in 'bison -y' byacc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_YACC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$YACC"; then
+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_YACC="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+YACC=$ac_cv_prog_YACC
+if test -n "$YACC"; then
+  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$YACC" && break
+done
+test -n "$YACC" || YACC="yacc"
+
+# the autconfigure check for yacc leaves a variable set to
+# bison, byacc or yacc, depending on which it found. Unfortunately,
+# it's also set to yacc if there's no yacc program at all.
+# We require one, so test again.
+if test "$YACC" = "yacc" ; then
+	unset YACC
+	# Extract the first word of "yacc", so it can be a program name with args.
+set dummy yacc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_YACC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$YACC"; then
+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_YACC="yacc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_YACC" && ac_cv_prog_YACC="false"
+fi
+fi
+YACC=$ac_cv_prog_YACC
+if test -n "$YACC"; then
+  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+	if test "$YACC" = "false" ; then
+	      { $as_echo "$as_me:$LINENO: WARNING: no yacc program found" >&5
+$as_echo "$as_me: WARNING: no yacc program found" >&2;}
+	      FATAL=1
+	fi
+fi
+
+# Extract the first word of "xmkmf", so it can be a program name with args.
+set dummy xmkmf; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_XMKMF+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$XMKMF"; then
+  ac_cv_prog_XMKMF="$XMKMF" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_XMKMF="xmkmf"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_XMKMF" && ac_cv_prog_XMKMF="false"
+fi
+fi
+XMKMF=$ac_cv_prog_XMKMF
+if test -n "$XMKMF"; then
+  { $as_echo "$as_me:$LINENO: result: $XMKMF" >&5
+$as_echo "$XMKMF" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test "$XMKMF" = "false" ; then
+	      { $as_echo "$as_me:$LINENO: WARNING: no xmkmf program found" >&5
+$as_echo "$as_me: WARNING: no xmkmf program found" >&2;}
+	      FATAL=1
+fi
+
+# LIBS is additive: each library found by the configure check is
+# appended. We're not testing related things, just stuff needed by the
+# appbat in general.  So we reset the path each time before a check.
+
+# Determine library path according to architecture
+case `uname -m` in
+        ppc64 | s390x | x86_64)
+                SAVELIBS=-L/usr/X11R6/lib64
+                LIBDIR=lib64
+                ;;
+        *)
+                SAVELIBS=-L/usr/X11R6/lib
+                LIBDIR=lib
+                ;;
+esac
+
+CC="lsbcc -L /opt/lsb/libbat/$APPBATVERSION/$LIBDIR -I /opt/lsb/libbat/$APPBATVERSION/include"
+CXX="lsbc++ -L /opt/lsb/libbat/$APPBATVERSION/$LIBDIR -I /opt/lsb/libbat/$APPBATVERSION/include"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3317,158 +3471,6 @@
 fi
 
 
-for ac_prog in 'bison -y' byacc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_YACC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
-  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
-$as_echo "$YACC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
-
-# the autconfigure check for yacc leaves a variable set to
-# bison, byacc or yacc, depending on which it found. Unfortunately,
-# it's also set to yacc if there's no yacc program at all.
-# We require one, so test again.
-if test "$YACC" = "yacc" ; then
-	unset YACC
-	# Extract the first word of "yacc", so it can be a program name with args.
-set dummy yacc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_YACC="yacc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_YACC" && ac_cv_prog_YACC="false"
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
-  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
-$as_echo "$YACC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	if test "$YACC" = "false" ; then
-	      { $as_echo "$as_me:$LINENO: WARNING: no yacc program found" >&5
-$as_echo "$as_me: WARNING: no yacc program found" >&2;}
-	      FATAL=1
-	fi
-fi
-
-# Extract the first word of "xmkmf", so it can be a program name with args.
-set dummy xmkmf; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_XMKMF+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$XMKMF"; then
-  ac_cv_prog_XMKMF="$XMKMF" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_XMKMF="xmkmf"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_XMKMF" && ac_cv_prog_XMKMF="false"
-fi
-fi
-XMKMF=$ac_cv_prog_XMKMF
-if test -n "$XMKMF"; then
-  { $as_echo "$as_me:$LINENO: result: $XMKMF" >&5
-$as_echo "$XMKMF" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$XMKMF" = "false" ; then
-	      { $as_echo "$as_me:$LINENO: WARNING: no xmkmf program found" >&5
-$as_echo "$as_me: WARNING: no xmkmf program found" >&2;}
-	      FATAL=1
-fi
-
-# LIBS is additive: each library found by the configure check is
-# appended. We're not testing related things, just stuff needed by the
-# appbat in general.  So we reset the path each time before a check.
-
-# Determine library path according to architecture
-case `uname -m` in
-        ppc64 | s390x | x86_64)
-                SAVELIBS=-L/usr/X11R6/lib64
-                ;;
-        *)
-                SAVELIBS=-L/usr/X11R6/lib
-                ;;
-esac
-
 LIBS=$SAVELIBS
 
 ac_ext=c

=== modified file 'configure.in'
--- a/configure.in	2012-06-08 20:20:19 +0000
+++ b/configure.in	2012-06-10 14:45:50 +0000
@@ -24,13 +24,6 @@
 fi
 AC_SUBST(APPBATVERSION)
 
-CC="lsbcc -L /opt/lsb/libbat/$APPBATVERSION/lib -I /opt/lsb/libbat/$APPBATVERSION/include"
-CXX="lsbc++ -L /opt/lsb/libbat/$APPBATVERSION/lib -I /opt/lsb/libbat/$APPBATVERSION/include"
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_MAKE_SET
-
 AC_PROG_YACC
 # the autconfigure check for yacc leaves a variable set to
 # bison, byacc or yacc, depending on which it found. Unfortunately,
@@ -59,12 +52,21 @@
 case `uname -m` in
         ppc64 | s390x | x86_64)
                 SAVELIBS=-L/usr/X11R6/lib64
+                LIBDIR=lib64
                 ;;
         *)
                 SAVELIBS=-L/usr/X11R6/lib
+                LIBDIR=lib
                 ;;
 esac
 
+CC="lsbcc -L /opt/lsb/libbat/$APPBATVERSION/$LIBDIR -I /opt/lsb/libbat/$APPBATVERSION/include"
+CXX="lsbc++ -L /opt/lsb/libbat/$APPBATVERSION/$LIBDIR -I /opt/lsb/libbat/$APPBATVERSION/include"
+
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_MAKE_SET
+
 LIBS=$SAVELIBS
 AC_CHECK_HEADER(security/pam_appl.h)
 AC_CHECK_HEADER(security/pam_modules.h,,



More information about the lsb-messages mailing list